From 22ba620a6023c25cc87b46b2d711338f524c9643 Mon Sep 17 00:00:00 2001 From: Zhao Wei Liew Date: Tue, 27 Dec 2016 14:10:18 +0800 Subject: build: Rebrand to LineageOS Change-Id: Ie03583dc2a974a159fa50c6cb19cb68aa256ca77 --- envsetup.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'envsetup.sh') diff --git a/envsetup.sh b/envsetup.sh index 6715419..cdbaeec 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -24,8 +24,8 @@ Invoke ". build/envsetup.sh" from your shell to add the following functions to y - sepgrep: Greps on all local sepolicy files. - sgrep: Greps on all local source files. - godir: Go to the directory containing a file. -- cmremote: Add git remote for CM Gerrit Review -- cmgerrit: A Git wrapper that fetches/pushes patch from/to CM Gerrit Review +- cmremote: Add git remote for LineageOS Gerrit Review +- cmgerrit: A Git wrapper that fetches/pushes patch from/to LineageOS Gerrit Review - cmrebase: Rebase a Gerrit change and push it again - aospremote: Add git remote for matching AOSP repository - cafremote: Add git remote for matching CodeAurora repository. @@ -735,7 +735,7 @@ function eat() { if [ "$OUT" ] ; then MODVERSION=$(get_build_var CM_VERSION) - ZIPFILE=cm-$MODVERSION.zip + ZIPFILE=lineage-$MODVERSION.zip ZIPPATH=$OUT/$ZIPFILE if [ ! -f $ZIPPATH ] ; then echo "Nothing to eat" @@ -1692,12 +1692,12 @@ function cmremote() fi git remote rm cmremote 2> /dev/null GERRIT_REMOTE=$(git config --get remote.github.projectname) - CMUSER=$(git config --get review.review.cyanogenmod.org.username) + CMUSER=$(git config --get review.review.lineageos.org.username) if [ -z "$CMUSER" ] then - git remote add cmremote ssh://review.cyanogenmod.org:29418/$GERRIT_REMOTE + git remote add cmremote ssh://review.lineageos.org:29418/$GERRIT_REMOTE else - git remote add cmremote ssh://$CMUSER@review.cyanogenmod.org:29418/$GERRIT_REMOTE + git remote add cmremote ssh://$CMUSER@review.lineageos.org:29418/$GERRIT_REMOTE fi echo "Remote 'cmremote' created" } @@ -1854,7 +1854,7 @@ function cmgerrit() { $FUNCNAME help return 1 fi - local user=`git config --get review.review.cyanogenmod.org.username` + local user=`git config --get review.review.lineageos.org.username` local review=`git config --get remote.github.review` local project=`git config --get remote.github.projectname` local command=$1 @@ -2089,7 +2089,7 @@ function cmrebase() { local dir="$(gettop)/$repo" if [ -z $repo ] || [ -z $refs ]; then - echo "CyanogenMod Gerrit Rebase Usage: " + echo "LineageOS Gerrit Rebase Usage: " echo " cmrebase " echo " The patch IDs appear on the Gerrit commands that are offered." echo " They consist on a series of numbers and slashes, after the text" @@ -2111,7 +2111,7 @@ function cmrebase() { echo "Bringing it up to date..." repo sync . echo "Fetching change..." - git fetch "http://review.cyanogenmod.org/p/$repo" "refs/changes/$refs" && git cherry-pick FETCH_HEAD + git fetch "http://review.lineageos.org/p/$repo" "refs/changes/$refs" && git cherry-pick FETCH_HEAD if [ "$?" != "0" ]; then echo "Error cherry-picking. Not uploading!" return -- cgit v1.1 From a0300d400ace78f8045f17c24db33ce6d38dc072 Mon Sep 17 00:00:00 2001 From: Zhao Wei Liew Date: Mon, 2 Jan 2017 12:02:21 +0800 Subject: build: Rebrand CM_VERSION to LINEAGE_VERSION Change-Id: I8b44007ebbe395df3c989be37a5d45339f111130 --- envsetup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'envsetup.sh') diff --git a/envsetup.sh b/envsetup.sh index cdbaeec..aed0616 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -734,7 +734,7 @@ function tapas() function eat() { if [ "$OUT" ] ; then - MODVERSION=$(get_build_var CM_VERSION) + MODVERSION=$(get_build_var LINEAGE_VERSION) ZIPFILE=lineage-$MODVERSION.zip ZIPPATH=$OUT/$ZIPFILE if [ ! -f $ZIPPATH ] ; then -- cgit v1.1 From b0637e759035063cd193b6a3a5fb69fe1ee4ff88 Mon Sep 17 00:00:00 2001 From: Zhao Wei Liew Date: Sun, 8 Jan 2017 09:03:01 +0800 Subject: build: envsetup: Update CAF remote CAF recommends using https://source.codeaurora.org/quic/la now. Change-Id: Ic8d6451111f0e71bce044ffaae79f0acfc34caa1 --- envsetup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'envsetup.sh') diff --git a/envsetup.sh b/envsetup.sh index aed0616..42823df 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -1732,7 +1732,7 @@ function cafremote() then PFX="platform/" fi - git remote add caf git://codeaurora.org/$PFX$PROJECT + git remote add caf https://source.codeaurora.org/quic/la/$PFX$PROJECT echo "Remote 'caf' created" } -- cgit v1.1 From 8cd2bcba15c328c124b28fc12cd1b9846633d5d5 Mon Sep 17 00:00:00 2001 From: Simon Shields Date: Wed, 28 Dec 2016 11:33:29 +1100 Subject: build: support lineage device trees Change-Id: I087a97e31cab2ccfba16b5378cef429785baf7d0 --- envsetup.sh | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) (limited to 'envsetup.sh') diff --git a/envsetup.sh b/envsetup.sh index 42823df..8030ce4 100644 --- a/envsetup.sh +++ b/envsetup.sh @@ -84,11 +84,17 @@ function check_product() return fi - if (echo -n $1 | grep -q -e "^cm_") ; then - CM_BUILD=$(echo -n $1 | sed -e 's/^cm_//g') - export BUILD_NUMBER=$((date +%s%N ; echo $CM_BUILD; hostname) | openssl sha1 | sed -e 's/.*=//g; s/ //g' | cut -c1-10) + if (echo -n $1 | grep -q -e "^lineage_") ; then + CM_BUILD=$(echo -n $1 | sed -e 's/^lineage_//g') + export BUILD_NUMBER=$((date +%s%N ; echo $CM_BUILD; hostname) | openssl sha1 | sed -e 's/.*=//g; s/ //g' | cut -c1-10) else - CM_BUILD= + # Fall back to cm_ + if (echo -n $1 | grep -q -e "^cm_") ; then + CM_BUILD=$(echo -n $1 | sed -e 's/^cm_//g') + export BUILD_NUMBER=$((date +%s%N ; echo $CM_BUILD; hostname) | openssl sha1 | sed -e 's/.*=//g; s/ //g' | cut -c1-10) + else + CM_BUILD= + fi fi export CM_BUILD @@ -568,11 +574,16 @@ function breakfast() # A buildtype was specified, assume a full device name lunch $target else - # This is probably just the CM model name + # This is probably just the Lineage model name if [ -z "$variant" ]; then variant="userdebug" fi - lunch cm_$target-$variant + lunch lineage_$target-$variant + if [ $? -ne 0 ]; then + # try CM + echo "** Warning: '$target' is using CM-based makefiles. This will be deprecated in the next major release." + lunch cm_$target-$variant + fi fi fi return $? -- cgit v1.1