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

aosp-merger: Adapt for LineageOS vars usage

Browse Source 
Change-Id: Id63a7377ed68ee7d7743af31747eade2d785369e
This commit is contained in:
Michael Bestas
2022-01-13 18:04:19 +02:00
committed by Chirayu Desai
parent adcf6fca04
commit b92af37df1
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
aosp-merger/_merge_helper.sh
View File

@@ -28,14 +28,14 @@ fi
### CONSTANTS ### ### CONSTANTS ###
readonly script_path="$(cd "$(dirname "$0")";pwd -P)" readonly script_path="$(cd "$(dirname "$0")";pwd -P)"
readonly vars_path="${script_path}/../vars" readonly vars_path="${script_path}/../../../vendor/lineage/vars"
source "${vars_path}/common" source "${vars_path}/common"
readonly hook="${script_path}/prepare-commit-msg" readonly hook="${script_path}/prepare-commit-msg"
TOP="${script_path}/../../.." TOP="${script_path}/../../.."
BRANCH="${calyxos_branch}" BRANCH="${lineageos_branch}"
cd "${TOP}/${PROJECTPATH}" cd "${TOP}/${PROJECTPATH}"
repo start "${STAGINGBRANCH}" . repo start "${STAGINGBRANCH}" .

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

@@ -26,7 +26,7 @@ trap 'error_m interrupted!' SIGINT
### CONSTANTS ### ### CONSTANTS ###
readonly script_path="$(cd "$(dirname "$0")";pwd -P)" readonly script_path="$(cd "$(dirname "$0")";pwd -P)"
readonly vars_path="${script_path}/../vars" readonly vars_path="${script_path}/../../../vendor/lineage/vars"
source "${vars_path}/common" source "${vars_path}/common"
@@ -47,7 +47,7 @@ merge_aosp() {
} }
merge_aosp_forks() { merge_aosp_forks() {
export STAGINGBRANCH="staging/${calyxos_branch}_merge-${common_aosp_tag}" export STAGINGBRANCH="staging/${lineageos_branch}_merge-${common_aosp_tag}"
"${script_path}"/merge-aosp-forks.sh merge "${prev_common_aosp_tag}" "${common_aosp_tag}" "${script_path}"/merge-aosp-forks.sh merge "${prev_common_aosp_tag}" "${common_aosp_tag}"
} }

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

@@ -27,13 +27,13 @@ fi
### CONSTANTS ### ### CONSTANTS ###
readonly script_path="$(cd "$(dirname "$0")";pwd -P)" readonly script_path="$(cd "$(dirname "$0")";pwd -P)"
readonly vars_path="${script_path}/../vars" readonly vars_path="${script_path}/../../../vendor/lineage/vars"
source "${vars_path}/common" source "${vars_path}/common"
TOP="${script_path}/../../.." TOP="${script_path}/../../.."
MANIFEST="${TOP}/.repo/manifests/default.xml" MANIFEST="${TOP}/.repo/manifests/default.xml"
BRANCH="${calyxos_branch}" BRANCH="${lineageos_branch}"
# Source build environment (needed for aospremote) # Source build environment (needed for aospremote)
source "${TOP}/build/envsetup.sh" source "${TOP}/build/envsetup.sh"

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

@@ -28,7 +28,7 @@ fi
### CONSTANTS ### ### CONSTANTS ###
readonly script_path="$(cd "$(dirname "$0")";pwd -P)" readonly script_path="$(cd "$(dirname "$0")";pwd -P)"
readonly vars_path="${script_path}/../vars" readonly vars_path="${script_path}/../../../vendor/lineage/vars"
source "${vars_path}/common" source "${vars_path}/common"

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

