From a2c6ae9e1576a5f9720f300a485a850390168bf9 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 15 Apr 2016 13:19:25 +0200 Subject: [PATCH 1/4] core100: remove grub.cfg and grubenv from updater. Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/100/exclude | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/rootfiles/core/100/exclude b/config/rootfiles/core/100/exclude index 8e446ce6c..7ddeae0ba 100644 --- a/config/rootfiles/core/100/exclude +++ b/config/rootfiles/core/100/exclude @@ -1,4 +1,6 @@ boot/config.txt +boot/grub/grub.cfg +boot/grub/grubenv etc/alternatives etc/collectd.custom etc/default/grub From 0c459f8c7e2bb155a7fed002cc6c52fce1b14c5b Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 17 Apr 2016 22:23:11 +0200 Subject: [PATCH 2/4] xen-image-maker: fix typos and missing doublequote. --- config/xen-image/xen-image-maker.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/xen-image/xen-image-maker.sh b/config/xen-image/xen-image-maker.sh index 07414f721..00abb89c2 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 # +# Copyright (C) 2007-2016 Arne Fitzenreiter # # # # 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 @@ -130,7 +130,7 @@ 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 -echo " root (hd0) >> $MNThdd/boot/grub/grub.conf +echo " root (hd0)" >> $MNThdd/boot/grub/grub.conf echo " kernel /vmlinuz-$KVER-ipfire-$KERN_TYPE root=/dev/$P3 rootdelay=10 panic=10 console=$CONSOLE" \ >> $MNThdd/boot/grub/grub.conf echo " initrd /initramfs-$KVER-ipfire-$KERN_TYPE.img" >> $MNThdd/boot/grub/grub.conf From 4bee1eb491e8193fa75be2dd6b450aacf3772368 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sun, 17 Apr 2016 22:25:16 +0200 Subject: [PATCH 3/4] kernel: change stackprotector from strong to regular. Xen/Paravirt crash with stackprotect in strong mode. Signed-off-by: Arne Fitzenreiter --- config/kernel/kernel.config.i586-ipfire-pae | 4 ++-- lfs/linux | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/kernel/kernel.config.i586-ipfire-pae b/config/kernel/kernel.config.i586-ipfire-pae index f596a4435..cfc3a6ab5 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/lfs/linux b/lfs/linux index be2e105b9..8e1536c5d 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) From b243767b1069c587996cad4ca60578ff8b06379d Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Tue, 19 Apr 2016 18:41:32 +0200 Subject: [PATCH 4/4] kernel: fix mac80211 build on rpi. mac80211 depends on CRYPTO_GCM don't know why this was off before in rpi config. Signed-off-by: Arne Fitzenreiter --- config/kernel/kernel.config.armv5tel-ipfire-rpi | 6 +++--- config/rootfiles/core/101/filelists/armv5tel/linux-rpi | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) create mode 120000 config/rootfiles/core/101/filelists/armv5tel/linux-rpi diff --git a/config/kernel/kernel.config.armv5tel-ipfire-rpi b/config/kernel/kernel.config.armv5tel-ipfire-rpi index 989b2d6ba..3c354e297 100644 --- a/config/kernel/kernel.config.armv5tel-ipfire-rpi +++ b/config/kernel/kernel.config.armv5tel-ipfire-rpi @@ -3296,8 +3296,8 @@ CONFIG_UIO_PDRV_GENIRQ=m # CONFIG_STAGING=y # CONFIG_USBIP_CORE is not set -CONFIG_W35UND=m -CONFIG_PRISM2_USB=m +# CONFIG_W35UND is not set +# CONFIG_PRISM2_USB is not set # CONFIG_ECHO is not set # CONFIG_COMEDI is not set # CONFIG_RTLLIB is not set @@ -3965,7 +3965,7 @@ CONFIG_CRYPTO_AUTHENC=m # Authenticated Encryption with Associated Data # CONFIG_CRYPTO_CCM=m -# CONFIG_CRYPTO_GCM is not set +CONFIG_CRYPTO_GCM=m CONFIG_CRYPTO_SEQIV=m # diff --git a/config/rootfiles/core/101/filelists/armv5tel/linux-rpi b/config/rootfiles/core/101/filelists/armv5tel/linux-rpi new file mode 120000 index 000000000..a651a498f --- /dev/null +++ b/config/rootfiles/core/101/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file