]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
cdrom: Disable memtest on x86_64
authorMichael Tremer <michael.tremer@ipfire.org>
Sat, 5 Sep 2015 08:15:15 +0000 (10:15 +0200)
committerMichael Tremer <michael.tremer@ipfire.org>
Sat, 5 Sep 2015 08:15:15 +0000 (10:15 +0200)
memtest does currently not build on x86_64 and
we can leave it out for a moment until that has
been fixed to be able to master an ISO image

lfs/cdrom

index 79920b8ddbb787ad555ad4392e5822d09a08c12e..3a959111325de4cfbacca7b2daa2d03af38a7a5b 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -93,7 +93,9 @@ ifneq "$(MACHINE_TYPE)" "arm"
        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
+ifeq "$(MACHINE)" "i586"
        cp /usr/lib/memtest86+/memtest.bin          /install/cdrom/boot/isolinux/memtest
+endif
        cp /usr/share/ipfire-netboot/ipxe.lkrn      /install/cdrom/boot/isolinux/netboot
        cp /usr/share/syslinux/isolinux.bin         /install/cdrom/boot/isolinux/isolinux.bin
        cp /usr/share/hwdata/pci.ids                /install/cdrom/boot/isolinux/pci.ids