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

aosp-merger: s/lineageos_branch/os_branch/

Browse Source 
Reduce the diff between CalyxOS/LineageOS scripts

Change-Id: I70e409e4bb050c4fd6b826912c7a9640c46ab9df
This commit is contained in:
Michael Bestas
2022-07-13 00:33:10 +03:00
committed by Chirayu Desai
parent 559a794b49
commit 2538c7d1f9
6 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
aosp-merger/_merge_helper.sh
View File

@@ -57,7 +57,7 @@ source "${vars_path}/common"
readonly hook="${script_path}/prepare-commit-msg"
TOP="${script_path}/../../.."
BRANCH="${lineageos_branch}"
BRANCH="${os_branch}"
STAGINGBRANCH="staging/${BRANCHSUFFIX}"
cd "${TOP}/${PROJECTPATH}"
@@ -97,7 +97,7 @@ if [[ "${OPERATION}" == "merge" ]]; then
# Check if we've actually changed anything after the merge
# If we haven't, just abandon the branch
if [[ -z "$(git diff HEAD m/${lineageos_branch})" && -z "$(git status --porcelain)" ]]; then
if [[ -z "$(git diff HEAD m/${os_branch})" && -z "$(git status --porcelain)" ]]; then
echo -e "nochange\t\t${PROJECTPATH}" | tee -a "${MERGEDREPOS}"
repo abandon "${STAGINGBRANCH}" .
exit 0

4
aosp-merger/_subtree_merge_helper.sh
View File

@@ -57,7 +57,7 @@ source "${vars_path}/common"
readonly hook="${script_path}/prepare-commit-msg"
TOP="${script_path}/../../.."
BRANCH="${lineageos_branch}"
BRANCH="${os_branch}"
STAGINGBRANCH="staging/${BRANCHSUFFIX}"
cd "${TOP}/${PROJECTPATH}"
@@ -133,7 +133,7 @@ done
# Check if we've actually changed anything after the merge
# If we haven't, just abandon the branch
if [[ -z "$(git diff HEAD m/${lineageos_branch})" && -z "$(git status --porcelain)" ]]; then
if [[ -z "$(git diff HEAD m/${os_branch})" && -z "$(git status --porcelain)" ]]; then
echo -e "nochange\t\t${PROJECTPATH}" | tee -a "${MERGEDREPOS}"
repo abandon "${STAGINGBRANCH}" .
exit 0

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

@@ -52,74 +52,74 @@ merge_aosp() {
# Merge AOSP to forks
merge_aosp_forks() {
"${script_path}"/merge-aosp-forks.sh --old-tag "${prev_common_aosp_tag}" --new-tag "${common_aosp_tag}" --branch-suffix "${lineageos_branch}_merge-${common_aosp_tag}"
"${script_path}"/merge-aosp-forks.sh --old-tag "${prev_common_aosp_tag}" --new-tag "${common_aosp_tag}" --branch-suffix "${os_branch}_merge-${common_aosp_tag}"
}
squash_aosp_merge() {
"${script_path}"/squash.sh --branch-suffix "${lineageos_branch}_merge-${common_aosp_tag}"
"${script_path}"/squash.sh --branch-suffix "${os_branch}_merge-${common_aosp_tag}"
}
upload_squash_aosp_to_review() {
"${script_path}"/upload-squash.sh --branch-suffix "${lineageos_branch}_merge-${common_aosp_tag}"
"${script_path}"/upload-squash.sh --branch-suffix "${os_branch}_merge-${common_aosp_tag}"
}
push_aosp_merge() {
"${script_path}"/push-merge.sh --branch-suffix "${lineageos_branch}_merge-${common_aosp_tag}"
"${script_path}"/push-merge.sh --branch-suffix "${os_branch}_merge-${common_aosp_tag}"
}
# Merge AOSP to pixel device forks
merge_pixel_device() {
for repo in ${device_repos[@]}; do
"${script_path}"/_subtree_merge_helper.sh --project-path "${repo}" --old-tag "${prev_aosp_tag}" --new-tag "${aosp_tag}" --branch-suffix "${lineageos_branch}_merge-${aosp_tag}"
"${script_path}"/_subtree_merge_helper.sh --project-path "${repo}" --old-tag "${prev_aosp_tag}" --new-tag "${aosp_tag}" --branch-suffix "${os_branch}_merge-${aosp_tag}"
done
}
squash_pixel_device() {
"${script_path}"/squash.sh --new-tag "${aosp_tag}" --branch-suffix "${lineageos_branch}_merge-${aosp_tag}" --pixel
"${script_path}"/squash.sh --new-tag "${aosp_tag}" --branch-suffix "${os_branch}_merge-${aosp_tag}" --pixel
}
upload_squash_device_to_review() {
"${script_path}"/upload-squash.sh --branch-suffix "${lineageos_branch}_merge-${aosp_tag}" --pixel
"${script_path}"/upload-squash.sh --branch-suffix "${os_branch}_merge-${aosp_tag}" --pixel
}
push_device_merge() {
"${script_path}"/push-merge.sh --branch-suffix "${lineageos_branch}_merge-${aosp_tag}"
"${script_path}"/push-merge.sh --branch-suffix "${os_branch}_merge-${aosp_tag}"
}
# 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 "${lineageos_branch}_merge-${kernel_tag}"
"${script_path}"/_subtree_merge_helper.sh --project-path "${repo}" --old-tag "${prev_kernel_tag}" --new-tag "${kernel_tag}" --branch-suffix "${os_branch}_merge-${kernel_tag}"
done
}
squash_pixel_kernel() {
"${script_path}"/squash.sh --new-tag "${kernel_tag}" --branch-suffix "${lineageos_branch}_merge-${kernel_tag}" --pixel
"${script_path}"/squash.sh --new-tag "${kernel_tag}" --branch-suffix "${os_branch}_merge-${kernel_tag}" --pixel
}
upload_squash_kernel_to_review() {
"${script_path}"/upload-squash.sh --branch-suffix "${lineageos_branch}_merge-${kernel_tag}" --pixel
"${script_path}"/upload-squash.sh --branch-suffix "${os_branch}_merge-${kernel_tag}" --pixel
}
push_kernel_merge() {
"${script_path}"/push-merge.sh --branch-suffix "${lineageos_branch}_merge-${kernel_tag}"
"${script_path}"/push-merge.sh --branch-suffix "${os_branch}_merge-${kernel_tag}"
}
# Merge CLO to forks
merge_clo() {
"${script_path}"/_merge_helper.sh --project-path "${repo}" --new-tag "${1}" --branch-suffix "${lineageos_branch}_merge-${1}"
"${script_path}"/_merge_helper.sh --project-path "${repo}" --new-tag "${1}" --branch-suffix "${os_branch}_merge-${1}"
}
squash_clo_merge() {
"${script_path}"/squash.sh --new-tag "${1}" --branch-suffix "${lineageos_branch}_merge-${1}"
"${script_path}"/squash.sh --new-tag "${1}" --branch-suffix "${os_branch}_merge-${1}"
}
upload_squash_clo_to_review() {
"${script_path}"/upload-squash.sh --new-tag "${1}" --branch-suffix "${lineageos_branch}_merge-${1}"
"${script_path}"/upload-squash.sh --new-tag "${1}" --branch-suffix "${os_branch}_merge-${1}"
}
push_clo_merge() {
"${script_path}"/push-merge.sh --branch-suffix "${lineageos_branch}_merge-${1}"
"${script_path}"/push-merge.sh --branch-suffix "${os_branch}_merge-${1}"
}
# error message

2
aosp-merger/merge-aosp-forks.sh
View File

@@ -53,7 +53,7 @@ source "${vars_path}/common"
TOP="${script_path}/../../.."
MANIFEST="${TOP}/.repo/manifests/default.xml"
BRANCH="${lineageos_branch}"
BRANCH="${os_branch}"
STAGINGBRANCH="staging/${BRANCHSUFFIX}"
# Source build environment (needed for aospremote)

2
aosp-merger/push-merge.sh
View File

@@ -39,7 +39,7 @@ TOP="${script_path}/../../.."
STAGINGBRANCH="staging/${BRANCHSUFFIX}"
BRANCH=$(git config --get branch.${STAGINGBRANCH}.merge | sed 's|refs/heads/||')
if [ -z "${BRANCH}" ]; then
BRANCH="${lineageos_branch}"
BRANCH="${os_branch}"
fi
# Source build environment (needed for lineageremote)

2
aosp-merger/squash.sh
View File

@@ -48,7 +48,7 @@ STAGINGBRANCH="staging/${BRANCHSUFFIX}"
SQUASHBRANCH="squash/${BRANCHSUFFIX}"
BRANCH=$(git config --get branch.${STAGINGBRANCH}.merge | sed 's|refs/heads/||')
if [ -z "${BRANCH}" ]; then
BRANCH="${lineageos_branch}"
BRANCH="${os_branch}"
fi
# List of merged repos