From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arne Fitzenreiter To: ipfire-scm@lists.ipfire.org Subject: [git.ipfire.org] IPFire 2.x development tree branch, next, updated. 4baee8fa4c2ede6f28a1d669d191ea64bb68ad51 Date: Fri, 15 Nov 2019 20:07:34 +0000 Message-ID: <47F8XR12Wpz2y9J@people01.haj.ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6098505829425574827==" List-Id: --===============6098505829425574827== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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 4baee8fa4c2ede6f28a1d669d191ea64bb68ad51 (commit) via 906d9265cde12f1a0e677db43c076f2263fe15df (commit) from aee6dd0ba45cf12f014050bbab234d9e4b0d03ab (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 4baee8fa4c2ede6f28a1d669d191ea64bb68ad51 Author: Arne Fitzenreiter Date: Fri Nov 15 16:29:42 2019 +0100 kernel: fix x86_64 rootfile =20 Signed-off-by: Arne Fitzenreiter commit 906d9265cde12f1a0e677db43c076f2263fe15df Author: Arne Fitzenreiter Date: Fri Nov 15 16:28:02 2019 +0100 set core to 139 and pakfire to 138 =20 Signed-off-by: Arne Fitzenreiter ----------------------------------------------------------------------- Summary of changes: config/rootfiles/common/x86_64/linux | 2 +- make.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) Difference in files: diff --git a/config/rootfiles/common/x86_64/linux b/config/rootfiles/common/x= 86_64/linux index f44266e52..0ec85621a 100644 --- a/config/rootfiles/common/x86_64/linux +++ b/config/rootfiles/common/x86_64/linux @@ -12126,7 +12126,7 @@ etc/modprobe.d/ipv6.conf #lib/modules/KVER-ipfire/build/include/config/x86/intel/pstate.h #lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx #lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx/mode -#lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx/mode/auto.h +#lib/modules/KVER-ipfire/build/include/config/x86/intel/tsx/mode/off.h #lib/modules/KVER-ipfire/build/include/config/x86/internode #lib/modules/KVER-ipfire/build/include/config/x86/internode/cache #lib/modules/KVER-ipfire/build/include/config/x86/internode/cache/shift.h diff --git a/make.sh b/make.sh index da674fcb6..771c5ff89 100755 --- a/make.sh +++ b/make.sh @@ -26,8 +26,8 @@ NAME=3D"IPFire" # Software name SNAME=3D"ipfire" # Short name # If you update the version don't forget to update backupiso and add it to c= ore update VERSION=3D"2.23" # Version number -CORE=3D"138" # Core Level (Filename) -PAKFIRE_CORE=3D"137" # Core Level (PAKFIRE) +CORE=3D"139" # Core Level (Filename) +PAKFIRE_CORE=3D"138" # Core Level (PAKFIRE) GIT_BRANCH=3D`git rev-parse --abbrev-ref HEAD` # Git Branch SLOGAN=3D"www.ipfire.org" # Software slogan CONFIG_ROOT=3D/var/ipfire # Configuration rootdir hooks/post-receive -- IPFire 2.x development tree --===============6098505829425574827==--