From 5d1c3aca0ab582ed3bca4d28e148a336e2a50b08 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Sat, 5 Sep 2015 10:15:15 +0200 Subject: [PATCH] cdrom: Disable memtest on x86_64 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lfs/cdrom b/lfs/cdrom index 79920b8ddb..3a95911132 100644 --- 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 -- 2.39.5