390b267587
aosp-merger: Use full paths for kernel_repos
...
Change-Id: I12617ad5b93d8f3aae3c131e343588f368c22dd9
2022-10-05 21:11:42 +03:00
ac8ca7ff50
aosp-merger: Use device_branch for pixel device/kernel merges
...
Change-Id: Ib3c0479fc753aeeccc13c5fbe8e80c5231cf1a19
2022-10-05 21:11:42 +03:00
6929de032c
aosp-merger: Move aospremote to merge helpers
...
This ensures aospremote always runs on device/kernel merge
Change-Id: I1cea400a1e22aea3c682765f1c6e09ba9263840d
2022-10-05 21:11:42 +03:00
21c32f97d6
aosp-merger: Fix CLO merge/submit logic
...
Change-Id: I023edf71d6bc7e3b0717c20b96940dbdd0cb6c2c
2022-10-05 21:11:42 +03:00
e9ee2c9a2d
aosp-merger: Fix wrong branch in logs
...
Change-Id: I564004799cb4c52fb25afa3826013b7cc414a779
2022-10-05 21:11:42 +03:00
1a46783c3d
aosp-merger: Implement LineageOS merging
...
Change-Id: Ic158d31aeba77cba4a9db8507f8445b399b84aad
2022-10-05 21:11:41 +03:00
e4a8f06d9d
aosp-merger: Don't checkout the same branch twice
...
We are already in staging branch before this step,
avoid useless errors.
Change-Id: I45ffb6e01c212664efb9bbdd2550a391accf8e0d
2022-10-05 21:11:41 +03:00
03fcb953be
aosp-merger: s/calyxos_branch/os_branch/
...
Reduce the diff between CalyxOS/LineageOS scripts
Change-Id: I70e409e4bb050c4fd6b826912c7a9640c46ab9df
2022-10-05 21:11:41 +03:00
d830353741
aosp-merger: s/CalyxOS//
...
No need to brand simple console logs
Change-Id: Id2224ecc4b414919212328b2b25f0a7e3ccd4c6e
2022-10-05 21:11:41 +03:00
344ff1254f
aosp-merger: Merge clo tags independently
...
Read group from 2nd argument and merge the proper tag
instead of merging all at once.
Change-Id: Ie9bff27573cefdae7de29d906998e9eb4f662f3d
2022-10-05 21:11:41 +03:00
4d33e8b5b5
vars: Create empty file for qcom
...
Change-Id: Idad013b290502237a006440a74d4f3317467ef12
2022-10-05 21:11:41 +03:00
8f4db6a7e6
aosp-merger: Implement CLO merging
...
Change-Id: I57eeb68f1b8b1fc756ad665b790071d8872c4ebe
2022-10-05 21:11:41 +03:00
2b3507c4bc
aosp-merger: Allow using --new-tag as topic when uploading squash
...
Change-Id: I0b36d6e66ae94a82af8fbfe943563a2f083f564d
2022-10-05 21:11:40 +03:00
78ac8cbe88
aosp-merger: Remove unused BRANCH from logs
...
Change-Id: Ie744348a31eb159914b93ec4627be03bc7e1be34
2022-10-05 20:41:36 +03:00
57d5bb59ee
aosp-merger: Get the correct branch for squash/push from git
...
Change-Id: I54c3fe16b6c05c7b39ede9c4a4ef05f5b4f44e28
2022-10-05 20:41:36 +03:00
c4a2aef709
aosp-merger: Allow merge without --old-tag set
...
Change-Id: I7ef5fde1a9f8b1706f21d2a8c0e1abfcff8bfba0
2022-10-05 20:41:36 +03:00
33421d4e54
aosp-merger: Add some comments
...
Change-Id: Id5b8711981776edb169f5894c25b705e5bb9aa56
2022-10-05 20:41:36 +03:00
9c3917c665
aosp-merger: Abandon staging branch inside _merge_helper
...
Change-Id: Iea165da1de035cd4228ac28ce351ee3616c4e050
2022-10-05 20:41:36 +03:00
f54b4292f3
aosp-merger: Always use upstream from .gitupstream when it exists
...
Change-Id: Ibcaa3b567964865f6cecb7058533ab2331be43d8
2022-10-05 20:41:36 +03:00
b44a7cf8e8
aosp-merger: Switch all scripts to argument parsing
...
Change-Id: I7af863d3952e7ae9de16860404bccd2b582caa20
2022-10-05 20:41:36 +03:00
f40bcd9fa4
aosp-merger: Use merged_repos_${kernel}_kernel.txt for kernels
...
This prevents kernel merge overriding device merge which could
result in the wrong repository being pushed while running
`aosp-merger.sh submit-devices`
Change-Id: I89fccce5786ea0cbdd572ce1d3a2e9cac8ff91cd
2022-10-05 20:41:35 +03:00
3d4a098173
aosp-merger: Implement subtree merge handling for pixels
...
Change-Id: Idbb5427497d5d04766f8a37e7fa6e1264458dd29
2022-10-05 20:41:35 +03:00
cd3c1eb78c
aosp-merger: Force fetch AOSP tags
...
* There might be conflicting tags due to subtree use in device
and kernel repositories, preventing the actual merge from happening.
Change-Id: I96d6421b2e8675fc898e28b57e2f948c9db2c27c
2022-10-05 20:41:35 +03:00
79b5b2f1b4
aosp-merger: Don't run repohooks during repo upload
...
* These tend to fail on pure AOSP code, so just disable them
for this script.
Change-Id: I3637f014ec38a365a2dbf07c61b39623599b6a9f
2022-10-05 20:41:35 +03:00
75f6013be6
vars: October 2022 Security Update
...
Change-Id: I89d00c104b68bcbc331b2d067f926512534f796a
2022-10-04 02:27:12 -04:00
94516f128e
6a: September 2022 Security update
...
Change-Id: I2e807fe0a0236a33cf9b4d5c757e088b77413b05
2022-09-13 00:22:56 +05:30
66c045f417
September 2022 Security update
...
Change-Id: I8bcb25dfa6bb61407e0b78a9adc9cf97e971c026
2022-09-06 23:26:14 +05:30
02e136d6ef
git-review: 13
...
Change-Id: I482f3a2f4886e198cb978b422303d39b2e6ce3fd
2022-09-02 16:43:49 +05:30
f9e44898fd
carriersettings-extractor: Workaround for skip_464xlat field extraction
...
TelephonyProvider expects an int, not a string.
One would think bypassing the enum_type check and using the numbers
directly would be enough, but google stores the values in protobuf
different than what TelephonyProvider expects (0,1,2 vs -1,0,1).
References:
https://android.googlesource.com/platform/packages/providers/TelephonyProvider/+/refs/tags/android-13.0.0_r3/src/com/android/providers/telephony/TelephonyProvider.java#2473
https://android.googlesource.com/platform/frameworks/base/+/refs/tags/android-13.0.0_r3/core/java/android/provider/Telephony.java#3399
https://android.googlesource.com/platform/tools/carrier_settings/+/refs/tags/android-13.0.0_r3/proto/carrier_settings.proto#138
https://android.googlesource.com/platform/tools/carrier_settings/+/refs/tags/android-13.0.0_r3/python/update_apn.py#169
Change-Id: I920f8b9cd2638f40f90e22638b8cb67e11b898a8
2022-08-25 03:40:13 +03:00
570dc1db81
carriersettings-extractor: Update for 13
...
Import proto files from
tools/carrier_settings 1edea9efa652f3022f1804061f4aebca58ca47ff
Change-Id: I496c11e9a631c6709a15a4e64b354683019150fc
2022-08-19 15:20:58 +03:00
3381f74e7f
carriersettings-extractor: Move element extraction to separate function
...
Prepare for bundle support.
Change-Id: I2f9fe500beee1130b95e526ebd4a84d6fd3f4766
2022-08-19 15:20:54 +03:00
6ff6d3e4cf
vars: android-13.0.0_r3
...
Change-Id: Ie5faf1cbb0813537eca215d8c69c24a19beae7f8
2022-08-18 02:40:25 +03:00
408ad80d91
vars: Android 13
...
Change-Id: If028efde06ada5bc351f89fa001bf42e4cfb0bca
2022-08-18 02:40:25 +03:00
88ffbf7992
pixel: Android 13
...
Change-Id: I5fac382703d9b0e9c4fe5525f82d1a55c789d752
2022-08-18 02:38:55 +03:00
c7520a9e36
vars: Update raviole to SQ3A.220705.004
...
Change-Id: I06140afec0d0a1faa1186fa287aaac3fc21d9a10
2022-08-09 22:30:43 +03:00
0fd843a180
vars: Update bluejay to SD2A.220601.003.B1
...
Change-Id: Ib33909c8dc771e96165326ee030902b22e2590b3
2022-08-09 22:30:43 +03:00
f723bfe10a
fixup! Pixel 6a
...
* Helps having the actual device repo in the list of repos to be merged
Change-Id: If4a03797004f1af19c985373571f51c07e044292
2022-08-05 12:21:36 -04:00
f4e7b63e40
Pixel 6a
...
Change-Id: I70975d4aa770cecf8421c5dcbf97436ca8b98a67
2022-08-04 20:06:33 -04:00
1980cf47dd
pixel: Allow running device.sh from any path
...
Change-Id: Id5d1cbf3fe3038165a3a250a02657486ec74d74e
2022-08-02 12:16:20 -04:00
1b1529b610
scripts: pixel: Make `build-desc-fingerprint.sh` commit changes
...
Tests: cd lineage/scripts/pixel && ./build-desc-fingerprint.sh coral flame
Notes: No additional issues added in `shellcheck`
Change-Id: I1810ad996d727337b73c6959aaa37bdcaf0d5e5b
2022-07-12 20:05:33 +03:00
de2a6c10ea
pixel: Remove unused tmp_dir from build-desc-fingerprint.sh
...
Change-Id: I5a102f47b6d4450458781bc8b3928ead40820882
2022-07-12 20:04:43 +03:00
e8d686271b
vars: We now have a script to update vars
...
Change-Id: I3cd306262da7ce93e3641b47d1fe0b7a203f53ad
2022-07-12 20:01:45 +03:00
b80cfd7bcb
aosp-merger: Support merging
...
Change-Id: If5e4ff6672828c9af464e001224b02cd2e35782d
2022-07-08 20:14:39 +05:30
505c7ffdf1
vars: Introduce merge_method
...
* Lineage squashes for review, then pushes full merge bypassing review
* Calyx used to do that, now we push the upstream branch to a new branch
and then uploading the merge directly to gerrit. This way the entire merge
shows up as a single commit on gerrit.
AOSP does the same, e.g. for kernel merges
Change-Id: I2e1af9a1988e2d8a28f3619048b5740d7273cc2e
2022-07-08 20:14:39 +05:30
0e1af682c5
vars: Create empty files for OnePlus devices
...
Change-Id: I6b637fa6fcd7bc1d4bebbdf6109c79c2c6b3b5e1
2022-07-08 20:14:39 +05:30
0518c33c74
vars: Create empty file for FP4
...
Change-Id: Idb64584d690773198511912fa40f88f589bbc39f
2022-07-08 20:14:39 +05:30
cb11eb24d3
vars: We now have a script for build id
...
TODO: Fully automate
Change-Id: Ibdcd15f24cbe6477ac84d63f019ff1f145fa2def
2022-07-08 20:14:39 +05:30
33fbbad2f6
Add copyright headers to all scripts
...
* https://reuse.software/tutorial/
* reuse addheader --copyright="The Calyx Institute" --license="Apache-2.0" */*.sh
Change-Id: I24ab74da8f4c9ddd8d38da3e782053b10499ea83
2022-07-08 20:14:39 +05:30
ba8563a26a
Introduce script to update any var
...
* To make the manual build id / kernel tag update slightly less manual
Usage:
update-any-var.sh build_id SQ3A.220705.003 oriole raven # For Pixel 6 Jul 2022
TODO: Full automation
Change-Id: Iea350df2653c623b8f8476de4aec9cd1f7461c45
2022-07-08 20:14:37 +05:30
9bf6a8af7b
scripts: Remove double slash from paths
...
Same as I12c725b1fe3acc9ea062c575d6d8c6b6a37c6716
Change-Id: I2d2f6f6d0d334047fd91a6dd7a951c903a2b152f
2022-07-08 19:34:36 +05:30
Michael Bestas