@@ -27,15 +27,15 @@ fi
### CONSTANTS ### ### CONSTANTS ###
readonly script_path="$(cd "$(dirname "$0")";pwd -P)" readonly script_path="$(cd "$(dirname "$0")";pwd -P)"
readonly vars_path="${script_path}/../vars" readonly vars_path="${script_path}/../../../vendor/lineage/vars"
source "${vars_path}/common" source "${vars_path}/common"
TOP="${script_path}/../../.." TOP="${script_path}/../../.."
BRANCH="${calyxos_branch}" BRANCH="${lineageos_branch}"
STAGINGBRANCH="staging/${BRANCH}_${OPERATION}-${NEWTAG}" STAGINGBRANCH="staging/${BRANCH}_${OPERATION}-${NEWTAG}"
# Source build environment (needed for calyxremote) # Source build environment (needed for lineageremote)
source "${TOP}/build/envsetup.sh" source "${TOP}/build/envsetup.sh"
# List of merged repos # List of merged repos
@@ -62,6 +62,6 @@ for PROJECTPATH in ${PROJECTPATHS}; do
cd "${TOP}/${PROJECTPATH}" cd "${TOP}/${PROJECTPATH}"
echo "#### Submitting ${PROJECTPATH} merge ####" echo "#### Submitting ${PROJECTPATH} merge ####"
git checkout "${STAGINGBRANCH}" git checkout "${STAGINGBRANCH}"
calyxremote | grep -v "Remote 'calyx' created" lineageremote | grep -v "Remote 'lineage' created"
git push calyx HEAD:refs/heads/"${BRANCH}" git push lineage HEAD:refs/heads/"${BRANCH}"
done done

4
aosp-merger/squash.sh
View File

@@ -27,12 +27,12 @@ fi
### CONSTANTS ### ### CONSTANTS ###
readonly script_path="$(cd "$(dirname "$0")";pwd -P)" readonly script_path="$(cd "$(dirname "$0")";pwd -P)"
readonly vars_path="${script_path}/../vars" readonly vars_path="${script_path}/../../../vendor/lineage/vars"
source "${vars_path}/common" source "${vars_path}/common"
TOP="${script_path}/../../.." TOP="${script_path}/../../.."
BRANCH="${calyxos_branch}" BRANCH="${lineageos_branch}"
STAGINGBRANCH="staging/${BRANCH}_${OPERATION}-${NEWTAG}" STAGINGBRANCH="staging/${BRANCH}_${OPERATION}-${NEWTAG}"
SQUASHBRANCH="squash/${BRANCH}_${OPERATION}-${NEWTAG}" SQUASHBRANCH="squash/${BRANCH}_${OPERATION}-${NEWTAG}"

6
aosp-merger/upload-squash.sh
View File

@@ -27,12 +27,12 @@ fi
### CONSTANTS ### ### CONSTANTS ###
readonly script_path="$(cd "$(dirname "$0")";pwd -P)" readonly script_path="$(cd "$(dirname "$0")";pwd -P)"
readonly vars_path="${script_path}/../vars" readonly vars_path="${script_path}/../../../vendor/lineage/vars"
source "${vars_path}/common" source "${vars_path}/common"
TOP="${script_path}/../../.." TOP="${script_path}/../../.."
BRANCH="${calyxos_branch}" BRANCH="${lineageos_branch}"
SQUASHBRANCH="squash/${BRANCH}_${OPERATION}-${NEWTAG}" SQUASHBRANCH="squash/${BRANCH}_${OPERATION}-${NEWTAG}"
# List of merged repos # List of merged repos
@@ -41,7 +41,7 @@ PROJECTPATHS=$(cat ${MERGEDREPOS} | grep -w merge | awk '{printf "%s\n", $2}')
echo "#### Branch = ${BRANCH} Squash branch = ${SQUASHBRANCH} ####" echo "#### Branch = ${BRANCH} Squash branch = ${SQUASHBRANCH} ####"
# Make sure manifest and forked repos are in a consistent state # Make sure manifest and forked repos are in a consistent state
echo "#### Verifying there are no uncommitted changes on CalyxOS forked AOSP projects ####" echo "#### Verifying there are no uncommitted changes on LineageOS forked AOSP projects ####"
for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do
cd "${TOP}/${PROJECTPATH}" cd "${TOP}/${PROJECTPATH}"
if [[ -n "$(git status --porcelain)" ]]; then if [[ -n "$(git status --porcelain)" ]]; then