X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcdrom;h=6f14c9ec23cd9d47571e2ca6f84d6babd12a6148;hp=33fc9a8a794b6a3604c3ce32e39792600af4d00b;hb=97de2cae62f9d8bf61681561211fa8170d0808e2;hpb=d95bfe986b12022920645d5c7f60dd97ab7b3a81

diff --git a/lfs/cdrom b/lfs/cdrom
index 33fc9a8a79..6f14c9ec23 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -54,10 +54,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	# Reason for this tar+untar+tar is removing of entries listed two or more in src/ROOTFILES
 	mkdir -p /install/cdrom/doc
 	find $(DIR_SRC)/config/rootfiles/common -maxdepth 1 -type f | xargs cat >> /tmp/ROOTFILES
-	find $(DIR_SRC)/config/rootfiles/ver_$(IPFVER) -maxdepth 1 -type f | xargs cat >> /tmp/ROOTFILES
+	find $(DIR_SRC)/config/rootfiles/ver_$(ED) -maxdepth 1 -type f | xargs cat >> /tmp/ROOTFILES
 	tar -c -C / --files-from=/tmp/ROOTFILES \
 		-f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \
-		--exclude='proc/*' --exclude='tmp/ROOTFILES'
+		--exclude='proc/*' --exclude='usr/src/ccache/*' --exclude='usr/src/cache/*' \
+		--exclude='tmp/ROOTFILES'
 	rm -f /tmp/ROOTFILES
 	tar -x -C /tmp -f /$(SNAME).tar
 	rm -f /$(SNAME).tar
@@ -86,4 +87,4 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cp /usr/lib/syslinux/isolinux.bin           /install/cdrom/boot/isolinux/isolinux.bin; \
 	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)-$(IPFVER).iso
+    	    -c boot/isolinux/boot.catalog . > /install/images/$(SNAME)-$(VERSION).$(MACHINE)-$(ED).iso