gothicVI / AndroidDevelopment

GNU General Public License v2.0
1 stars 4 forks source link

[Question] Did you have errors with repopick? #1

Closed giovEra closed 1 year ago

giovEra commented 2 years ago

Hi, I've already successfully compiled linageos-14.1 for various devices and now I'm trying to compile linageos-14.1 with the latest not merged security patches, but repopick returns me several times the error "ERROR: git command failed"

I would like to know if you also had this problem and how you solved it.

What I do, is this:

before-repopick.sh: source build/envsetup.sh log=/tmp/before.log echo ">> pick unmerged commits" &>> "$log" # Fix python no longer pointing to python2 echo -e "\n### repopick -f 324000 324001 324004 324007 324010 ###" &>> "$log" repopick -f 324000 324001 324004 324007 324010 &>> "$log" #2021-07-05 echo -e "\n### repopick -t n-asb-2021-07 ###" &>> "$log" repopick -t n-asb-2021-07 &>> "$log" #2021-08-05 echo -e "\n### repopick -t n-asb-2021-08 ###" &>> "$log" repopick -t n-asb-2021-08 &>> "$log" #2021-09-05 echo -e "\n### repopick -t n-asb-2021-09 ###" &>> "$log" repopick -t n-asb-2021-09 &>> "$log" #2021-10-05 echo -e "\n### repopick -t n-asb-2021-10 ###" &>> "$log" repopick -t n-asb-2021-10 &>> "$log" #2021-11-05 echo -e "\n### repopick -t n-asb-2021-11 ###" &>> "$log" repopick -t n-asb-2021-11 &>> "$log" #2021-12-05 echo -e "\n### repopick -t n-asb-2021-12 ###" &>> "$log" repopick -t n-asb-2021-12 &>> "$log" #2022-01-05 echo -e "\n### repopick -t n-asb-2022-01 ###" &>> "$log" repopick -t n-asb-2022-01 &>> "$log" #2022-02-05 echo -e "\n### repopick -t n-asb-2022-02 ###" &>> "$log" repopick -t n-asb-2022-02 &>> "$log" #2022-03-05 echo -e "\n### repopick -t n-asb-2022-03 ###" &>> "$log" repopick -t n-asb-2022-03 &>> "$log" #2022-04-05 echo -e "\n### repopick -t n-asb-2022-04 ###" &>> "$log" repopick -t n-asb-2022-04 &>> "$log" #2022-05-05 echo -e "\n### repopick -t n-asb-2022-05 ###" &>> "$log" repopick -t n-asb-2022-05 &>> "$log" #2022-06-05 echo -e "\n### repopick -t n-asb-2022-06 ###" &>> "$log" repopick -t n-asb-2022-06 &>> "$log" #2022-07-05 echo -e "\n### repopick -t n-asb-2022-07 ###" &>> "$log" repopick -t n-asb-2022-07 &>> "$log" #2022-08-05 echo -e "\n### repopick -t n-asb-2022-08 ###" &>> "$log" repopick -t n-asb-2022-08 &>> "$log" #2022-09-05 echo -e "\n### repopick -f 338382 ###" &>> "$log" repopick -f 338382 &>> "$log" echo "cp -v ./android/default.xml ./.repo/manifests" &>> "$log" cp -v ./android/default.xml ./.repo/manifests &>> "$log" echo "sync repo: external/expat" &>> "$log" repo sync -v -c --no-tags --no-clone-bundle --force-sync --fail-fast external/expat &>> "$log" echo -e "\n### repopick -t n-asb-2022-09 ###" &>> "$log" repopick -t n-asb-2022-09 &>> "$log" #2022-10-05 echo -e "\n### repopick -t n-asb-2022-10 ###" &>> "$log" repopick -t n-asb-2022-10 &>> "$log" #2022-11-05 echo -e "\n### repopick -t n-asb-2022-11 ###" &>> "$log" repopick -t n-asb-2022-11 &>> "$log"

As you can see, i have 13 time the error "ERROR: git command failed":

