webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-21 00:12:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

cdrom: Install memtest only on x86

Browse Source 
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2018-07-05 23:29:20 +01:00
parent 701c891b40
commit b7407ccad5
1 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lfs/cdrom
View File

@@ -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" \