X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=lfs%2Fcdrom;h=7a7fff166d752c051e76e22477858314cb9fd2fb;hb=3ed1c621cf45bcd1dc13f7569263bb301eb8ae9d;hp=5a85002bae545d35d6b3bb75e086505bcaaaf796;hpb=9063a04e94587fc38f410ec2234275417de201ad;p=ipfire-2.x.git

diff --git a/lfs/cdrom b/lfs/cdrom
index 5a85002bae..7a7fff166d 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -29,12 +29,15 @@ VER = ipfire
 THISAPP    = cdrom
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
-ifeq "$(MACHINE_TYPE)" "arm"
+ifeq "$(BUILD_PLATFORM)" "arm"
 	TAR_OPTIONS =
 else
-	TAR_OPTIONS = --lzma
+	TAR_OPTIONS = --xz
 endif
 
+# Enable multi-threaded compression for LZMA
+export XZ_OPT = --threads=0
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -64,7 +67,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	echo > /etc/mtab
 
 	# Create filelist for packaging.
-	BUILDTARGET="$(BUILDTARGET)" MACHINE="$(MACHINE)" KVER="$(KVER)" \
+	BUILDTARGET="$(BUILDTARGET)" BUILD_ARCH="$(BUILD_ARCH)" KVER="$(KVER)" \
 		$(DIR_SRC)/src/scripts/archive.files \
 		$(DIR_SRC)/config/rootfiles/common \
 		> /tmp/ROOTFILES
@@ -78,7 +81,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	tar -x -C /tmp -f /$(SNAME).tar
 	rm -f /$(SNAME).tar
 	@mkdir /tmp/sys
-	cd /tmp && tar  cf /install/cdrom/$(SNAME)-$(VERSION).tlz $(TAR_OPTIONS) * && rm -rf *
+	cd /tmp && tar  cf /install/cdrom/distro.img $(TAR_OPTIONS) * && rm -rf *
 
 	# Other files
 	touch /install/cdrom/$(SNAME)-$(VERSION)-core$(CORE).media
@@ -86,16 +89,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	cp $(DIR_SRC)/doc/COPYING				/install/cdrom/
 	cp $(DIR_SRC)/doc/{ChangeLog,packages-list.txt}	/install/cdrom/doc
 
-	# Configuration
-	mkdir -p /install/cdrom/boot
-	cp $(DIR_SRC)/config/syslinux/unattended.conf    /install/cdrom/boot/unattended.conf
-
 	# Make the ISO
 	mkdir -p /install/cdrom/boot/isolinux
 	dd if=/dev/zero  bs=1k count=2            > /install/cdrom/boot/isolinux/boot.catalog
-ifneq "$(MACHINE_TYPE)" "arm"
+ifneq "$(BUILD_PLATFORM)" "arm"
 	cp /boot/vmlinuz-$(KVER)-ipfire             /install/cdrom/boot/isolinux/vmlinuz
-	cp /install/images/initrd                   /install/cdrom/boot/isolinux/instroot
+	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
@@ -109,13 +108,13 @@ endif
 	cd /install/cdrom && find -type f ! -name md5sum.txt | grep -v "./boot" | \
 						xargs md5sum > md5sum.txt
 
-ifeq "$(MACHINE_TYPE)" "arm"
 	mkdir -p /install/images
+ifeq "$(BUILD_PLATFORM)" "arm"
 	cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \
-		. > /install/images/$(SNAME)-$(VERSION).$(MACHINE)-full-core$(CORE).iso
+		. > /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-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)-full-core$(CORE).iso
-	isohybrid /install/images/$(SNAME)-$(VERSION).$(MACHINE)-full-core$(CORE).iso
+    	    -c boot/isolinux/boot.catalog . > /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso
+	isohybrid /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso
 endif