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 …
[View More]other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7f69895cb57bc6a41cdcb5b3725dd8f2bd21643f
Author: Arne Fitzenreiter <arne_f(a)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(a)ipfire.org>
commit d9c6f56c2ea171cbc1fa396feb30d2814b9a818d
Author: Arne Fitzenreiter <arne_f(a)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(a)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
[View Less]
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 5934eb5832d5d6c7768a78ca15b0b21ab2f4576e (commit)
from 71ca2447bff63413e2756df445d60dd251ac0ab4 (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, …
[View More]below.
- Log -----------------------------------------------------------------
commit 5934eb5832d5d6c7768a78ca15b0b21ab2f4576e
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Sep 14 13:37:31 2015 +0100
make.sh: Bump toolchain version
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
make.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Difference in files:
diff --git a/make.sh b/make.sh
index 8554200..da8c17c 100755
--- a/make.sh
+++ b/make.sh
@@ -36,7 +36,7 @@ BUILD_IMAGES=1 # Flash and Xen Downloader
KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
GIT_TAG=$(git tag | tail -1) # Git Tag
GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8) # Last commit
-TOOLCHAINVER=9
+TOOLCHAINVER=10
# New architecture variables
BUILD_ARCH="$(uname -m)"
hooks/post-receive
--
IPFire 2.x development tree
[View Less]
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 71ca2447bff63413e2756df445d60dd251ac0ab4 (commit)
from b0ad5600dbc8c059dde746101af48a3bf51b9fae (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, …
[View More]below.
- Log -----------------------------------------------------------------
commit 71ca2447bff63413e2756df445d60dd251ac0ab4
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Mon Sep 14 13:36:32 2015 +0100
ccache: Update to version 3.2.3
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
lfs/ccache | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
Difference in files:
diff --git a/lfs/ccache b/lfs/ccache
index 44010f9..64b09d1 100644
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -24,10 +24,10 @@
include Config
-VER = 3.1.8
+VER = 3.2.3
THISAPP = ccache-$(VER)
-DL_FILE = $(THISAPP).tar.bz2
+DL_FILE = $(THISAPP).tar.xz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)-pass$(PASS)
@@ -48,7 +48,7 @@ objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-$(DL_FILE)_MD5 = 0e0f25fb342dcb1196d9c2986a7323cf
+$(DL_FILE)_MD5 = 608c78632086a4a051514722d6067a7b
install : $(TARGET)
@@ -77,7 +77,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
+ @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && ./configure --prefix=/tools
cd $(DIR_APP) && make $(MAKETUNING) $(EXTRA_MAKE)
cd $(DIR_APP) && make install
hooks/post-receive
--
IPFire 2.x development tree
[View Less]
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 9f3bbb9d30a2b549f78659e3c7b9548d75467aa3 (commit)
from 11fbf1fab0a03db4c0aa37db03da9cc47d2350a8 (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, …
[View More]below.
- Log -----------------------------------------------------------------
commit 9f3bbb9d30a2b549f78659e3c7b9548d75467aa3
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Sep 13 17:56:24 2015 +0100
make.sh: Fix cross-architecture builds when using the --target= parameter
Signed-off-by: Michael Tremer <michael.tremer(a)ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
tools/make-functions | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Difference in files:
diff --git a/tools/make-functions b/tools/make-functions
index 0152155..68ae0a1 100644
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -69,7 +69,7 @@ configure_target() {
case "${target_arch}" in
x86_64)
- BUILDTARGET="${TARGET_ARCH}-unknown-linux-gnu"
+ BUILDTARGET="${target_arch}-unknown-linux-gnu"
CROSSTARGET="${BUILD_ARCH}-cross-linux-gnu"
CFLAGS_ARCH="-m64 -mtune=generic"
;;
hooks/post-receive
--
IPFire 2.x development tree
[View Less]
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 11fbf1fab0a03db4c0aa37db03da9cc47d2350a8 (commit)
from 5a9e755a2ad260fd860adf89c587ac5f2849114f (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, …
[View More]below.
- Log -----------------------------------------------------------------
commit 11fbf1fab0a03db4c0aa37db03da9cc47d2350a8
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Sun Sep 13 18:02:27 2015 +0200
binutils: fix build on arm.
MACHINE env variable is needed to be clear.
-----------------------------------------------------------------------
Summary of changes:
lfs/binutils | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
Difference in files:
diff --git a/lfs/binutils b/lfs/binutils
index 0fdc570..27c83fb 100644
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2013 IPFire Team <info(a)ipfire.org> #
+# Copyright (C) 2007-2015 IPFire Team <info(a)ipfire.org> #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
@@ -36,8 +36,6 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
ifeq "$(ROOT)" ""
TARGET = $(DIR_INFO)/$(THISAPP)
EXTRA_CONFIG = \
- --host="${BUILDTARGET}" \
- --build="${BUILDTARGET}" \
--prefix=/usr \
--enable-shared \
--disable-nls
@@ -130,9 +128,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Prevent installing libiberty to lib64.
cd $(DIR_APP) && sed -i 's%\(^MULTIOSDIR = \).*%\1 ../lib%' libiberty/Makefile.in
- cd $(DIR_SRC)/binutils-build && $(EXTRA_ENV) $(DIR_APP)/configure $(EXTRA_CONFIG)
- cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) $(MAKETUNING)
- cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install
+ cd $(DIR_SRC)/binutils-build && $(EXTRA_ENV) MACHINE= $(DIR_APP)/configure $(EXTRA_CONFIG)
+ cd $(DIR_SRC)/binutils-build && make $(EXTRA_MAKE) $(MAKETUNING) MACHINE=
+ cd $(DIR_SRC)/binutils-build && make $(EXTRA_INSTALL) install MACHINE=
ifeq "$(ROOT)" ""
cp -v $(DIR_APP)/include/libiberty.h /usr/include
else
hooks/post-receive
--
IPFire 2.x development tree
[View Less]