support build of different arm kernels and add verstile cfg.

[ipfire-2.x.git] / lfs / cdrom

diff --git a/lfs/cdrom b/lfs/cdrom
index 3c7a20ed6353f0b5a9fc102e43d0f62a3413a401..36dbe01e89b8b34820eeba5df11aa3a5ef929fce 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -88,9 +88,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Make the ISO
        mkdir -p /install/cdrom/boot/isolinux
        dd if=/dev/zero  bs=1k count=2            > /install/cdrom/boot/isolinux/boot.catalog
-       cp /install/images/initrd                   /install/cdrom/boot/isolinux/instroot
-       cp /boot/vmlinuz-$(KVER)-ipfire             /install/cdrom/boot/isolinux/vmlinuz
 ifneq "$(MACHINE_TYPE)" "arm"
+       cp /boot/vmlinuz-$(KVER)-ipfire             /install/cdrom/boot/isolinux/vmlinuz
+       cp /install/images/initrd                   /install/cdrom/boot/isolinux/instroot
        cp $(DIR_SRC)/config/syslinux/syslinux.cfg  /install/cdrom/boot/isolinux/isolinux.cfg
        cp $(DIR_SRC)/config/syslinux/boot.msg      /install/cdrom/boot/isolinux/boot.msg
        cp $(DIR_SRC)/config/syslinux/splash.lss    /install/cdrom/boot/isolinux/splash.lss
@@ -101,10 +101,11 @@ endif
                                                xargs md5sum > md5sum.txt
 
 ifeq "$(MACHINE_TYPE)" "arm"
+       mkdir -p /install/images
        cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \
-               . > /install/images/$(SNAME)-$(VERSION).$(MACHINE)-$(ED)-core$(CORE).iso
+               . > /install/images/$(SNAME)-$(VERSION).$(MACHINE)-full-core$(CORE).iso
 else
        cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \
            -b boot/isolinux/isolinux.bin -no-emul-boot -boot-load-size 4 -boot-info-table \
-           -c boot/isolinux/boot.catalog . > /install/images/$(SNAME)-$(VERSION).$(MACHINE)-$(ED)-core$(CORE).iso
+           -c boot/isolinux/boot.catalog . > /install/images/$(SNAME)-$(VERSION).$(MACHINE)-full-core$(CORE).iso
 endif