kernel: update to 4.14.119
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 16 May 2019 12:26:04 +0000 (14:26 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 16 May 2019 12:26:04 +0000 (14:26 +0200)
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
18 files changed:
config/kernel/kernel.config.aarch64-ipfire
config/kernel/kernel.config.armv5tel-ipfire-kirkwood
config/kernel/kernel.config.armv5tel-ipfire-multi
config/kernel/kernel.config.i586-ipfire
config/kernel/kernel.config.i586-ipfire-pae
config/kernel/kernel.config.x86_64-ipfire
config/rootfiles/core/132/filelists/aarch64/linux [new symlink]
config/rootfiles/core/132/filelists/aarch64/linux-initrd [new symlink]
config/rootfiles/core/132/filelists/armv5tel/linux-initrd-kirkwood [new symlink]
config/rootfiles/core/132/filelists/armv5tel/linux-initrd-multi [new symlink]
config/rootfiles/core/132/filelists/armv5tel/linux-kirkwood [new symlink]
config/rootfiles/core/132/filelists/armv5tel/linux-multi [new symlink]
config/rootfiles/core/132/filelists/i586/linux [new symlink]
config/rootfiles/core/132/filelists/i586/linux-initrd [new symlink]
config/rootfiles/core/132/filelists/x86_64/linux [new symlink]
config/rootfiles/core/132/filelists/x86_64/linux-initrd [new symlink]
config/rootfiles/core/132/update.sh
lfs/linux

index 9dc7ad1..4630ca3 100644 (file)
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 4.14.112-ipfire Kernel Configuration
+# Linux/arm64 4.14.119-ipfire Kernel Configuration
 #
 CONFIG_ARM64=y
 CONFIG_64BIT=y
index 5c6050b..991807f 100644 (file)
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.112-ipfire-kirkwood Kernel Configuration
+# Linux/arm 4.14.119-ipfire-kirkwood Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
index 7ba02c6..544dab5 100644 (file)
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.14.112-ipfire-multi Kernel Configuration
+# Linux/arm 4.14.119-ipfire-multi Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
index 3ced58c..33a0e00 100644 (file)
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.112-ipfire Kernel Configuration
+# Linux/x86 4.14.119-ipfire Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
index 870a01c..77f7403 100644 (file)
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.112-ipfire-pae Kernel Configuration
+# Linux/x86 4.14.119-ipfire-pae Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
index 8018dc0..2f13d3b 100644 (file)
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.14.112-ipfire Kernel Configuration
+# Linux/x86 4.14.119-ipfire Kernel Configuration
 #
 CONFIG_64BIT=y
 CONFIG_X86_64=y
diff --git a/config/rootfiles/core/132/filelists/aarch64/linux b/config/rootfiles/core/132/filelists/aarch64/linux
new file mode 120000 (symlink)
index 0000000..3a2532b
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/aarch64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/132/filelists/aarch64/linux-initrd b/config/rootfiles/core/132/filelists/aarch64/linux-initrd
new file mode 120000 (symlink)
index 0000000..8acdb0f
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/aarch64/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/core/132/filelists/armv5tel/linux-initrd-kirkwood b/config/rootfiles/core/132/filelists/armv5tel/linux-initrd-kirkwood
new file mode 120000 (symlink)
index 0000000..39c5591
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-initrd-kirkwood
\ No newline at end of file
diff --git a/config/rootfiles/core/132/filelists/armv5tel/linux-initrd-multi b/config/rootfiles/core/132/filelists/armv5tel/linux-initrd-multi
new file mode 120000 (symlink)
index 0000000..0b1b453
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-initrd-multi
\ No newline at end of file
diff --git a/config/rootfiles/core/132/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/132/filelists/armv5tel/linux-kirkwood
new file mode 120000 (symlink)
index 0000000..7217107
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-kirkwood
\ No newline at end of file
diff --git a/config/rootfiles/core/132/filelists/armv5tel/linux-multi b/config/rootfiles/core/132/filelists/armv5tel/linux-multi
new file mode 120000 (symlink)
index 0000000..204eb4c
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/armv5tel/linux-multi
\ No newline at end of file
diff --git a/config/rootfiles/core/132/filelists/i586/linux b/config/rootfiles/core/132/filelists/i586/linux
new file mode 120000 (symlink)
index 0000000..693ec4b
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/i586/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/132/filelists/i586/linux-initrd b/config/rootfiles/core/132/filelists/i586/linux-initrd
new file mode 120000 (symlink)
index 0000000..32a03e6
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/i586/linux-initrd
\ No newline at end of file
diff --git a/config/rootfiles/core/132/filelists/x86_64/linux b/config/rootfiles/core/132/filelists/x86_64/linux
new file mode 120000 (symlink)
index 0000000..0615b5b
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/x86_64/linux
\ No newline at end of file
diff --git a/config/rootfiles/core/132/filelists/x86_64/linux-initrd b/config/rootfiles/core/132/filelists/x86_64/linux-initrd
new file mode 120000 (symlink)
index 0000000..1b9fff7
--- /dev/null
@@ -0,0 +1 @@
+../../../../common/x86_64/linux-initrd
\ No newline at end of file
index 518c5b3..669df60 100644 (file)
 . /opt/pakfire/lib/functions.sh
 /usr/local/bin/backupctrl exclude >/dev/null 2>&1
 
-core=131
+core=132
+
+exit_with_error() {
+       # Set last succesfull installed core.
+       echo $(($core-1)) > /opt/pakfire/db/core/mine
+       # don't start pakfire again at error
+       killall -KILL pak_update
+       /usr/bin/logger -p syslog.emerg -t ipfire \
+               "core-update-${core}: $1"
+       exit $2
+}
 
 # Remove old core updates from pakfire cache to save space...
 for (( i=1; i<=$core; i++ )); do
        rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
 done
 
+KVER="xxxKVERxxx"
+
+# Backup uEnv.txt if exist
+if [ -e /boot/uEnv.txt ]; then
+       cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
+fi
+
+# Do some sanity checks.
+case $(uname -r) in
+       *-ipfire*)
+               # Ok.
+               ;;
+       *)
+               exit_with_error "ERROR cannot update. No IPFire Kernel." 1
+               ;;
+esac
+
+# Check diskspace on root
+ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+
+if [ $ROOTSPACE -lt 80000 ]; then
+       exit_with_error "ERROR cannot update because not enough free space on root." 2
+       exit 2
+fi
+
+# Remove the old kernel
+rm -rf /boot/System.map-*
+rm -rf /boot/config-*
+rm -rf /boot/ipfirerd-*
+rm -rf /boot/initramfs-*
+rm -rf /boot/vmlinuz-*
+rm -rf /boot/uImage-*-ipfire-*
+rm -rf /boot/zImage-*-ipfire-*
+rm -rf /boot/uInit-*-ipfire-*
+rm -rf /boot/dtb-*-ipfire-*
+rm -rf /lib/modules
+rm -f  /etc/sysconfig/lm_sensors
+
 # Stop services
