cdrom: Install memtest only on x86
authorMichael Tremer <michael.tremer@ipfire.org>
Thu, 5 Jul 2018 22:29:20 +0000 (23:29 +0100)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 14 Jul 2018 12:43:53 +0000 (13:43 +0100)
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
lfs/cdrom

index f677493..cb04a0f 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -59,6 +59,12 @@ ifeq "$(EFI)" "1"
        ISOHYBRID_ARGS += --uefi
 endif
 
+HAS_MEMTEST = 0
+
+ifeq "$(BUILD_PLATFORM)" "x86"
+       HAS_MEMTEST = 1
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -116,10 +122,14 @@ ifneq "$(BUILD_ARCH)" "armv5tel"
        cp /boot/vmlinuz-$(KVER)-ipfire             /install/cdrom/boot/isolinux/vmlinuz
        dracut --force -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire
        cp $(DIR_SRC)/config/syslinux/boot.png      /install/cdrom/boot/isolinux/boot.png
-       cp /usr/lib/memtest86+/memtest.bin          /install/cdrom/boot/isolinux/memtest
        cp /usr/share/ipfire-netboot/ipxe.lkrn      /install/cdrom/boot/isolinux/netboot
        cp /usr/share/syslinux/isolinux.bin         /install/cdrom/boot/isolinux/isolinux.bin
 
+ifeq "$(HAS_MEMTEST)" "1"
+       # Install memtest
+       cp /usr/lib/memtest86+/memtest.bin          /install/cdrom/boot/isolinux/memtest
+endif
+
 ifeq "$(EFI)" "1"
        # Generate embedded GRUB configuration
        sed -e "s/NAME/$(NAME)/g" -e "s/VERSION/$(VERSION)/g" -e "s/ARCH/$(BUILD_ARCH)/g" \