[prev in list] [next in list] [prev in thread] [next in thread]
List: ipfire-scm
Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 962f7923f515525e5e62f28de9b50bc6
From: Arne Fitzenreiter <git () ipfire ! org>
Date: 2020-09-24 15:55:48
Message-ID: 4By0505mgfz2xc6 () people01 ! haj ! ipfire ! org
[Download RAW message or body]
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 962f7923f515525e5e62f28de9b50bc6ff3c9f6e (commit)
via 0f7a8e02c7ae3cfd6ab5612289a4c99bcadcdfe1 (commit)
via cf58f6593148f55b2016e2a18af75925271ef1b7 (commit)
via d83422d1c06058b66762477d9dcd008ff70bf485 (commit)
via 5eab2b3893538800a2f0aa9433028508a3ca7c0f (commit)
via 3d5c33f05790b87b142eab274cf27de439646735 (commit)
via 78e35e5ba3359b95cb7383e625ad3117d90d7e55 (commit)
via da6b767a2b478ebfb07adbf9a231ca3bcf7a49c0 (commit)
via 16105723e82cb592cd833c7aca862b7ffc6c48ce (commit)
via 144f344845738ce69422ac9a1dcbe731cba3ee48 (commit)
from 90a90bc1db9ecf57a0f1eec7cb5e171e166cc873 (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 962f7923f515525e5e62f28de9b50bc6ff3c9f6e
Merge: 90a90bc1d 0f7a8e02c
Author: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Thu Sep 24 14:16:16 2020 +0000
Merge branch 'master' into next
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/oldcore/149/update.sh | 3 +++
lfs/binutils | 2 ++
lfs/ccache | 5 ++++-
lfs/gcc | 4 +++-
lfs/glibc | 2 +-
make.sh | 4 ++--
6 files changed, 15 insertions(+), 5 deletions(-)
Difference in files:
diff --git a/config/rootfiles/oldcore/149/update.sh b/config/rootfiles/oldcore/149/update.sh
index 50add169b..38f80529f 100644
--- a/config/rootfiles/oldcore/149/update.sh
+++ b/config/rootfiles/oldcore/149/update.sh
@@ -43,6 +43,9 @@ extract_files
# update linker config
ldconfig
+# Restart init to allow clean unmout at reboot
+telinit u
+
# Update Language cache
/usr/local/bin/update-lang-cache
diff --git a/lfs/binutils b/lfs/binutils
index 334adad25..6db2e990f 100644
--- a/lfs/binutils
+++ b/lfs/binutils
@@ -51,6 +51,8 @@ ifeq "$(PASS)" "1"
CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
CFLAGS := $(patsubst -mindirect-branch=%,,$(CFLAGS))
CFLAGS := $(patsubst -mfunction-return=%,,$(CFLAGS))
+ CFLAGS := $(patsubst -fstack-clash-protection,,$(CFLAGS))
+ CFLAGS := $(patsubst -fcf-protection,,$(CFLAGS))
TARGET = $(DIR_INFO)/$(THISAPP)-tools1
EXTRA_CONFIG = \
diff --git a/lfs/ccache b/lfs/ccache
index 94d7bd149..1361f3ed0 100644
--- a/lfs/ccache
+++ b/lfs/ccache
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2020 IPFire Team <info@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 #
@@ -34,10 +34,13 @@ TARGET = $(DIR_INFO)/$(THISAPP)-pass$(PASS)
ifeq "$(PASS)" "1"
CFLAGS := $(patsubst -march=%,,$(CFLAGS))
+ CFLAGS := $(patsubst -mtune=%,,$(CFLAGS))
CFLAGS := $(patsubst -mfpu=%,,$(CFLAGS))
CFLAGS := $(patsubst -mfloat-abi=%,,$(CFLAGS))
CFLAGS := $(patsubst -mindirect-branch=%,,$(CFLAGS))
CFLAGS := $(patsubst -mfunction-return=%,,$(CFLAGS))
+ CFLAGS := $(patsubst -fstack-clash-protection,,$(CFLAGS))
+ CFLAGS := $(patsubst -fcf-protection,,$(CFLAGS))
endif
###############################################################################
diff --git a/lfs/gcc b/lfs/gcc
index 7cbc8e9e8..3aa147ce8 100644
--- a/lfs/gcc
+++ b/lfs/gcc
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2020 IPFire Team <info@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 #
@@ -44,6 +44,8 @@ CFLAGS := $(filter-out -fexceptions,$(CFLAGS))
ifeq "$(PASS)" "1"
CFLAGS := $(patsubst -mindirect-branch=%,,$(CFLAGS))
CFLAGS := $(patsubst -mfunction-return=%,,$(CFLAGS))
+CFLAGS := $(patsubst -fstack-clash-protection,,$(CFLAGS))
+CFLAGS := $(patsubst -fcf-protection,,$(CFLAGS))
endif
CXXFLAGS := $(CFLAGS)
diff --git a/lfs/glibc b/lfs/glibc
index 802c372a9..281c290dc 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -1,7 +1,7 @@
###############################################################################
# #
# IPFire.org - A linux based firewall #
-# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org> #
+# Copyright (C) 2007-2020 IPFire Team <info@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 #
diff --git a/make.sh b/make.sh
index 4a9dd3cb6..33c5de5cd 100755
--- a/make.sh
+++ b/make.sh
@@ -39,7 +39,7 @@ GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)" # Git Branch
GIT_TAG="$(git tag | tail -1)" # Git Tag
GIT_LASTCOMMIT="$(git rev-parse --verify HEAD)" # Last commit
-TOOLCHAINVER=20200814
+TOOLCHAINVER=20200924
###############################################################################
#
@@ -153,7 +153,7 @@ configure_build() {
BUILDTARGET="${build_arch}-pc-linux-gnu"
CROSSTARGET="${build_arch}-cross-linux-gnu"
BUILD_PLATFORM="x86"
- CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer -fcf-protection"
+ CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer"
;;
aarch64)
hooks/post-receive
--
IPFire 2.x development tree
_______________________________________________
IPFire-SCM mailing list
IPFire-SCM@lists.ipfire.org
https://lists.ipfire.org/mailman/listinfo/ipfire-scm
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic