python3-setuptools: Fix rootfile

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

diff --git a/lfs/cdrom b/lfs/cdrom
index 18c63c79b67fb0ad78e6646b74341b461471b907..f4e6e050c8c96783e7bf5029d1ac57244e9b23b1 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -123,6 +123,8 @@ GRUB_EFI_MODULES = \
        true \
        usb_keyboard
 
+ISO_FILE = /install/images/$(SNAME)-$(VERSION)-core$(CORE)-$(BUILD_ARCH).iso
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
@@ -133,7 +135,7 @@ check :
 
 download :
 
-md5 :
+b2 :
 
 ###############################################################################
 # Installation Details
@@ -149,7 +151,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
        # Clear mtab (prevents .journal problems)
        rm -vf /etc/mtab
-       echo > /etc/mtab
+       ln -s /proc/self/mounts /etc/mtab
 
        # Create filelist for packaging.
        BUILDTARGET="$(BUILDTARGET)" BUILD_ARCH="$(BUILD_ARCH)" KVER="$(KVER)" \
@@ -181,7 +183,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 
 ifeq "$(HAS_KERNEL)" "1"
        cp /boot/vmlinuz-$(KVER)-ipfire $(DIR_TMP)/cdrom/boot/isolinux/vmlinuz
-       dracut --force --early-microcode -a "installer" --strip --xz $(DIR_TMP)/cdrom/boot/isolinux/instroot $(KVER)-ipfire
+       dracut --force -a "installer" --strip $(DIR_TMP)/cdrom/boot/isolinux/instroot $(KVER)-ipfire
 endif
 
 ifeq "$(HAS_ISOLINUX)" "1"
@@ -197,7 +199,7 @@ endif
 
 ifeq "$(HAS_MEMTEST)" "1"
        # Install memtest
-       cp /usr/lib/memtest86+/memtest.bin $(DIR_TMP)/cdrom/boot/isolinux/memtest
+       cp /usr/lib/memtest86+/memtest.efi $(DIR_TMP)/cdrom/boot/isolinux/memtest
 endif
 
 ifeq "$(HAS_IPXE)" "1"
@@ -246,9 +248,8 @@ endif
                                                xargs md5sum > md5sum.txt
 
        mkdir -p /install/images
-       cd $(DIR_TMP)/cdrom && mkisofs $(ISO_ARGS) \
-               -o /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso .
+       cd $(DIR_TMP)/cdrom && mkisofs $(ISO_ARGS) -o $(ISO_FILE) .
 
 ifeq "$(HAS_ISOLINUX)" "1"
-       isohybrid $(ISOHYBRID_ARGS) /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso
+       isohybrid $(ISOHYBRID_ARGS) $(ISO_FILE)
 endif