log of the execution of build-repopick.sh: ### repopick -f 324000 324001 324004 324007 324010 ### ... A new version of repo (2.29) is available. ... You should upgrade soon: cp /srv/src/CM_14_1/.repo/repo/repo /usr/local/bin/repo Trace outputs in /srv/src/CM_14_1/.repo/TRACE_FILE From https://github.com/LineageOS/android_build * branch refs/changes/00/324000/1 -> FETCH_HEAD From https://github.com/LineageOS/android_vendor_cm * branch refs/changes/01/324001/5 -> FETCH_HEAD From https://github.com/LineageOS/android_frameworks_minikin * branch refs/changes/04/324004/5 -> FETCH_HEAD From https://github.com/LineageOS/android_external_v8 * branch refs/changes/07/324007/2 -> FETCH_HEAD From https://github.com/LineageOS/android_system_sepolicy * branch refs/changes/10/324010/2 -> FETCH_HEAD Applying change number 324000... --> Subject: "build: use env python2 in tools" --> Project path: build --> Change number: 324000 (Patch Set 1) ['git fetch github', u'refs/changes/00/324000/1'] Applying change number 324001... --> Subject: "vendor_cm: use env python2" --> Project path: vendor/cm --> Change number: 324001 (Patch Set 5) ['git fetch github', u'refs/changes/01/324001/5'] Applying change number 324004... --> Subject: "frameworks_minikin: use env python2" --> Project path: frameworks/minikin --> Change number: 324004 (Patch Set 5) ['git fetch github', u'refs/changes/04/324004/5'] Applying change number 324007... --> Subject: "external_v8: use env python2" --> Project path: external/v8 --> Change number: 324007 (Patch Set 2) ['git fetch github', u'refs/changes/07/324007/2'] Applying change number 324010... --> Subject: "system_sepolicy: use env python2" --> Project path: system/sepolicy --> Change number: 324010 (Patch Set 2) ['git fetch github', u'refs/changes/10/324010/2'] ### repopick -t n-asb-2021-07 ### ... A new version of repo (2.29) is available. ... You should upgrade soon: cp /srv/src/CM_14_1/.repo/repo/repo /usr/local/bin/repo Trace outputs in /srv/src/CM_14_1/.repo/TRACE_FILE From https://github.com/LineageOS/android_build * branch refs/changes/97/313397/2 -> FETCH_HEAD [detached HEAD dc7f51406] Bump Security String to 2021-07-05 Author: syphyr Date: Thu Jul 8 22:28:04 2021 +0200 1 file changed, 1 insertion(+), 1 deletion(-) Applying change number 288788... Change status is MERGED. Skipping the cherry pick. Use -f to force this pick. Applying change number 313320... Change status is MERGED. Skipping the cherry pick. Use -f to force this pick. Applying change number 313321... Change status is MERGED. Skipping the cherry pick. Use -f to force this pick. Applying change number 313322... Change status is MERGED. Skipping the cherry pick. Use -f to force this pick. Applying change number 313323... Change status is MERGED. Skipping the cherry pick. Use -f to force this pick. Applying change number 313324... Change status is MERGED. Skipping the cherry pick. Use -f to force this pick. Applying change number 313325... Change status is MERGED. Skipping the cherry pick. Use -f to force this pick. Applying change number 313373... Change status is MERGED. Skipping the cherry pick. Use -f to force this pick. Applying change number 313374... Change status is MERGED. Skipping the cherry pick. Use -f to force this pick. Applying change number 313397... --> Subject: "Bump Security String to 2021-07-05" --> Project path: build --> Change number: 313397 (Patch Set 2) ['git fetch github', u'refs/changes/97/313397/2'] ### repopick -t n-asb-2021-08 ### ... A new version of repo (2.29) is available. ... You should upgrade soon: cp /srv/src/CM_14_1/.repo/repo/repo /usr/local/bin/repo Trace outputs in /srv/src/CM_14_1/.repo/TRACE_FILE Applying change number 314466... Change status is MERGED. Skipping the cherry pick. Use -f to force this pick. Applying change number 314467... Change status is MERGED. Skipping the cherry pick. Use -f to force this pick. Applying change number 314468... Change status is MERGED. Skipping the cherry pick. Use -f to force this pick. Applying change number 314469... Change status is MERGED. Skipping the cherry pick. Use -f to force this pick. Applying change number 314470... Change status is MERGED. Skipping the cherry pick. Use -f to force this pick. ### repopick -t n-asb-2021-09 ### ... A new version of repo (2.29) is available. ... You should upgrade soon: cp /srv/src/CM_14_1/.repo/repo/repo /usr/local/bin/repo Trace outputs in /srv/src/CM_14_1/.repo/TRACE_FILE From https://github.com/LineageOS/android_external_libavc * branch refs/changes/11/315711/1 -> FETCH_HEAD From https://github.com/LineageOS/android_frameworks_base * branch refs/changes/12/315712/3 -> FETCH_HEAD From https://github.com/LineageOS/android_frameworks_base * branch refs/changes/13/315713/3 -> FETCH_HEAD From https://github.com/LineageOS/android_frameworks_native * branch refs/changes/14/315714/1 -> FETCH_HEAD From https://github.com/LineageOS/android_packages_apps_Nfc * branch refs/changes/15/315715/1 -> FETCH_HEAD [detached HEAD e0bbb578] Add HIDE_NON_SYSTEM_OVERLAY_WINDOWS permission to Nfc Author: Alisher Alikhodjaev Date: Thu Jun 17 11:27:00 2021 -0700 1 file changed, 1 insertion(+) From https://github.com/LineageOS/android_packages_apps_Settings * branch refs/changes/16/315716/2 -> FETCH_HEAD [detached HEAD d51301905d] RESTRICT AUTOMERGE Update string Author: Hugh Chen Date: Thu Jun 3 16:38:24 2021 +0800 2 files changed, 8 insertions(+), 5 deletions(-) From https://github.com/LineageOS/android_packages_apps_Settings * branch refs/changes/17/315717/2 -> FETCH_HEAD [detached HEAD 2bab4691b1] RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message Author: Hugh Chen Date: Thu Jun 3 16:38:24 2021 +0800 3 files changed, 44 insertions(+), 12 deletions(-) From https://github.com/LineageOS/android_system_bt * branch refs/changes/19/315719/1 -> FETCH_HEAD [detached HEAD a72168ed] SMP: Reject pairing if public_key.x match Author: Hansong Zhang Date: Mon Jun 7 11:06:17 2021 -0700 1 file changed, 1 insertion(+), 2 deletions(-) From https://github.com/LineageOS/android_frameworks_base * branch refs/changes/40/315740/2 -> FETCH_HEAD From https://github.com/LineageOS/android_frameworks_base * branch refs/changes/41/315741/2 -> FETCH_HEAD Applying change number 315711... --> Subject: "Decoder: Update check for increment u2_cur_slice_num" --> Project path: external/libavc --> Change number: 315711 (Patch Set 1) ['git fetch github', u'refs/changes/11/315711/1'] Applying change number 315712... --> Subject: "Fix race condition between lockNow() and updateLockscreenTimeout" --> Project path: frameworks/base --> Change number: 315712 (Patch Set 3) ['git fetch github', u'refs/changes/12/315712/3'] Applying change number 315713... --> Subject: "Improve ellipsize performance" --> Project path: frameworks/base --> Change number: 315713 (Patch Set 3) ['git fetch github', u'refs/changes/13/315713/3'] Applying change number 315714... --> Subject: "Do not modify vector after getting references" --> Project path: frameworks/native --> Change number: 315714 (Patch Set 1) ['git fetch github', u'refs/changes/14/315714/1'] Applying change number 315715... --> Subject: "Add HIDE_NON_SYSTEM_OVERLAY_WINDOWS permission to Nfc" --> Project path: packages/apps/Nfc --> Change number: 315715 (Patch Set 1) ['git fetch github', u'refs/changes/15/315715/1'] Applying change number 315716... --> Subject: "RESTRICT AUTOMERGE Update string" --> Project path: packages/apps/Settings --> Change number: 315716 (Patch Set 2) ['git fetch github', u'refs/changes/16/315716/2'] Applying change number 315717... --> Subject: "RESTRICT AUTOMERGE Fix phishing attacks over Bluetooth due to unclear warning message" --> Project path: packages/apps/Settings --> Change number: 315717 (Patch Set 2) ['git fetch github', u'refs/changes/17/315717/2'] Applying change number 315719... --> Subject: "SMP: Reject pairing if public_key.x match" --> Project path: system/bt --> Change number: 315719 (Patch Set 1) ['git fetch github', u'refs/changes/19/315719/1'] Applying change number 315740... --> Subject: "Fix side effects of trace-ipc and dumpheap commands" --> Project path: frameworks/base --> Change number: 315740 (Patch Set 2) ['git fetch github', u'refs/changes/40/315740/2'] Applying change number 315741... --> Subject: "Don't attach private Notification to A11yEvent when user locked" --> Project path: frameworks/base --> Change number: 315741 (Patch Set 2) ['git fetch github', u'refs/changes/41/315741/2'] ### repopick -t n-asb-2021-10 ### ... A new version of repo (2.29) is available. ... You should upgrade soon: cp /srv/src/CM_14_1/.repo/repo/repo /usr/local/bin/repo Trace outputs in /srv/src/CM_14_1/.repo/TRACE_FILE From https://github.com/LineageOS/android_frameworks_base * branch refs/changes/35/317035/3 -> FETCH_HEAD From https://github.com/LineageOS/android_frameworks_base * branch refs/changes/36/317036/3 -> FETCH_HEAD From https://github.com/LineageOS/android_external_libnfc-nci * branch refs/changes/37/317037/1 -> FETCH_HEAD From https://github.com/LineageOS/android_external_sonivox * branch refs/changes/38/317038/1 -> FETCH_HEAD From https://github.com/LineageOS/android_frameworks_base * branch refs/changes/49/317049/2 -> FETCH_HEAD error: Your local changes to the following files would be overwritten by merge: core/res/res/values/strings.xml Please commit your changes or stash them before you merge. Aborting fatal: cherry-pick failed Applying change number 317035... --> Subject: "Fix a potential thread safety issue in VectorDrawable" --> Project path: frameworks/base --> Change number: 317035 (Patch Set 3) ['git fetch github', u'refs/changes/35/317035/3'] Applying change number 317036... --> Subject: "DO NOT MERGE Apply a maximum char count to the load label api" --> Project path: frameworks/base --> Change number: 317036 (Patch Set 3) ['git fetch github', u'refs/changes/36/317036/3'] Applying change number 317037... --> Subject: "Type confusion due to race condition on tag type change" --> Project path: external/libnfc-nci --> Change number: 317037 (Patch Set 1) ['git fetch github', u'refs/changes/37/317037/1'] Applying change number 317038... --> Subject: "sonivox: Fix global buffer overflow in WT_InterpolateNoLoop" --> Project path: external/sonivox --> Change number: 317038 (Patch Set 1) ['git fetch github', u'refs/changes/38/317038/1'] Applying change number 317049... --> Subject: "Change ownership of the account request notification." --> Project path: frameworks/base --> Change number: 317049 (Patch Set 2) ['git fetch github', u'refs/changes/49/317049/2'] ERROR: git command failed ### repopick -t n-asb-2021-11 ### ... A new version of repo (2.29) is available. ... You should upgrade soon: cp /srv/src/CM_14_1/.repo/repo/repo /usr/local/bin/repo Trace outputs in /srv/src/CM_14_1/.repo/TRACE_FILE From https://github.com/LineageOS/android_external_libnfc-nci * branch refs/changes/15/318515/1 -> FETCH_HEAD [detached HEAD 36977cc] OOBW in phNxpNciHal_process_ext_rsp Author: Alisher Alikhodjaev Date: Tue May 4 17:46:57 2021 -0700 1 file changed, 6 insertions(+), 1 deletion(-) From https://github.com/LineageOS/android_frameworks_base * branch refs/changes/16/318516/2 -> FETCH_HEAD [detached HEAD 98a1949ed9e] camera2: Fix exception swallowing in params classes createFromParcel Author: Jayant Chowdhary Date: Wed Jun 9 14:34:54 2021 -0700 2 files changed, 2 insertions(+), 14 deletions(-) From https://github.com/LineageOS/android_frameworks_base * branch refs/changes/17/318517/2 -> FETCH_HEAD [detached HEAD 82f4bfb7b8b] DO NOT MERGE Bluetooth: Fix formatting in getAlias() Author: Hansong Zhang Date: Wed Aug 18 16:35:00 2021 -0700 1 file changed, 11 insertions(+), 2 deletions(-) From https://github.com/LineageOS/android_packages_apps_Contacts * branch refs/changes/18/318518/1 -> FETCH_HEAD [detached HEAD ced1ef26f] Add permission to start NFC activity to ensure it is from NFC stack Author: John Shao Date: Wed Aug 25 23:29:56 2021 +0000 1 file changed, 1 insertion(+) From https://github.com/LineageOS/android_packages_apps_Settings * branch refs/changes/19/318519/2 -> FETCH_HEAD [detached HEAD 8f414ca6e8] Import translations. DO NOT MERGE ANYWHERE Author: Bill Yi Date: Tue Aug 17 22:14:24 2021 -0700 50 files changed, 850 insertions(+) Applying change number 318515... --> Subject: "OOBW in phNxpNciHal_process_ext_rsp" --> Project path: external/libnfc-nci --> Change number: 318515 (Patch Set 1) ['git fetch github', u'refs/changes/15/318515/1'] Applying change number 318516... --> Subject: "camera2: Fix exception swallowing in params classes createFromParcel" --> Project path: frameworks/base --> Change number: 318516 (Patch Set 2) ['git fetch github', u'refs/changes/16/318516/2'] Applying change number 318517... --> Subject: "DO NOT MERGE Bluetooth: Fix formatting in getAlias()" --> Project path: frameworks/base --> Change number: 318517 (Patch Set 2) ['git fetch github', u'refs/changes/17/318517/2'] Applying change number 318518... --> Subject: "Add permission to start NFC activity to ensure it is from NFC stack" --> Project path: packages/apps/Contacts --> Change number: 318518 (Patch Set 1) ['git fetch github', u'refs/changes/18/318518/1'] Applying change number 318519... --> Subject: "Import translations. DO NOT MERGE ANYWHERE" --> Project path: packages/apps/Settings --> Change number: 318519 (Patch Set 2) ['git fetch github', u'refs/changes/19/318519/2'] ### repopick -t n-asb-2021-12 ### ... A new version of repo (2.29) is available. ... You should upgrade soon: cp /srv/src/CM_14_1/.repo/repo/repo /usr/local/bin/repo Trace outputs in /srv/src/CM_14_1/.repo/TRACE_FILE From https://github.com/LineageOS/android_external_tremolo * branch refs/changes/86/319986/1 -> FETCH_HEAD From https://github.com/LineageOS/android_frameworks_av * branch refs/changes/87/319987/1 -> FETCH_HEAD From https://github.com/LineageOS/android_frameworks_base * branch refs/changes/88/319988/2 -> FETCH_HEAD [detached HEAD 14e1398208c] Fix serialization bug in GpsNavigationMessage Author: Yu-Han Yang Date: Tue Sep 21 12:29:34 2021 -0700 1 file changed, 2 insertions(+), 6 deletions(-) From https://github.com/LineageOS/android_packages_apps_Contacts * branch refs/changes/89/319989/1 -> FETCH_HEAD [detached HEAD f00e0388a] Address photo editing security bug Author: Gary Mai Date: Wed Sep 15 16:20:01 2021 -0700 2 files changed, 16 insertions(+), 10 deletions(-) From https://github.com/LineageOS/android_packages_apps_KeyChain * branch refs/changes/90/319990/1 -> FETCH_HEAD [detached HEAD 90498bd] DO NOT MERGE Hide overlay on KeyChainActivity Author: Tianyi Hu Date: Wed Sep 15 21:43:18 2021 +0800 2 files changed, 5 insertions(+) From https://github.com/LineageOS/android_packages_apps_Settings * branch refs/changes/91/319991/2 -> FETCH_HEAD [detached HEAD 608eaa57f2] BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog Author: Chen Chen Date: Tue Oct 5 17:46:02 2021 -0700 1 file changed, 1 insertion(+) From https://github.com/LineageOS/android_system_bt * branch refs/changes/20/320420/1 -> FETCH_HEAD [detached HEAD 25f8ee37] osi: Prevent memory allocations with MSB set Author: Chris Manton Date: Wed Sep 29 17:49:25 2021 -0700 1 file changed, 2 insertions(+) Applying change number 319986... --> Subject: "handle cases where order isn't a multiple of dimension" --> Project path: external/tremolo --> Change number: 319986 (Patch Set 1) ['git fetch github', u'refs/changes/86/319986/1'] Applying change number 319987... --> Subject: "Fix heap-buffer-overflow in MPEG4Extractor" --> Project path: frameworks/av --> Change number: 319987 (Patch Set 1) ['git fetch github', u'refs/changes/87/319987/1'] Applying change number 319988... --> Subject: "Fix serialization bug in GpsNavigationMessage" --> Project path: frameworks/base --> Change number: 319988 (Patch Set 2) ['git fetch github', u'refs/changes/88/319988/2'] Applying change number 319989... --> Subject: "Address photo editing security bug" --> Project path: packages/apps/Contacts --> Change number: 319989 (Patch Set 1) ['git fetch github', u'refs/changes/89/319989/1'] Applying change number 319990... --> Subject: "DO NOT MERGE Hide overlay on KeyChainActivity" --> Project path: packages/apps/KeyChain --> Change number: 319990 (Patch Set 1) ['git fetch github', u'refs/changes/90/319990/1'] Applying change number 319991... --> Subject: "BluetoothSecurity: Add BLUETOOTH_PRIVILEGED permission for pairing dialog" --> Project path: packages/apps/Settings --> Change number: 319991 (Patch Set 2) ['git fetch github', u'refs/changes/91/319991/2'] Applying change number 320420... --> Subject: "osi: Prevent memory allocations with MSB set" --> Project path: system/bt --> Change number: 320420 (Patch Set 1) ['git fetch github', u'refs/changes/20/320420/1'] ### repopick -t n-asb-2022-01 ### ... A new version of repo (2.29) is available. ... You should upgrade soon: cp /srv/src/CM_14_1/.repo/repo/repo /usr/local/bin/repo Trace outputs in /srv/src/CM_14_1/.repo/TRACE_FILE From https://github.com/LineageOS/android_frameworks_av * branch refs/changes/22/321222/1 -> FETCH_HEAD [detached HEAD 26494dfd7] SimpleDecodingSource:Prevent OOB write in heap mem Author: Gopalakrishnan Nallasamy Date: Wed Sep 29 08:24:26 2021 -0700 1 file changed, 8 insertions(+), 3 deletions(-) From https://github.com/LineageOS/android_frameworks_base * branch refs/changes/52/322452/2 -> FETCH_HEAD Auto-merging services/core/java/com/android/server/accounts/AccountManagerService.java [detached HEAD 5f89be6e8b6] Fix another AddAccountSettings memory leak Author: tiansiming Date: Wed Sep 20 13:59:13 2017 +0800 1 file changed, 25 insertions(+), 11 deletions(-) From https://github.com/LineageOS/android_frameworks_base * branch refs/changes/53/322453/2 -> FETCH_HEAD Auto-merging services/core/java/com/android/server/accounts/AccountManagerService.java [detached HEAD c69c055d3c2] Force-set a ClipData to prevent later migration. Author: Jeff Sharkey Date: Thu Apr 23 11:11:06 2020 -0600 1 file changed, 6 insertions(+) From https://github.com/LineageOS/android_frameworks_base * branch refs/changes/54/322454/4 -> FETCH_HEAD [detached HEAD 5d0dd49dd2b] Prevent apps from spamming addAccountExplicitly. Author: Aseem Kumar Date: Mon May 17 09:25:03 2021 +0000 1 file changed, 7 insertions(+) Applying change number 321222... --> Subject: "SimpleDecodingSource:Prevent OOB write in heap mem" --> Project path: frameworks/av --> Change number: 321222 (Patch Set 1) ['git fetch github', u'refs/changes/22/321222/1'] Applying change number 322452... --> Subject: "Fix another AddAccountSettings memory leak" --> Project path: frameworks/base --> Change number: 322452 (Patch Set 2) ['git fetch github', u'refs/changes/52/322452/2'] Applying change number 322453... --> Subject: "Force-set a ClipData to prevent later migration." --> Project path: frameworks/base --> Change number: 322453 (Patch Set 2) ['git fetch github', u'refs/changes/53/322453/2'] Applying change number 322454... --> Subject: "Prevent apps from spamming addAccountExplicitly." --> Project path: frameworks/base --> Change number: 322454 (Patch Set 4) ['git fetch github', u'refs/changes/54/322454/4'] ### repopick -t n-asb-2022-02 ### ... A new version of repo (2.29) is available. ... You should upgrade soon: cp /srv/src/CM_14_1/.repo/repo/repo /usr/local/bin/repo Trace outputs in /srv/src/CM_14_1/.repo/TRACE_FILE From https://github.com/LineageOS/android_system_bt * branch refs/changes/56/323456/1 -> FETCH_HEAD [detached HEAD bd064e40] security: Use-After-Free in btm_sec_[dis]connected Author: Chris Manton Date: Mon Nov 8 16:45:42 2021 -0800 1 file changed, 2 insertions(+), 2 deletions(-) From https://github.com/LineageOS/android_system_bt * branch refs/changes/57/323457/1 -> FETCH_HEAD [detached HEAD c7630521] Reset the IRK after all devices are unpaired Author: Martin Brabham Date: Fri Oct 29 21:27:27 2021 +0000 1 file changed, 8 insertions(+) From https://github.com/LineageOS/android_packages_apps_Settings * branch refs/changes/58/323458/2 -> FETCH_HEAD [detached HEAD a655bc3087] Rephrase dialog message of clear storage dialog for security concern Author: Yanting Yang Date: Thu Oct 14 15:06:33 2021 +0000 1 file changed, 1 insertion(+), 1 deletion(-) From https://github.com/LineageOS/android_external_libexif * branch refs/changes/59/323459/1 -> FETCH_HEAD From https://github.com/LineageOS/android_external_libexif * branch refs/changes/60/323460/1 -> FETCH_HEAD From https://github.com/LineageOS/android_external_libexif * branch refs/changes/61/323461/1 -> FETCH_HEAD From https://github.com/LineageOS/android_external_libavc * branch refs/changes/62/323462/1 -> FETCH_HEAD From https://github.com/LineageOS/android_packages_providers_MediaProvider * branch refs/changes/48/324248/2 -> FETCH_HEAD Applying change number 323456... --> Subject: "security: Use-After-Free in btm_sec_[dis]connected" --> Project path: system/bt --> Change number: 323456 (Patch Set 1) ['git fetch github', u'refs/changes/56/323456/1'] Applying change number 323457... --> Subject: "Reset the IRK after all devices are unpaired" --> Project path: system/bt --> Change number: 323457 (Patch Set 1) ['git fetch github', u'refs/changes/57/323457/1'] Applying change number 323458... --> Subject: "Rephrase dialog message of clear storage dialog for security concern" --> Project path: packages/apps/Settings --> Change number: 323458 (Patch Set 2) ['git fetch github', u'refs/changes/58/323458/2'] Applying change number 323459... --> Subject: "Fix MakerNote tag size overflow issues at read time." --> Project path: external/libexif --> Change number: 323459 (Patch Set 1) ['git fetch github', u'refs/changes/59/323459/1'] Applying change number 323460... --> Subject: "Ensure MakeNote data pointers are initialized with NULL." --> Project path: external/libexif --> Change number: 323460 (Patch Set 1) ['git fetch github', u'refs/changes/60/323460/1'] Applying change number 323461... --> Subject: "Zero initialize ExifMnoteData during construction with exif_mnote_data__new." --> Project path: external/libexif --> Change number: 323461 (Patch Set 1) ['git fetch github', u'refs/changes/61/323461/1'] Applying change number 323462... --> Subject: "Move slice increments after completing header parsing" --> Project path: external/libavc --> Change number: 323462 (Patch Set 1) ['git fetch github', u'refs/changes/62/323462/1'] Applying change number 324248... --> Subject: "Open all files with O_NOFOLLOW." --> Project path: packages/providers/MediaProvider --> Change number: 324248 (Patch Set 2) ['git fetch github', u'refs/changes/48/324248/2'] ### repopick -t n-asb-2022-03 ### ... A new version of repo (2.29) is available. ... You should upgrade soon: cp /srv/src/CM_14_1/.repo/repo/repo /usr/local/bin/repo Trace outputs in /srv/src/CM_14_1/.repo/TRACE_FILE From https://github.com/LineageOS/android_frameworks_native * branch refs/changes/93/325993/1 -> FETCH_HEAD [detached HEAD 0c632e861] Check if the window is partially obscured for slippery enters Author: Siarhei Vishniakou Date: Wed Dec 9 08:07:46 2020 -1000 1 file changed, 2 insertions(+) From https://github.com/LineageOS/android_packages_apps_Settings * branch refs/changes/94/325994/3 -> FETCH_HEAD [detached HEAD 60ea9472a1] Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment Author: Edgar Wang Date: Thu Jan 6 20:53:48 2022 +0800 1 file changed, 17 insertions(+), 7 deletions(-) From https://github.com/LineageOS/android_packages_apps_Settings * branch refs/changes/99/327099/1 -> FETCH_HEAD [detached HEAD 15fd72fe73] Add caller check to com.android.credentials.RESET [Backport] Author: Alex Johnston Date: Wed Jan 5 22:19:29 2022 +0000 1 file changed, 17 insertions(+), 1 deletion(-) Applying change number 325993... --> Subject: "Check if the window is partially obscured for slippery enters" --> Project path: frameworks/native --> Change number: 325993 (Patch Set 1) ['git fetch github', u'refs/changes/93/325993/1'] Applying change number 325994... --> Subject: "Fix bypass CALL_PRIVILEGED permission in AppRestrictionsFragment" --> Project path: packages/apps/Settings --> Change number: 325994 (Patch Set 3) ['git fetch github', u'refs/changes/94/325994/3'] Applying change number 327099... --> Subject: "Add caller check to com.android.credentials.RESET [Backport]" --> Project path: packages/apps/Settings --> Change number: 327099 (Patch Set 1) ['git fetch github', u'refs/changes/99/327099/1'] ### repopick -t n-asb-2022-04 ### ... A new version of repo (2.29) is available. ... You should upgrade soon: cp /srv/src/CM_14_1/.repo/repo/repo /usr/local/bin/repo Trace outputs in /srv/src/CM_14_1/.repo/TRACE_FILE From https://github.com/LineageOS/android_system_bt * branch refs/changes/06/328306/1 -> FETCH_HEAD [detached HEAD 4018e935] Security fix OOB read due to invalid count in stack/avrc/avrc_pars_ct Author: Ted Wang Date: Thu Jan 13 15:00:32 2022 +0800 1 file changed, 10 insertions(+) From https://github.com/LineageOS/android_packages_apps_Nfc * branch refs/changes/08/328308/1 -> FETCH_HEAD [detached HEAD 5907a3c7] Do not set default contactless application without user interaction Author: Jack Yu Date: Thu Jan 13 16:27:22 2022 +0800 1 file changed, 4 insertions(+), 23 deletions(-) Applying change number 328306... --> Subject: "Security fix OOB read due to invalid count in stack/avrc/avrc_pars_ct" --> Project path: system/bt --> Change number: 328306 (Patch Set 1) ['git fetch github', u'refs/changes/06/328306/1'] Applying change number 328308... --> Subject: "Do not set default contactless application without user interaction" --> Project path: packages/apps/Nfc --> Change number: 328308 (Patch Set 1) ['git fetch github', u'refs/changes/08/328308/1'] ### repopick -t n-asb-2022-05 ### ... A new version of repo (2.29) is available. ... You should upgrade soon: cp /srv/src/CM_14_1/.repo/repo/repo /usr/local/bin/repo Trace outputs in /srv/src/CM_14_1/.repo/TRACE_FILE From https://github.com/LineageOS/android_frameworks_base * branch refs/changes/08/331108/1 -> FETCH_HEAD [detached HEAD 31f048d5b83] Always restart apps if base.apk gets updated. Author: Alex Buynytskyy Date: Thu Feb 24 21:40:13 2022 -0800 3 files changed, 24 insertions(+) Applying change number 331108... --> Subject: "Always restart apps if base.apk gets updated." --> Project path: frameworks/base --> Change number: 331108 (Patch Set 1) ['git fetch github', u'refs/changes/08/331108/1'] ### repopick -t n-asb-2022-06 ### ... A new version of repo (2.29) is available. ... You should upgrade soon: cp /srv/src/CM_14_1/.repo/repo/repo /usr/local/bin/repo Trace outputs in /srv/src/CM_14_1/.repo/TRACE_FILE From https://github.com/LineageOS/android_frameworks_base * branch refs/changes/44/332444/1 -> FETCH_HEAD [detached HEAD a3b3aa2e013] Fixed a concurrent modification crash Author: Selim Cinek Date: Fri May 5 14:45:11 2017 -0700 1 file changed, 6 insertions(+), 2 deletions(-) From https://github.com/LineageOS/android_frameworks_base * branch refs/changes/45/332445/1 -> FETCH_HEAD [detached HEAD 4c73611db73] Fix security hole in GateKeeperResponse Author: Ayush Sharma Date: Wed Mar 16 10:32:23 2022 +0000 1 file changed, 1 insertion(+), 1 deletion(-) From https://github.com/LineageOS/android_frameworks_base * branch refs/changes/46/332446/1 -> FETCH_HEAD [detached HEAD e1afbb3be6d] Update GeofenceHardwareRequestParcelable to match parcel/unparcel format. Author: David Christie Date: Fri Mar 11 01:13:31 2022 +0000 1 file changed, 3 insertions(+), 6 deletions(-) From https://github.com/LineageOS/android_frameworks_base * branch refs/changes/47/332447/2 -> FETCH_HEAD error: Your local changes to the following files would be overwritten by merge: services/core/java/com/android/server/pm/PackageManagerService.java Please commit your changes or stash them before you merge. Aborting fatal: cherry-pick failed Applying change number 332444... --> Subject: "Fixed a concurrent modification crash" --> Project path: frameworks/base --> Change number: 332444 (Patch Set 1) ['git fetch github', u'refs/changes/44/332444/1'] Applying change number 332445... --> Subject: "Fix security hole in GateKeeperResponse" --> Project path: frameworks/base --> Change number: 332445 (Patch Set 1) ['git fetch github', u'refs/changes/45/332445/1'] Applying change number 332446... --> Subject: "Update GeofenceHardwareRequestParcelable to match parcel/unparcel format." --> Project path: frameworks/base --> Change number: 332446 (Patch Set 1) ['git fetch github', u'refs/changes/46/332446/1'] Applying change number 332447... --> Subject: "RESTRICT AUTOMERGE Prevent non-admin users from deleting system apps." --> Project path: frameworks/base --> Change number: 332447 (Patch Set 2) ['git fetch github', u'refs/changes/47/332447/2'] ERROR: git command failed ### repopick -t n-asb-2022-07 ### ... A new version of repo (2.29) is available. ... You should upgrade soon: cp /srv/src/CM_14_1/.repo/repo/repo /usr/local/bin/repo Trace outputs in /srv/src/CM_14_1/.repo/TRACE_FILE From https://github.com/LineageOS/android_system_bt * branch refs/changes/32/334032/1 -> FETCH_HEAD [detached HEAD da470b02] Security: Fix out of bound write in HFP client Author: Chen Chen Date: Fri Apr 15 14:24:48 2022 -0700 1 file changed, 4 insertions(+) From https://github.com/LineageOS/android_system_bt * branch refs/changes/33/334033/1 -> FETCH_HEAD [detached HEAD c241a05a] Check Avrcp packet vendor length before extracting length Author: William Escande Date: Mon May 2 09:48:59 2022 -0700 1 file changed, 7 insertions(+) From https://github.com/LineageOS/android_system_bt * branch refs/changes/34/334034/1 -> FETCH_HEAD [detached HEAD ff3fb5c6] Security: Fix out of bound read in AT_SKIP_REST Author: Josh Wu Date: Fri Apr 29 00:02:23 2022 -0700 1 file changed, 1 insertion(+), 1 deletion(-) From https://github.com/LineageOS/android_frameworks_base * branch refs/changes/35/334035/1 -> FETCH_HEAD Auto-merging services/core/java/com/android/server/notification/NotificationManagerService.java [detached HEAD d9d40bb7cbb] DO NOT MERGE Crash invalid FGS notifications Author: Julia Reynolds Date: Wed Jul 7 16:19:44 2021 -0400 1 file changed, 5 insertions(+), 2 deletions(-) From https://github.com/LineageOS/android_packages_apps_KeyChain * branch refs/changes/36/334036/1 -> FETCH_HEAD Auto-merging src/com/android/keychain/KeyChainActivity.java [detached HEAD 902c58f] Encode authority part of uri before showing in UI Author: Ayush Sharma Date: Tue May 10 14:09:40 2022 +0000 1 file changed, 1 insertion(+), 1 deletion(-) From https://github.com/LineageOS/android_packages_apps_Settings * branch refs/changes/37/334037/1 -> FETCH_HEAD [detached HEAD b61ab2098c] Fix LaunchAnyWhere in AppRestrictionsFragment Author: Edgar Wang Date: Wed Apr 6 17:30:27 2022 +0800 1 file changed, 1 insertion(+), 4 deletions(-) Applying change number 334032... --> Subject: "Security: Fix out of bound write in HFP client" --> Project path: system/bt --> Change number: 334032 (Patch Set 1) ['git fetch github', u'refs/changes/32/334032/1'] Applying change number 334033... --> Subject: "Check Avrcp packet vendor length before extracting length" --> Project path: system/bt --> Change number: 334033 (Patch Set 1) ['git fetch github', u'refs/changes/33/334033/1'] Applying change number 334034... --> Subject: "Security: Fix out of bound read in AT_SKIP_REST" --> Project path: system/bt --> Change number: 334034 (Patch Set 1) ['git fetch github', u'refs/changes/34/334034/1'] Applying change number 334035... --> Subject: "DO NOT MERGE Crash invalid FGS notifications" --> Project path: frameworks/base --> Change number: 334035 (Patch Set 1) ['git fetch github', u'refs/changes/35/334035/1'] Applying change number 334036... --> Subject: "Encode authority part of uri before showing in UI" --> Project path: packages/apps/KeyChain --> Change number: 334036 (Patch Set 1) ['git fetch github', u'refs/changes/36/334036/1'] Applying change number 334037... --> Subject: "Fix LaunchAnyWhere in AppRestrictionsFragment" --> Project path: packages/apps/Settings --> Change number: 334037 (Patch Set 1) ['git fetch github', u'refs/changes/37/334037/1'] ### repopick -t n-asb-2022-08 ### ... A new version of repo (2.29) is available. ... You should upgrade soon: cp /srv/src/CM_14_1/.repo/repo/repo /usr/local/bin/repo Trace outputs in /srv/src/CM_14_1/.repo/TRACE_FILE From https://github.com/LineageOS/android_frameworks_base * branch refs/changes/71/334871/1 -> FETCH_HEAD [detached HEAD 7bc83acf2d7] Only allow system and same app to apply relinquishTaskIdentity Author: Jeff Chang Date: Wed Sep 29 16:49:00 2021 +0800 1 file changed, 38 insertions(+), 10 deletions(-) From https://github.com/LineageOS/android_frameworks_base * branch refs/changes/72/334872/1 -> FETCH_HEAD [detached HEAD 519fd3e648c] Stop using invalid URL to prevent unexpected crash Author: chiachangwang Date: Thu Jun 2 10:22:20 2022 +0000 1 file changed, 17 insertions(+), 2 deletions(-) From https://github.com/LineageOS/android_frameworks_base * branch refs/changes/73/334873/1 -> FETCH_HEAD [detached HEAD 36a0163bb84] Only allow the system server to connect to sync adapters Author: Makoto Onuki Date: Tue Apr 19 10:54:18 2022 -0700 1 file changed, 17 insertions(+) From https://github.com/LineageOS/android_packages_apps_Settings * branch refs/changes/74/334874/1 -> FETCH_HEAD [detached HEAD bbebe6e945] Verify ringtone from ringtone picker is audio Author: Arc Wang Date: Fri May 6 17:42:30 2022 +0800 1 file changed, 18 insertions(+) From https://github.com/LineageOS/android_packages_apps_Settings * branch refs/changes/75/334875/1 -> FETCH_HEAD [detached HEAD 1791386495] Fix Settings crash when setting a null ringtone Author: Arc Wang Date: Mon May 16 14:36:19 2022 +0800 1 file changed, 5 insertions(+) From https://github.com/LineageOS/android_packages_providers_ContactsProvider * branch refs/changes/76/334876/1 -> FETCH_HEAD From https://github.com/LineageOS/android_system_bt * branch refs/changes/77/334877/1 -> FETCH_HEAD [detached HEAD 6d0ffec1] Removing bonded device when auth fails due to missing keys Author: Roopa Sattiraju Date: Wed May 25 21:00:01 2022 +0000 1 file changed, 3 deletions(-) Applying change number 334871... --> Subject: "Only allow system and same app to apply relinquishTaskIdentity" --> Project path: frameworks/base --> Change number: 334871 (Patch Set 1) ['git fetch github', u'refs/changes/71/334871/1'] Applying change number 334872... --> Subject: "Stop using invalid URL to prevent unexpected crash" --> Project path: frameworks/base --> Change number: 334872 (Patch Set 1) ['git fetch github', u'refs/changes/72/334872/1'] Applying change number 334873... --> Subject: "Only allow the system server to connect to sync adapters" --> Project path: frameworks/base --> Change number: 334873 (Patch Set 1) ['git fetch github', u'refs/changes/73/334873/1'] Applying change number 334874... --> Subject: "Verify ringtone from ringtone picker is audio" --> Project path: packages/apps/Settings --> Change number: 334874 (Patch Set 1) ['git fetch github', u'refs/changes/74/334874/1'] Applying change number 334875... --> Subject: "Fix Settings crash when setting a null ringtone" --> Project path: packages/apps/Settings --> Change number: 334875 (Patch Set 1) ['git fetch github', u'refs/changes/75/334875/1'] Applying change number 334876... --> Subject: "enforce stricter CallLogProvider query" --> Project path: packages/providers/ContactsProvider --> Change number: 334876 (Patch Set 1) ['git fetch github', u'refs/changes/76/334876/1'] Applying change number 334877... --> Subject: "Removing bonded device when auth fails due to missing keys" --> Project path: system/bt --> Change number: 334877 (Patch Set 1) ['git fetch github', u'refs/changes/77/334877/1'] ### repopick -f 338382 ### ... A new version of repo (2.29) is available. ... You should upgrade soon: cp /srv/src/CM_14_1/.repo/repo/repo /usr/local/bin/repo Trace outputs in /srv/src/CM_14_1/.repo/TRACE_FILE From https://github.com/LineageOS/android * branch refs/changes/82/338382/1 -> FETCH_HEAD Applying change number 338382... --> Subject: "manifest: Track our own expat" --> Project path: android --> Change number: 338382 (Patch Set 1) ['git fetch github', u'refs/changes/82/338382/1'] sync repo: external/expat ... A new version of repo (2.29) is available. ... You should upgrade soon: cp /srv/src/CM_14_1/.repo/repo/repo /usr/local/bin/repo Trace outputs in /srv/src/CM_14_1/.repo/TRACE_FILE repo sync has finished successfully. ### repopick -t n-asb-2022-09 ### ... A new version of repo (2.29) is available. ... You should upgrade soon: cp /srv/src/CM_14_1/.repo/repo/repo /usr/local/bin/repo Trace outputs in /srv/src/CM_14_1/.repo/TRACE_FILE From https://github.com/LineageOS/android_system_bt * branch refs/changes/98/337998/1 -> FETCH_HEAD [detached HEAD ce66bce9] Fix OOB in BNEP_Write Author: Chienyuan Date: Wed Jan 30 19:17:03 2019 +0800 1 file changed, 13 insertions(+), 2 deletions(-) From https://github.com/LineageOS/android_system_bt * branch refs/changes/99/337999/1 -> FETCH_HEAD [detached HEAD d5d89d07] Fix OOB in bnep_is_packet_allowed Author: Chienyuan Date: Tue Feb 12 16:01:00 2019 +0800 3 files changed, 26 insertions(+), 4 deletions(-) From https://github.com/LineageOS/android_system_bt * branch refs/changes/00/338000/1 -> FETCH_HEAD [detached HEAD af2d7e11] Fix OOB in reassemble_and_dispatch Author: Venkata Jagadeesh Garaga Date: Tue Mar 22 13:35:43 2022 +0530 1 file changed, 3 insertions(+), 2 deletions(-) From https://github.com/LineageOS/android_frameworks_base * branch refs/changes/03/338003/1 -> FETCH_HEAD [detached HEAD 1add91876ae] IMMS: Make IMMS PendingIntents immutable Author: Adrian Roos Date: Thu Sep 24 15:30:46 2020 +0200 1 file changed, 4 insertions(+), 2 deletions(-) From https://github.com/LineageOS/android_external_expat * branch refs/changes/84/338384/1 -> FETCH_HEAD From https://github.com/LineageOS/android_external_expat * branch refs/changes/85/338385/1 -> FETCH_HEAD From https://github.com/LineageOS/android_external_expat * branch refs/changes/86/338386/1 -> FETCH_HEAD Applying change number 337998... --> Subject: "Fix OOB in BNEP_Write" --> Project path: system/bt --> Change number: 337998 (Patch Set 1) ['git fetch github', u'refs/changes/98/337998/1'] Applying change number 337999... --> Subject: "Fix OOB in bnep_is_packet_allowed" --> Project path: system/bt --> Change number: 337999 (Patch Set 1) ['git fetch github', u'refs/changes/99/337999/1'] Applying change number 338000... --> Subject: "Fix OOB in reassemble_and_dispatch" --> Project path: system/bt --> Change number: 338000 (Patch Set 1) ['git fetch github', u'refs/changes/00/338000/1'] Applying change number 338003... --> Subject: "IMMS: Make IMMS PendingIntents immutable" --> Project path: frameworks/base --> Change number: 338003 (Patch Set 1) ['git fetch github', u'refs/changes/03/338003/1'] Applying change number 338382... Skipping 338382 - already picked in android as HEAD~0 Applying change number 338384... --> Subject: "Prevent XML_GetBuffer signed integer overflow" --> Project path: external/expat --> Change number: 338384 (Patch Set 1) ['git fetch github', u'refs/changes/84/338384/1'] Applying change number 338385... --> Subject: "Prevent integer overflow in function doProlog" --> Project path: external/expat --> Change number: 338385 (Patch Set 1) ['git fetch github', u'refs/changes/85/338385/1'] Applying change number 338386... --> Subject: "Prevent more integer overflows" --> Project path: external/expat --> Change number: 338386 (Patch Set 1) ['git fetch github', u'refs/changes/86/338386/1'] ### repopick -t n-asb-2022-10 ### ... A new version of repo (2.29) is available. ... You should upgrade soon: cp /srv/src/CM_14_1/.repo/repo/repo /usr/local/bin/repo Trace outputs in /srv/src/CM_14_1/.repo/TRACE_FILE From https://github.com/LineageOS/android_system_bt * branch refs/changes/70/341070/1 -> FETCH_HEAD Auto-merging stack/avrc/avrc_pars_ct.c [detached HEAD e6171805] Fix potential interger overflow when parsing vendor response Author: Ted Wang Date: Fri Apr 1 11:22:34 2022 +0800 1 file changed, 7 insertions(+), 2 deletions(-) From https://github.com/LineageOS/android_external_libnfc-nci * branch refs/changes/71/341071/1 -> FETCH_HEAD Auto-merging src/nfc/nfc/nfc_ncif.c CONFLICT (content): Merge conflict in src/nfc/nfc/nfc_ncif.c error: could not apply 142a4f4... The length of a packet should be non-zero hint: after resolving the conflicts, mark the corrected paths hint: with 'git add ' or 'git rm ' hint: and commit the result with 'git commit' Recorded preimage for 'src/nfc/nfc/nfc_ncif.c' Applying change number 341070... --> Subject: "Fix potential interger overflow when parsing vendor response" --> Project path: system/bt --> Change number: 341070 (Patch Set 1) ['git fetch github', u'refs/changes/70/341070/1'] Applying change number 341071... --> Subject: "The length of a packet should be non-zero" --> Project path: external/libnfc-nci --> Change number: 341071 (Patch Set 1) ['git fetch github', u'refs/changes/71/341071/1'] ERROR: git command failed ### repopick -t n-asb-2022-11 ### ... A new version of repo (2.29) is available. ... You should upgrade soon: cp /srv/src/CM_14_1/.repo/repo/repo /usr/local/bin/repo Trace outputs in /srv/src/CM_14_1/.repo/TRACE_FILE From https://github.com/LineageOS/android_packages_services_Telecomm * branch refs/changes/53/343953/1 -> FETCH_HEAD From https://github.com/LineageOS/android_packages_providers_TelephonyProvider * branch refs/changes/54/343954/1 -> FETCH_HEAD From https://github.com/LineageOS/android_external_libnfc-nci * branch refs/changes/55/343955/1 -> FETCH_HEAD error: Cherry-picking is not possible because you have unmerged files. hint: Fix them up in the work tree, and then use 'git add/rm ' hint: as appropriate to mark resolution and make a commit. fatal: cherry-pick failed Applying change number 343953... --> Subject: "switch TelecomManager List getters to ParceledListSlice" --> Project path: packages/services/Telecomm --> Change number: 343953 (Patch Set 1) ['git fetch github', u'refs/changes/53/343953/1'] Applying change number 343954... --> Subject: "Check dir path before updating permissions." --> Project path: packages/providers/TelephonyProvider --> Change number: 343954 (Patch Set 1) ['git fetch github', u'refs/changes/54/343954/1'] Applying change number 343955... --> Subject: "OOBW in phNxpNciHal_write_unlocked()" --> Project path: external/libnfc-nci --> Change number: 343955 (Patch Set 1) ['git fetch github', u'refs/changes/55/343955/1'] ERROR: git command failed ### repopick -t tzdb2021c_N ### ... A new version of repo (2.29) is available. ... You should upgrade soon: cp /srv/src/CM_14_1/.repo/repo/repo /usr/local/bin/repo Trace outputs in /srv/src/CM_14_1/.repo/TRACE_FILE >> updating platform security patch date string PLATFORM_SECURITY_PATCH:= 2022-11-05

