xstefen
/
calyxos-scripts
mirror of https://github.com/CalyxOS/scripts
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

aosp-merger: s/CalyxOS// 

No need to brand simple console logs

Change-Id: Id2224ecc4b414919212328b2b25f0a7e3ccd4c6e
This commit is contained in:
Michael Bestas 2022-07-13 00:13:36 +03:00
parent 344ff1254f
commit d830353741
No known key found for this signature in database
GPG Key ID: F2D6C348F85577F5
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
aosp-merger/README.md
View File

@ -15,7 +15,7 @@
4. Every project in your tree should now be one of:
* \<newaosptag> if the project was tracking AOSP
* a staging branch if the project was a CalyxOS fork from AOSP (check `merged_repos.txt` for status and whether there are conflicts to resolve)
* a staging branch if the project was a fork from AOSP (check `merged_repos.txt` for status and whether there are conflicts to resolve)
* the default repo lineage branch for `.repo/manifests/snippets.xml` projects
5. Restore your local branches and merge in the staging branch:

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

@ -59,13 +59,13 @@ STAGINGBRANCH="staging/${BRANCHSUFFIX}"
# Source build environment (needed for aospremote)
source "${TOP}/build/envsetup.sh"
# Build list of CalyxOS forked repos
# Build list of forked repos
PROJECTPATHS=$(grep "name=\"CalyxOS/" "${MANIFEST}" | sed -n 's/.*path="\([^"]\+\)".*/\1/p')
echo "#### Old tag = ${OLDTAG} Branch = ${BRANCH} Staging branch = ${STAGINGBRANCH} ####"
# 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 forked AOSP projects ####"
for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do
cd "${TOP}/${PROJECTPATH}"
aospremote | grep -v "Remote 'aosp' created"

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

@ -51,7 +51,7 @@ PROJECTPATHS=$(cat ${MERGEDREPOS} | grep -w merge | awk '{printf "%s\n", $2}')
echo "#### Branch = ${BRANCH} Staging branch = ${STAGINGBRANCH} ####"
# Make sure manifest and forked repos are in a consistent state
echo "#### Verifying there are no uncommitted changes on LineageOS forked AOSP projects ####"
echo "#### Verifying there are no uncommitted changes on forked AOSP projects ####"
for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do
cd "${TOP}/${PROJECTPATH}"
if [[ -n "$(git status --porcelain)" ]]; then

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

@ -47,7 +47,7 @@ echo "#### Upstream branch = ${UPSTREAMBRANCH} ####"
read -p "Press enter to continue."
# 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 forked AOSP projects ####"
for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do
cd "${TOP}/${PROJECTPATH}"
if [[ -n "$(git status --porcelain)" ]]; then

2
aosp-merger/squash.sh
View File

@ -57,7 +57,7 @@ PROJECTPATHS=$(cat ${MERGEDREPOS} | grep -w merge | awk '{printf "%s\n", $2}')
echo "#### Branch = ${BRANCH} Squash branch = ${SQUASHBRANCH} ####"
# 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 forked AOSP projects ####"
for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do
cd "${TOP}/${PROJECTPATH}"
if [[ -n "$(git status --porcelain)" ]]; then

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

@ -44,7 +44,7 @@ PROJECTPATHS=$(cat ${MERGEDREPOS} | grep -w merge | awk '{printf "%s\n", $2}')
echo "#### Staging branch = ${STAGINGBRANCH} ####"
# 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 forked AOSP projects ####"
for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do
cd "${TOP}/${PROJECTPATH}"
if [[ -n "$(git status --porcelain)" ]]; then

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

@ -59,7 +59,7 @@ PROJECTPATHS=$(cat ${MERGEDREPOS} | grep -w merge | awk '{printf "%s\n", $2}')
echo "#### Squash branch = ${SQUASHBRANCH} ####"
# 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 forked AOSP projects ####"
for PROJECTPATH in ${PROJECTPATHS} .repo/manifests; do
cd "${TOP}/${PROJECTPATH}"
if [[ -n "$(git status --porcelain)" ]]; then