+/etc/init.d/suricata stop
 
 # Extract files
 extract_files
@@ -43,10 +92,51 @@ ldconfig
 /usr/local/bin/update-lang-cache
 
 # Start services
-/etc/init.d/suricata restart
+/etc/init.d/apache restart
+/etc/init.d/collectd restart
+/etc/init.d/firewall restart
+/etc/init.d/unbound restart
+/etc/init.d/suricata start
+
+# Search sensors again after reboot into the new kernel
+rm -f  /etc/sysconfig/lm_sensors
+
+# Upadate Kernel version uEnv.txt
+if [ -e /boot/uEnv.txt ]; then
+       sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt
+fi
+
+# call user update script (needed for some arm boards)
+if [ -e /boot/pakfire-kernel-update ]; then
+       /boot/pakfire-kernel-update ${KVER}
+fi
 
-# This update needs a reboot...
-touch /var/run/need_reboot
+case "$(uname -m)" in
+       i?86)
+               # Force (re)install pae kernel if pae is supported
+               rm -rf /opt/pakfire/db/installed/meta-linux-pae
+               rm -rf /opt/pakfire/db/rootfiles/linux-pae
+               if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
+                       ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+                       BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
+                       if [ $BOOTSPACE -lt 22000 -o $ROOTSPACE -lt 120000 ]; then
+                               /usr/bin/logger -p syslog.emerg -t ipfire \
+                               "core-update-${core}: WARNING not enough space for pae kernel."
+                               touch /var/run/need_reboot
+                       else
+                               echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
+                               echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
+                               echo "Release: 0"     >> /opt/pakfire/db/installed/meta-linux-pae
+                       fi
+               else
+                       touch /var/run/need_reboot
+               fi
+               ;;
+       *)
+               # This update needs a reboot...
+               touch /var/run/need_reboot
+               ;;
+esac
 
 # Finish
 /etc/init.d/fireinfo start
index 974c2a2..6fb09a9 100644 (file)
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-VER         = 4.14.113
-ARM_PATCHES = 4.14.113-ipfire0
+VER         = 4.14.119
+ARM_PATCHES = 4.14.119-ipfire0
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -34,7 +34,7 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 CFLAGS     =
 CXXFLAGS   =
 
-PAK_VER    = 82
+PAK_VER    = 83
 DEPS      = ""
 
 HEADERS_ARCH  = $(BUILD_PLATFORM)
@@ -82,8 +82,8 @@ objects =$(DL_FILE) \
 $(DL_FILE)                                     = $(URL_IPFIRE)/$(DL_FILE)
 arm-multi-patches-$(ARM_PATCHES).patch.xz      = $(URL_IPFIRE)/arm-multi-patches-$(ARM_PATCHES).patch.xz
 
-$(DL_FILE)_MD5                                 = fd34a25839945f902f0c6d694d42ea7f
-arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = 51eab5175bf8f0ad986006c74e60b472
+$(DL_FILE)_MD5                                 = e3869ac41b7e784559b538ad03cb4842
+arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5  = d2c131ae54470bbc4f1086319158ce5d
 
 install : $(TARGET)