X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcdrom;h=05b4fe891acb2d57f1436fbe9a5780e3bc4f548f;hp=7150153d70fd1486602d8477b8c6958f96100300;hb=4790db5f9509befbaa2d379a854bddd49d09f497;hpb=6b44fee76f2f086b8ac5378e1fdcf1fc000b70e6

diff --git a/lfs/cdrom b/lfs/cdrom
index 7150153d70..05b4fe891a 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -35,19 +35,24 @@ else
 	TAR_OPTIONS = --lzma
 endif
 
+HAS_MEMTEST = 0
+HAS_IPXE = 0
+HAS_ISOLINUX = 0
+HAS_KERNEL = 1
+
+ifeq "$(BUILD_PLATFORM)" "x86"
+	HAS_MEMTEST = 1
+	HAS_IPXE = 1
+	HAS_ISOLINUX = 1
+endif
+
+ifeq "$(BUILD_ARCH)" "armv5tel"
+	HAS_KERNEL = 0
+endif
+
 ISO_ARGS = -J -r -v \
 	-A "$(NAME) $(VERSION) $(BUILD_ARCH)" \
-	-V "$(NAME) $(VERSION) $(BUILD_ARCH)" \
-	-no-emul-boot \
-	-boot-load-size 4 \
-	-boot-info-table \
-	-b boot/isolinux/isolinux.bin \
-	-c boot/isolinux/boot.catalog
-
-# Only build a stub ISO for ARM
-ifeq "$(BUILD_PLATFORM)" "arm"
-	ISO_ARGS = -J -r -V "$(NAME) $(VERSION) $(BUILD_ARCH)"
-endif
+	-V "$(NAME) $(VERSION) $(BUILD_ARCH)"
 
 ISOHYBRID_ARGS =
 
@@ -59,6 +64,15 @@ ifeq "$(EFI)" "1"
 	ISOHYBRID_ARGS += --uefi
 endif
 
+ifeq "$(HAS_ISOLINUX)" "1"
+	ISO_ARGS += \
+		-no-emul-boot \
+		-boot-load-size 4 \
+		-boot-info-table \
+		-b boot/isolinux/isolinux.bin \
+		-c boot/isolinux/boot.catalog
+endif
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -109,16 +123,32 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cp $(DIR_SRC)/doc/COPYING				/install/cdrom/
 	cp $(DIR_SRC)/doc/{ChangeLog,packages-list.txt}	/install/cdrom/doc
 
-	# Make the ISO
 	mkdir -p /install/cdrom/boot/isolinux
-	dd if=/dev/zero  bs=1k count=2            > /install/cdrom/boot/isolinux/boot.catalog
-ifneq "$(BUILD_PLATFORM)" "arm"
+
+ifeq "$(HAS_KERNEL)" "1"
 	cp /boot/vmlinuz-$(KVER)-ipfire             /install/cdrom/boot/isolinux/vmlinuz
 	dracut --force -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire
+endif
+
+ifeq "$(HAS_ISOLINUX)" "1"
+	dd if=/dev/zero  bs=1k count=2            > /install/cdrom/boot/isolinux/boot.catalog
 	cp $(DIR_SRC)/config/syslinux/boot.png      /install/cdrom/boot/isolinux/boot.png
+	cp /usr/share/syslinux/isolinux.bin         /install/cdrom/boot/isolinux/isolinux.bin
+	cp /usr/share/hwdata/pci.ids                /install/cdrom/boot/isolinux/pci.ids
+	cp -vf /usr/share/syslinux/*.c32            /install/cdrom/boot/isolinux/
+	sed -e "s/VERSION/$(VERSION) - Core $(CORE)/g" \
+		$(DIR_SRC)/config/syslinux/syslinux.cfg \
+		> /install/cdrom/boot/isolinux/isolinux.cfg
+endif
+
+ifeq "$(HAS_MEMTEST)" "1"
+	# Install memtest
 	cp /usr/lib/memtest86+/memtest.bin          /install/cdrom/boot/isolinux/memtest
+endif
+
+ifeq "$(HAS_IPXE)" "1"
 	cp /usr/share/ipfire-netboot/ipxe.lkrn      /install/cdrom/boot/isolinux/netboot
-	cp /usr/share/syslinux/isolinux.bin         /install/cdrom/boot/isolinux/isolinux.bin
+endif
 
 ifeq "$(EFI)" "1"
 	# Generate embedded GRUB configuration
@@ -158,12 +188,6 @@ ifeq "$(EFI)" "1"
 	rm -rf /install/efiboot.img /tmp/grub-efi.cfg
 endif
 
-	cp /usr/share/hwdata/pci.ids                /install/cdrom/boot/isolinux/pci.ids
-	cp -vf /usr/share/syslinux/*.c32            /install/cdrom/boot/isolinux/
-	sed -e "s/VERSION/$(VERSION) - Core $(CORE)/g" \
-		$(DIR_SRC)/config/syslinux/syslinux.cfg \
-		> /install/cdrom/boot/isolinux/isolinux.cfg
-endif
 	cd /install/cdrom && find -type f ! -name md5sum.txt | grep -v "./boot" | \
 						xargs md5sum > md5sum.txt