From 819e5e087f02eb4d922d3246110be759fbea59f7 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Peter=20M=C3=BCller?= <peter.mueller@ipfire.org>
Date: Mon, 21 Nov 2022 11:11:45 +0000
Subject: [PATCH] Core Update 172: Ship u-boot and regenerate all initrds
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

The latter is also needed to apply new CPU microcodes on x86_64.

Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
---
 .../core/172/filelists/aarch64/u-boot         |  1 +
 .../core/172/filelists/armv6l/u-boot          |  1 +
 config/rootfiles/core/172/update.sh           | 25 +++++++++++++++++++
 3 files changed, 27 insertions(+)
 create mode 120000 config/rootfiles/core/172/filelists/aarch64/u-boot
 create mode 120000 config/rootfiles/core/172/filelists/armv6l/u-boot

diff --git a/config/rootfiles/core/172/filelists/aarch64/u-boot b/config/rootfiles/core/172/filelists/aarch64/u-boot
new file mode 120000
index 0000000000..2a16bdbfe2
--- /dev/null
+++ b/config/rootfiles/core/172/filelists/aarch64/u-boot
@@ -0,0 +1 @@
+../../../../common/aarch64/u-boot
\ No newline at end of file
diff --git a/config/rootfiles/core/172/filelists/armv6l/u-boot b/config/rootfiles/core/172/filelists/armv6l/u-boot
new file mode 120000
index 0000000000..e88d95fac9
--- /dev/null
+++ b/config/rootfiles/core/172/filelists/armv6l/u-boot
@@ -0,0 +1 @@
+../../../../common/armv6l/u-boot
\ No newline at end of file
diff --git a/config/rootfiles/core/172/update.sh b/config/rootfiles/core/172/update.sh
index ea29bbf0eb..cc31851abc 100644
--- a/config/rootfiles/core/172/update.sh
+++ b/config/rootfiles/core/172/update.sh
@@ -38,6 +38,13 @@ done
 /etc/rc.d/init.d/sshd stop
 /etc/rc.d/init.d/unbound stop
 
+KVER="xxxKVERxxx"
+
+# Backup uEnv.txt if exist
+if [ -e /boot/uEnv.txt ]; then
+    cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
+fi
+
 # Remove files
 rm -rvf \
 	/etc/strongswan.d/scepclient.conf \
@@ -154,6 +161,24 @@ if grep -q "ENABLED=on" /var/ipfire/vpn/settings; then
 	/etc/init.d/ipsec start
 fi
 
+# Regenerate all initrds
+dracut --regenerate-all --force
+case "$(uname -m)" in
+	armv*)
+		mkimage -A arm -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire
+		rm /boot/initramfs-${KVER}-ipfire.img
+		;;
+	aarch64)
+		mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire
+		# dont remove initramfs because grub need this to boot.
+		;;
+esac
+
+# 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
 
-- 
2.39.2