[git.ipfire.org] IPFire 2.x development tree branch, next, updated. 19f37f249376681cb670c3ca3e8195b3e62ea390

[Arne Fitzenreiter <git@ipfire.org>]

[-- Attachment #1: Type: text/plain, Size: 5831 bytes --]

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  19f37f249376681cb670c3ca3e8195b3e62ea390 (commit)
       via  827dd0faa45f5a70e4e2b1aefa4f3df67cdf248f (commit)
      from  93363446e45aece7b07bfcd6237b2b5eb658d065 (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 19f37f249376681cb670c3ca3e8195b3e62ea390
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Dec 6 11:27:46 2018 +0100

    core126: add kernel to updater
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

commit 827dd0faa45f5a70e4e2b1aefa4f3df67cdf248f
Author: Arne Fitzenreiter <arne_f(a)ipfire.org>
Date:   Thu Dec 6 11:18:37 2018 +0100

    kernel: update to 4.14.86
    
    Signed-off-by: Arne Fitzenreiter <arne_f(a)ipfire.org>

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

Summary of changes:
 config/rootfiles/core/126/update.sh | 86 ++++++++++++++++++++++++++++++++++++-
 lfs/linux                           |  6 +--
 2 files changed, 87 insertions(+), 5 deletions(-)

Difference in files:
diff --git a/config/rootfiles/core/126/update.sh b/config/rootfiles/core/126/update.sh
index 7c81f4f24..ad4db089c 100644
--- a/config/rootfiles/core/126/update.sh
+++ b/config/rootfiles/core/126/update.sh
@@ -17,7 +17,7 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2017 IPFire-Team <info(a)ipfire.org>.                        #
+# Copyright (C) 2018 IPFire-Team <info(a)ipfire.org>.                        #
 #                                                                          #
 ############################################################################
 #
@@ -26,13 +26,63 @@
 
 core=126
 
+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
 
+# Remove files
+
 # Extract files
 extract_files
 
@@ -44,8 +94,40 @@ ldconfig
 
 # Start services
 
+# 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
+
+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."
+			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
+		fi
+		;;
+esac
+
 # This update needs a reboot...
-#touch /var/run/need_reboot
+if [ ! -e /opt/pakfire/db/installed/meta-linux-pae ]; then
+	touch /var/run/need_reboot
+fi
 
 # Finish
 /etc/init.d/fireinfo start
diff --git a/lfs/linux b/lfs/linux
index 2c94558ae..0994e3e56 100644
--- a/lfs/linux
+++ b/lfs/linux
@@ -24,8 +24,8 @@
 
 include Config
 
-VER         = 4.14.85
-ARM_PATCHES = 4.14.85-ipfire0
+VER         = 4.14.86
+ARM_PATCHES = 4.14.86-ipfire0
 
 THISAPP    = linux-$(VER)
 DL_FILE    = linux-$(VER).tar.xz
@@ -82,7 +82,7 @@ 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					= 13353c0dfd8c11110e4ea8f9b8029836
+$(DL_FILE)_MD5					= 9ffeff88ca630a6e0ef0257b0a05b8c4
 arm-multi-patches-$(ARM_PATCHES).patch.xz_MD5	= 36b8a9adb8915cbccd18069e2f5af159
 
 install : $(TARGET)


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