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, core188 has been updated via 1abba4e952ad107d1488493ef81cde3623db963d (commit) via edb9e4e030b3bb8a85bbca36308c14278077ecb7 (commit) from 699124028a4a08c9b07de9348df37fa2950afe15 (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 1abba4e952ad107d1488493ef81cde3623db963d Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Sep 20 12:25:21 2024 +0000
core188: Ship u-boot for aarch64
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit edb9e4e030b3bb8a85bbca36308c14278077ecb7 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Fri Sep 20 14:22:01 2024 +0200
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 arne_f@ipfire.org Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/{oldcore/159 => core/188}/filelists/aarch64/u-boot | 0 config/rootfiles/core/188/update.sh | 2 +- config/u-boot/boot.cmd | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) copy config/rootfiles/{oldcore/159 => core/188}/filelists/aarch64/u-boot (100%)
Difference in files: 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 0000000000..2a16bdbfe2 --- /dev/null +++ b/config/rootfiles/core/188/filelists/aarch64/u-boot @@ -0,0 +1 @@ +../../../../common/aarch64/u-boot \ No newline at end of file diff --git a/config/rootfiles/core/188/update.sh b/config/rootfiles/core/188/update.sh index facaeede8d..d15ca96744 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 a279967803..5faa3a1eca 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...;
hooks/post-receive -- IPFire 2.x development tree