From: git@ipfire.org
To: ipfire-scm@lists.ipfire.org
Subject: [git.ipfire.org] IPFire 2.x development tree branch, seventeen, updated. 013153bc789728aea220c92d92918c6ff5dee8a1
Date: Wed, 22 Oct 2014 21:36:13 +0200 [thread overview]
Message-ID: <20141022193614.673CA2071F@argus.ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 4312 bytes --]
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, seventeen has been updated
via 013153bc789728aea220c92d92918c6ff5dee8a1 (commit)
via af886d014077b600af93baf0de844cacf67d7bd3 (commit)
via 3a317084d65b0d7c5400fc01c969c65da023942b (commit)
from 6e0b26ba7db9d1faa5eb564b07d617c78d8ab0ef (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 013153bc789728aea220c92d92918c6ff5dee8a1
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Oct 22 21:35:13 2014 +0200
set toolchain to 8 and version to 2.17.
commit af886d014077b600af93baf0de844cacf67d7bd3
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Oct 22 21:34:42 2014 +0200
tzdata: fix build with new coreutils.
commit 3a317084d65b0d7c5400fc01c969c65da023942b
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date: Wed Oct 22 13:49:54 2014 +0200
Revert "Revert "toolchain: Fix compiling due to Stack Protector changes.""
This reverts commit 4ec728f840372f61d61c5019d766f453231eb706.
-----------------------------------------------------------------------
Summary of changes:
lfs/gcc | 3 +++
lfs/glibc | 13 +++++++++++++
lfs/tzdata | 1 +
make.sh | 8 ++++----
4 files changed, 21 insertions(+), 4 deletions(-)
Difference in files:
diff --git a/lfs/gcc b/lfs/gcc
index a9f124b..0264d37 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -97,6 +97,9 @@ else
EXTRA_MAKE =
EXTRA_INSTALL =
endif
+
+ # Disable stack protection in toolchain.
+ CFLAGS += -fno-stack-protector
endif
ifeq "$(MACHINE_TYPE)" "arm"
diff --git a/lfs/glibc b/lfs/glibc
index 32c494f..ee332c4 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -297,8 +297,21 @@ endif
cd $(DIR_SRC)/glibc-build && \
CFLAGS="$(CFLAGS) -fno-asynchronous-unwind-tables" \
$(DIR_APP)/configure $(EXTRA_CONFIG)
+
+ sed -i $(DIR_SRC)/glibc-build/config.make \
+ -e "s/^build-pic-default=.*/build-pic-default=yes/"
+
+ # Build the glibc libraries without stack protection (as this is not supported)
+ echo "build-programs=no" >> $(DIR_SRC)/glibc-build/configparms
+ cd $(DIR_SRC)/glibc-build && make PARALLELMFLAGS=$(MAKETUNING) \
+ CFLAGS="$(CFLAGS) -fno-stack-protector -U_FORTIFY_SOURCE" \
+ CXXFLAGS="$(CXXFLAGS) -fno-stack-protector -U_FORTIFY_SOURCE"
+
+ # Build the programs with hardening
+ : > $(DIR_SRC)/glibc-build/configparms
cd $(DIR_SRC)/glibc-build && make PARALLELMFLAGS=$(MAKETUNING) \
CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
+
cd $(DIR_SRC)/glibc-build && make $(EXTRA_INSTALL) install
ifeq "$(ROOT)" ""
diff --git a/lfs/tzdata b/lfs/tzdata
index c36b7a3..afe3124 100644
--- a/lfs/tzdata
+++ b/lfs/tzdata
@@ -94,6 +94,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
/usr/share/zoneinfo
rm -vf /usr/share/zoneinfo/localtime
+ rm -vf /etc/localtime
cp -vf /usr/share/zoneinfo/GMT /etc/localtime
@rm -rf $(DIR_APP)
diff --git a/make.sh b/make.sh
index 8a7aafd..bbbaffd 100755
--- a/make.sh
+++ b/make.sh
@@ -24,9 +24,9 @@
NAME="IPFire" # Software name
SNAME="ipfire" # Short name
-VERSION="2.15" # Version number
-CORE="85" # Core Level (Filename)
-PAKFIRE_CORE="84" # Core Level (PAKFIRE)
+VERSION="2.17" # Version number
+CORE="86" # Core Level (Filename)
+PAKFIRE_CORE="85" # Core Level (PAKFIRE)
GIT_BRANCH=`git rev-parse --abbrev-ref HEAD` # Git Branch
SLOGAN="www.ipfire.org" # Software slogan
CONFIG_ROOT=/var/ipfire # Configuration rootdir
@@ -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=7
+TOOLCHAINVER=8
# New architecture variables
BUILD_ARCH="$(uname -m)"
hooks/post-receive
--
IPFire 2.x development tree
reply other threads:[~2014-10-22 19:36 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20141022193614.673CA2071F@argus.ipfire.org \
--to=git@ipfire.org \
--cc=ipfire-scm@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox