X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcdrom;h=36dbe01e89b8b34820eeba5df11aa3a5ef929fce;hb=1efe3ea13aedea84f63a2b6b1b448d498f1e7b05;hp=9645aae100cae8a39b039cf3e04134b10e95571c;hpb=cb6cfc0db6b7ddafcdb3f9dff446877158f60985;p=people%2Fteissler%2Fipfire-2.x.git

diff --git a/lfs/cdrom b/lfs/cdrom
index 9645aae10..36dbe01e8 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -78,8 +78,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 	# Other files
 	sed 's/VERSION/$(VERSION)/' $(DIR_SRC)/config/cdrom/README.txt > /install/cdrom/README.txt
-	cp $(DIR_SRC)/doc/COPYING		/install/cdrom/
-	cp $(DIR_SRC)/doc/packages-list.txt	/install/cdrom/doc
+	cp $(DIR_SRC)/doc/COPYING				/install/cdrom/
+	cp $(DIR_SRC)/doc/{ChangeLog,packages-list.txt}	/install/cdrom/doc
 
 	# Configuration
 	mkdir -p /install/cdrom/boot
@@ -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,6 +101,7 @@ 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)-full-core$(CORE).iso
 else