From 699124028a4a08c9b07de9348df37fa2950afe15 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 20 Sep 2024 10:19:57 +0000 Subject: [PATCH 1/3] core188: Regenerate Suricata rulefiles Signed-off-by: Michael Tremer --- config/rootfiles/core/188/update.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/rootfiles/core/188/update.sh b/config/rootfiles/core/188/update.sh index 276223052..facaeede8 100644 --- a/config/rootfiles/core/188/update.sh +++ b/config/rootfiles/core/188/update.sh @@ -121,6 +121,10 @@ ldconfig /etc/init.d/apache restart /etc/init.d/unbound restart +# Regenerate Suricata rule files +perl -e "require '/var/ipfire/ids-functions.pl'; &IDS::write_used_rulefiles_file();"t +/etc/init.d/suricata reload + # Build initial ramdisks dracut --regenerate-all --force KVER="xxxKVERxxx" From edb9e4e030b3bb8a85bbca36308c14278077ecb7 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Fri, 20 Sep 2024 14:22:01 +0200 Subject: [PATCH 2/3] u-boot: fix KVER syntax with some kernel build changes KVER also contains the -ipfire string so this has to be removed in u-boot. Signed-off-by: Arne Fitzenreiter Signed-off-by: Michael Tremer --- config/rootfiles/core/188/update.sh | 2 +- config/u-boot/boot.cmd | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/core/188/update.sh b/config/rootfiles/core/188/update.sh index facaeede8..d15ca9674 100644 --- a/config/rootfiles/core/188/update.sh +++ b/config/rootfiles/core/188/update.sh @@ -130,7 +130,7 @@ dracut --regenerate-all --force KVER="xxxKVERxxx" case "$(uname -m)" in aarch64) - mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire + mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}.img /boot/uInit-${KVER} # dont remove initramfs because grub need this to boot. ;; esac diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd index a27996780..5faa3a1ec 100644 --- a/config/u-boot/boot.cmd +++ b/config/u-boot/boot.cmd @@ -77,8 +77,8 @@ else fi; setenv fdt_high ffffffff; -fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}-ipfire${kernel_type}; -fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}-ipfire${kernel_type}/${fdtfile}; +fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}; +fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}/${fdtfile}; if test "${FDTCMDS}" = ""; then echo ; @@ -88,7 +88,7 @@ else fi; setenv ramdisk_addr ${ramdisk_addr_r} -if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}-ipfire${kernel_type}; then +if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}; then echo Ramdisk loaded...; else echo Ramdisk not loaded...; From 1abba4e952ad107d1488493ef81cde3623db963d Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Fri, 20 Sep 2024 12:25:21 +0000 Subject: [PATCH 3/3] core188: Ship u-boot for aarch64 Signed-off-by: Michael Tremer --- config/rootfiles/core/188/filelists/aarch64/u-boot | 1 + 1 file changed, 1 insertion(+) create mode 120000 config/rootfiles/core/188/filelists/aarch64/u-boot diff --git a/config/rootfiles/core/188/filelists/aarch64/u-boot b/config/rootfiles/core/188/filelists/aarch64/u-boot new file mode 120000 index 000000000..2a16bdbfe --- /dev/null +++ b/config/rootfiles/core/188/filelists/aarch64/u-boot @@ -0,0 +1 @@ +../../../../common/aarch64/u-boot \ No newline at end of file