thank you for your attention

gothicVI commented 1 year ago

I'll give it a look once I'm at my machine. I haven't seen that behavior myself.

gothicVI commented 1 year ago

I can't reproduce your error currently as due to arch dropping python2 recently, the linageos-14.1 repopick fails with

ERROR:root:code for hash md5 was not found.
Traceback (most recent call last):
  File "/usr/lib/python2.7/hashlib.py", line 147, in <module>
    globals()[__func_name] = __get_hash(__func_name)
  File "/usr/lib/python2.7/hashlib.py", line 97, in __get_builtin_constructor
    raise ValueError('unsupported hash type ' + name)
ValueError: unsupported hash type md5
ERROR:root:code for hash sha1 was not found.
Traceback (most recent call last):
  File "/usr/lib/python2.7/hashlib.py", line 147, in <module>
    globals()[__func_name] = __get_hash(__func_name)
  File "/usr/lib/python2.7/hashlib.py", line 97, in __get_builtin_constructor
    raise ValueError('unsupported hash type ' + name)
ValueError: unsupported hash type sha1
ERROR:root:code for hash sha224 was not found.
Traceback (most recent call last):
  File "/usr/lib/python2.7/hashlib.py", line 147, in <module>
    globals()[__func_name] = __get_hash(__func_name)
  File "/usr/lib/python2.7/hashlib.py", line 97, in __get_builtin_constructor
    raise ValueError('unsupported hash type ' + name)
ValueError: unsupported hash type sha224
ERROR:root:code for hash sha256 was not found.
Traceback (most recent call last):
  File "/usr/lib/python2.7/hashlib.py", line 147, in <module>
    globals()[__func_name] = __get_hash(__func_name)
  File "/usr/lib/python2.7/hashlib.py", line 97, in __get_builtin_constructor
    raise ValueError('unsupported hash type ' + name)
ValueError: unsupported hash type sha256
ERROR:root:code for hash sha384 was not found.
Traceback (most recent call last):
  File "/usr/lib/python2.7/hashlib.py", line 147, in <module>
    globals()[__func_name] = __get_hash(__func_name)
  File "/usr/lib/python2.7/hashlib.py", line 97, in __get_builtin_constructor
    raise ValueError('unsupported hash type ' + name)
ValueError: unsupported hash type sha384
ERROR:root:code for hash sha512 was not found.
Traceback (most recent call last):
  File "/usr/lib/python2.7/hashlib.py", line 147, in <module>
    globals()[__func_name] = __get_hash(__func_name)
  File "/usr/lib/python2.7/hashlib.py", line 97, in __get_builtin_constructor
    raise ValueError('unsupported hash type ' + name)
ValueError: unsupported hash type sha512
Traceback (most recent call last):
  File "/home/sebastian/android/laos_14.1/vendor/cm/build/tools/repopick.py", line 279, in <module>
    reviews = fetch_query(args.gerrit, 'topic:{0}'.format(args.topic))
  File "/home/sebastian/android/laos_14.1/vendor/cm/build/tools/repopick.py", line 145, in fetch_query
    return fetch_query_via_http(remote_url, query.replace(' ', '+'))
  File "/home/sebastian/android/laos_14.1/vendor/cm/build/tools/repopick.py", line 131, in fetch_query_via_http
    data = urllib.request.urlopen(url).read().decode('utf-8')
  File "/usr/lib/python2.7/urllib2.py", line 154, in urlopen
    return opener.open(url, data, timeout)
  File "/usr/lib/python2.7/urllib2.py", line 429, in open
    response = self._open(req, data)
  File "/usr/lib/python2.7/urllib2.py", line 452, in _open
    'unknown_open', req)
  File "/usr/lib/python2.7/urllib2.py", line 407, in _call_chain
    result = func(*args)
  File "/usr/lib/python2.7/urllib2.py", line 1302, in unknown_open
    raise URLError('unknown url type: %s' % type)
urllib2.URLError: <urlopen error unknown url type: https>

So I guess I'll have to fix that first somehow...

giovEra commented 1 year ago

Intro

First, thank you for your time and availability.

I made a mistake :)

I'll tell you what I did wrong

Premise: I compile roms using my fork of this repo: docker-lineage-cicd.

The error was due to the fact that I had run repopick after applying the microG signature spoofing patch, which modifies the contents of frameworks/base. So running repopick first and then applying the microG signature spoofing patch all works without error.

About Arch and python2

You can use docker, using ubuntu-20.04 as the base image since it still supports python-2 and so you can also avoid the repopick of this commits.

Note: docker-lineage-cicd allows you to compile lineage os in vanilla version (the one you get by following the lineageos wiki) than with microg support.

If you want I will give you the link to my fork of docker-lineage-cicd that still supports cm-14.1 and lineage-15.1.

gothicVI commented 1 year ago

Great you got it sorted out.

I've seen your fork. I'll take a look into it. Thanks for the hint.