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, master has been updated via 7331b247574f78c835551d9f2944483cb1381b94 (commit) via 1d843cda2b28d1ba842ca496a95f4cd88afe54dc (commit) from 69f3684cf5337d34963b1ee6a5c8ac2072c6eaf6 (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 7331b247574f78c835551d9f2944483cb1381b94 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Sep 13 19:39:43 2016 +0200

kernel: update to 3.14.79.

commit 1d843cda2b28d1ba842ca496a95f4cd88afe54dc Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Sep 13 19:37:58 2016 +0200

xen-image: fix kernel installation.

linux-pae will refuse to install if pae is not detected but /proc was not exist at image cration. fixed by adding a fake cpuinfo file...

-----------------------------------------------------------------------

Summary of changes: config/xen-image/xen-image-maker.sh | 6 ++++-- lfs/linux | 19 +++++++++---------- 2 files changed, 13 insertions(+), 12 deletions(-)

Difference in files: diff --git a/config/xen-image/xen-image-maker.sh b/config/xen-image/xen-image-maker.sh index 00abb89..d10ea21 100644 --- a/config/xen-image/xen-image-maker.sh +++ b/config/xen-image/xen-image-maker.sh @@ -121,12 +121,15 @@ tar -C $MNThdd/ -xvf $TMPDIR/$SNAME-$VERSION.tar \ --exclude=lib/modules* --exclude=boot* --numeric-owner

#Install Kernel +mkdir $MNThdd/proc +mkdir $MNThdd/boot/grub +echo "flags : pae " > $MNThdd/proc/cpuinfo # fake pae detection tar -C $MNThdd/opt/pakfire/tmp -xvf $TMPDIR/$KERNEL --numeric-owner chroot $MNThdd /opt/pakfire/tmp/install.sh rm -rf $MNThdd/opt/pakfire/tmp/* +rm -rf $MNThdd/proc/cpuinfo

#Create grub menuentry for pygrub -mkdir $MNThdd/boot/grub echo "timeout 10" > $MNThdd/boot/grub/grub.conf echo "default 0" >> $MNThdd/boot/grub/grub.conf echo "title IPFire ($KERN_TYPE-kernel)" >> $MNThdd/boot/grub/grub.conf @@ -155,7 +158,6 @@ echo "LANGUAGE=en" >> $MNThdd/var/ipfire/main/settings echo "HOSTNAME=$SNAME" >> $MNThdd/var/ipfire/main/settings echo "THEME=ipfire" >> $MNThdd/var/ipfire/main/settings touch $MNThdd/lib/modules/$KVER-ipfire-$KERN_TYPE/modules.dep -mkdir $MNThdd/proc mount --bind /proc $MNThdd/proc mount --bind /dev $MNThdd/dev mount --bind /sys $MNThdd/sys diff --git a/lfs/linux b/lfs/linux index e365be6..da13c17 100644 --- a/lfs/linux +++ b/lfs/linux @@ -24,10 +24,10 @@

include Config

-VER = 3.14.77 -RPI_PATCHES = 3.14.77-grsec-ipfire1 -A7M_PATCHES = 3.14.77-grsec-ipfire1 -GRS_PATCHES = grsecurity-3.1ipfire-3.14.77-v1.patch.xz +VER = 3.14.79 +RPI_PATCHES = 3.14.79-grsec-ipfire1 +A7M_PATCHES = 3.14.79-grsec-ipfire1 +GRS_PATCHES = grsecurity-3.1ipfire-3.14.79-v1.patch.xz

THISAPP = linux-$(VER) @@ -37,7 +37,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP) CFLAGS = CXXFLAGS =

-PAK_VER = 71 +PAK_VER = 72 DEPS = ""

KERNEL_ARCH = $(MACHINE) @@ -83,10 +83,10 @@ rpi-patches-$(RPI_PATCHES).patch.xz = $(URL_IPFIRE)/rpi-patches-$(RPI_PATCHES). arm7-multi-patches-$(A7M_PATCHES).patch.xz = $(URL_IPFIRE)/arm7-multi-patches-$(A7M_PATCHES).patch.xz $(GRS_PATCHES) = $(URL_IPFIRE)/$(GRS_PATCHES)

-$(DL_FILE)_MD5 = 7ecb8518498d0666a7b88f359e566f4c -rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = 3213020a9627ea73cc9668e2db4ff8a4 -arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = 56949a37637656d5ea23658cc9222f64 -$(GRS_PATCHES)_MD5 = 5ed67f97c3b0de1b290f9155eb166c56 +$(DL_FILE)_MD5 = ec5b09d8ad2ebf92e6f51a727a338559 +rpi-patches-$(RPI_PATCHES).patch.xz_MD5 = a02a7fd54c642c1e3578a00ed22f54f8 +arm7-multi-patches-$(A7M_PATCHES).patch.xz_MD5 = 6c3b11e51caa278dbeacd1e23c2b171b +$(GRS_PATCHES)_MD5 = 7fe448b53558082395f68c5db94af1a7

install : $(TARGET)

@@ -132,7 +132,6 @@ ifneq "$(KCFG)" "-headers" cd $(DIR_APP) && xz -c -d $(DIR_DL)/$(GRS_PATCHES) | patch -Np1 cd $(DIR_APP) && rm localversion-grsec cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.7-disable-compat_vdso.patch - cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/linux-3.14.77-gsrec_tcp_input_access_once_rw.patch endif

# DVB Patches

hooks/post-receive -- IPFire 2.x development tree