This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, next has been updated via 7f69895cb57bc6a41cdcb5b3725dd8f2bd21643f (commit) via d9c6f56c2ea171cbc1fa396feb30d2814b9a818d (commit) from 1e4dbfbdf9a06512f52c2d49b77b5c2bc4d2a768 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 7f69895cb57bc6a41cdcb5b3725dd8f2bd21643f Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Sep 14 19:50:58 2015 +0200
make.sh: generate correct SYSTEM_RELEASE string if --target= was used.
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
commit d9c6f56c2ea171cbc1fa396feb30d2814b9a818d Author: Arne Fitzenreiter arne_f@ipfire.org Date: Mon Sep 14 19:50:13 2015 +0200
pakfire: use correct tree on x86_64.
Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org
-----------------------------------------------------------------------
Summary of changes: lfs/pakfire | 6 +++--- make.sh | 31 ++++++++++++++++--------------- 2 files changed, 19 insertions(+), 18 deletions(-)
Difference in files: diff --git a/lfs/pakfire b/lfs/pakfire index 6f90f89..00d1bb1 100644 --- a/lfs/pakfire +++ b/lfs/pakfire @@ -30,10 +30,10 @@ THISAPP = pakfire DIR_APP = /opt/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP)
-ifeq "$(MACHINE_TYPE)" "arm" - PAKFIRE_VERSION = $(VERSION)-$(MACHINE) -else +ifeq "$(MACHINE)" "i586" PAKFIRE_VERSION = $(VERSION) +else + PAKFIRE_VERSION = $(VERSION)-$(MACHINE) endif
############################################################################### diff --git a/make.sh b/make.sh index da8c17c..375f72d 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() {
hooks/post-receive -- IPFire 2.x development tree