From: Arne Fitzenreiter Date: Mon, 14 Sep 2015 17:50:58 +0000 (+0200) Subject: make.sh: generate correct SYSTEM_RELEASE string if --target= was used. X-Git-Tag: v2.17-core94~20 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7f69895cb57bc6a41cdcb5b3725dd8f2bd21643f;p=ipfire-2.x.git make.sh: generate correct SYSTEM_RELEASE string if --target= was used. Signed-off-by: Arne Fitzenreiter --- diff --git a/make.sh b/make.sh index da8c17c365..375f72d3aa 100755 --- a/make.sh +++ b/make.sh @@ -86,21 +86,6 @@ if [ -z $EDITOR ]; then [ -z $EDITOR ] && exiterror "You should have installed an editor." fi -# Prepare string for /etc/system-release. -SYSTEM_RELEASE="${NAME} ${VERSION} (${MACHINE})" -if [ "$(git status -s | wc -l)" == "0" ]; then - GIT_STATUS="" -else - GIT_STATUS="-dirty" -fi -case "$GIT_BRANCH" in - core*|beta?|rc?) - SYSTEM_RELEASE="${SYSTEM_RELEASE} - $GIT_BRANCH$GIT_STATUS" - ;; - *) - SYSTEM_RELEASE="${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS" - ;; -esac prepareenv() { ############################################################################ @@ -240,6 +225,22 @@ prepareenv() { # Remove pre-install list of installed files in case user erase some files before rebuild rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null + + # Prepare string for /etc/system-release. + SYSTEM_RELEASE="${NAME} ${VERSION} (${MACHINE})" + if [ "$(git status -s | wc -l)" == "0" ]; then + GIT_STATUS="" + else + GIT_STATUS="-dirty" + fi + case "$GIT_BRANCH" in + core*|beta?|rc?) + SYSTEM_RELEASE="${SYSTEM_RELEASE} - $GIT_BRANCH$GIT_STATUS" + ;; + *) + SYSTEM_RELEASE="${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS" + ;; + esac } buildtoolchain() {