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

aosp-merger: Use full paths for kernel_repos

Browse Source 
Change-Id: I12617ad5b93d8f3aae3c131e343588f368c22dd9
This commit is contained in:
Michael Bestas
2022-10-04 04:48:02 +03:00
committed by Chirayu Desai
parent f4883e22ea
commit 61d10adbfb
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,9 +88,7 @@ push_device_merge() {
# Merge AOSP to pixel kernel forks
merge_pixel_kernel() {
for repo in ${device_kernel_repos}; do
"${script_path}"/_subtree_merge_helper.sh --project-path "${repo}" --old-tag "${prev_kernel_tag}" --new-tag "${kernel_tag}" --branch-suffix "${device_branch}_merge-${kernel_tag}"
done
"${script_path}"/_subtree_merge_helper.sh --project-path "${device_kernel_repo}" --old-tag "${prev_kernel_tag}" --new-tag "${kernel_tag}" --branch-suffix "${device_branch}_merge-${kernel_tag}"
}
squash_pixel_kernel() {
@@ -181,11 +179,12 @@ main() {
elif [ "${1}" = "kernels" ]; then
for kernel in ${kernel_repos[@]}; do
(
source "${vars_path}/${kernel}"
readonly kernel_short="$(echo ${kernel} | cut -d / -f 3)"
source "${vars_path}/${kernel_short}"
readonly device_kernel_repos="kernel/google/${kernel}"
readonly device_kernel_repo="${kernel}"
export MERGEDREPOS="${TOP}/merged_repos_${kernel}_kernel.txt"
export MERGEDREPOS="${TOP}/merged_repos_${kernel_short}_kernel.txt"
# Remove any existing list of merged repos file
rm -f "${MERGEDREPOS}"
@@ -241,8 +240,9 @@ main() {
elif [ "${1}" = "submit-kernels" ]; then
for kernel in ${kernel_repos[@]}; do
(
source "${vars_path}/${kernel}"
export MERGEDREPOS="${TOP}/merged_repos_${kernel}_kernel.txt"
readonly kernel_short="$(echo ${kernel} | cut -d / -f 3)"
source "${vars_path}/${kernel_short}"
export MERGEDREPOS="${TOP}/merged_repos_${kernel_short}_kernel.txt"
push_kernel_merge