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 c485f38c996cab87c98a78f1cadc2c2197d30625 (commit) via 4bee1eb491e8193fa75be2dd6b450aacf3772368 (commit) via 0c459f8c7e2bb155a7fed002cc6c52fce1b14c5b (commit) via a2c6ae9e1576a5f9720f300a485a850390168bf9 (commit) from b243767b1069c587996cad4ca60578ff8b06379d (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 c485f38c996cab87c98a78f1cadc2c2197d30625 Merge: b243767 4bee1eb Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Apr 19 22:04:24 2016 +0200
Merge remote-tracking branch 'origin/core100' into next
-----------------------------------------------------------------------
Summary of changes: config/kernel/kernel.config.i586-ipfire-pae | 4 ++-- config/rootfiles/oldcore/100/exclude | 2 ++ config/xen-image/xen-image-maker.sh | 4 ++-- lfs/linux | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-)
Difference in files: diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index f596a44..cfc3a6a 100644 --- a/config/kernel/kernel.config.i586-ipfire-pae +++ b/config/kernel/kernel.config.i586-ipfire-pae @@ -246,8 +246,8 @@ CONFIG_SECCOMP_FILTER=y CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_CC_STACKPROTECTOR=y # CONFIG_CC_STACKPROTECTOR_NONE is not set -# CONFIG_CC_STACKPROTECTOR_REGULAR is not set -CONFIG_CC_STACKPROTECTOR_STRONG=y +CONFIG_CC_STACKPROTECTOR_REGULAR=y +# CONFIG_CC_STACKPROTECTOR_STRONG is not set CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y CONFIG_HAVE_ARCH_TRANSPARENT_HUGEPAGE=y CONFIG_HAVE_ARCH_SOFT_DIRTY=y diff --git a/config/rootfiles/oldcore/100/exclude b/config/rootfiles/oldcore/100/exclude index 8e446ce..7ddeae0 100644 --- a/config/rootfiles/oldcore/100/exclude +++ b/config/rootfiles/oldcore/100/exclude @@ -1,4 +1,6 @@ boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv etc/alternatives etc/collectd.custom etc/default/grub diff --git a/config/xen-image/xen-image-maker.sh b/config/xen-image/xen-image-maker.sh index bd29855..00abb89 100644 --- a/config/xen-image/xen-image-maker.sh +++ b/config/xen-image/xen-image-maker.sh @@ -2,7 +2,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2014 Arne Fitzenreiter arne_f@ipfire.org # +# Copyright (C) 2007-2016 Arne Fitzenreiter arne_f@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 # @@ -104,7 +104,7 @@ dd bs=1M if=/dev/zero of=$IMGvar count=$SIZEvar mkfs.$FSTYPE -F $IMGvar
echo -------------------------------------------------------- -echo - Intall IPFire to the Images ... +echo - Install IPFire to the images ... echo --------------------------------------------------------
# Mount Images diff --git a/lfs/linux b/lfs/linux index be2e105..8e1536c 100644 --- a/lfs/linux +++ b/lfs/linux @@ -37,7 +37,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS =
-PAK_VER = 67 +PAK_VER = 68 DEPS = ""
KERNEL_ARCH = $(MACHINE)
hooks/post-receive -- IPFire 2.x development tree