LineageOS/scripts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aosp-merger: Use merged_repos_${kernel}_kernel.txt for kernels

Browse Source 
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
This commit is contained in:
Michael Bestas
2022-06-11 18:37:44 +03:00
committed by Chirayu Desai
parent a29949f546
commit f3b9352ed8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
aosp-merger/aosp-merger.sh
View File

@@ -166,7 +166,7 @@ main() {
readonly device_kernel_repos="kernel/google/${kernel}" readonly device_kernel_repos="kernel/google/${kernel}"
export MERGEDREPOS="${TOP}/merged_repos_${kernel}.txt" export MERGEDREPOS="${TOP}/merged_repos_${kernel}_kernel.txt"
# Remove any existing list of merged repos file # Remove any existing list of merged repos file
rm -f "${MERGEDREPOS}" rm -f "${MERGEDREPOS}"
@@ -202,7 +202,7 @@ main() {
for kernel in ${kernel_repos[@]}; do for kernel in ${kernel_repos[@]}; do
( (
source "${vars_path}/${kernel}" source "${vars_path}/${kernel}"
export MERGEDREPOS="${TOP}/merged_repos_${kernel}.txt" export MERGEDREPOS="${TOP}/merged_repos_${kernel}_kernel.txt"
push_kernel_merge push_kernel_merge