From f622fd8ed09d60b627da3589d91b9fc8d6a77393 Mon Sep 17 00:00:00 2001 From: Arne Fitzenreiter Date: Sat, 12 Jan 2019 20:01:00 +0100 Subject: [PATCH] linux-initrd: fix build of uInit on aarch64 Signed-off-by: Arne Fitzenreiter --- config/rootfiles/common/aarch64/linux-initrd | 2 +- lfs/linux-initrd | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/config/rootfiles/common/aarch64/linux-initrd b/config/rootfiles/common/aarch64/linux-initrd index a5a0da72ed..8abbf654a2 100644 --- a/config/rootfiles/common/aarch64/linux-initrd +++ b/config/rootfiles/common/aarch64/linux-initrd @@ -1,2 +1,2 @@ -#boot/uInit-KVER-ipfire +boot/uInit-KVER-ipfire boot/initramfs-KVER-ipfire.img diff --git a/lfs/linux-initrd b/lfs/linux-initrd index 3f0a80739d..f5bd4527bd 100644 --- a/lfs/linux-initrd +++ b/lfs/linux-initrd @@ -71,13 +71,13 @@ ifeq "$(KCFG)" "-kirkwood" endif ifeq "$(KCFG)" "-multi" -ifeq "$(BUILD_ARCH)" "aarch64" - cd /boot && mkimage -A arm64 -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(KVER)-$(VERSUFIX) - # dont remove initramfs because grub need this to boot. -else cd /boot && mkimage -A arm -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(KVER)-$(VERSUFIX) cd /boot && rm initramfs-$(KVER)-$(VERSUFIX).img endif + +ifeq "$(BUILD_ARCH)" "aarch64" + cd /boot && mkimage -A arm64 -T ramdisk -C lzma -d initramfs-$(KVER)-$(VERSUFIX).img uInit-$(KVER)-$(VERSUFIX) + # dont remove initramfs because grub need this to boot. endif endif -- 2.39.2