Geaendert:

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

diff --git a/lfs/cdrom b/lfs/cdrom
index 9a20b2ffb453c2d7a94d83574a45b1dc780b3fb9..b346f10b8e6351534e08773b217122e635bf9714 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -18,12 +18,6 @@
 # Makefiles are based on LFSMake, which is                                    #
 # Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com>                        #
 #                                                                             #
-# Modifications by:                                                           #
-# ??-12-2003 Mark Wormgoor < mark@wormgoor.com>                               #
-#          - Modified Makefile for IPCop build                                #
-#                                                                             #
-# $Id: cdrom,v 1.1.2.30 2006/01/30 22:54:33 gespinasse Exp $
-#                                                                             #
 ###############################################################################
 
 ###############################################################################
@@ -34,7 +28,7 @@ include Config
 
 THISAPP    = cdrom
 DL_FILE    = rawrite.exe
-DL_FROM    = http://www.tux.org/pub/dos/rawrite
+DL_FROM    = $(URL_IPFIRE)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
@@ -93,9 +87,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        # Compress root filesystem
        # Reason for this tar+untar+tar is removing of entries listed two or more in src/ROOTFILES
        mkdir -p /install/cdrom/{doc,dosutils,images}
-       tar -c -C / --files-from=$(DIR_SRC)/src/ROOTFILES.$(MACHINE) \
+       sed -e "s/KVER/$(KVER)/g" $(DIR_SRC)/src/ROOTFILES.$(MACHINE) > /tmp/ROOTFILES
+       tar -c -C / --files-from=/tmp/ROOTFILES \
            -f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \
            --exclude='proc/*'
+       rm -f /tmp/ROOTFILES
        tar -x -C /tmp -f /$(SNAME).tar
        rm -f /$(SNAME).tar
        cd /tmp && tar zcf /install/cdrom/$(SNAME)-$(VERSION).tgz * && rm -rf *
@@ -117,7 +113,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                mkdir -p /install/cdrom/boot/isolinux; \
                dd if=/dev/zero  bs=1k count=2            > /install/cdrom/boot/isolinux/boot.catalog; \
                cp /install/images/cdinitrd.gz              /install/cdrom/boot/isolinux/instroot.gz; \
-               cp /boot/vmlinuz-installer                    /install/cdrom/boot/isolinux/vmlinuz; \
+               cp /boot/vmlinuz-installer                  /install/cdrom/boot/isolinux/vmlinuz; \
                cp $(DIR_SRC)/config/kernel/syslinux.cfg    /install/cdrom/boot/isolinux/isolinux.cfg; \
                cp /usr/lib/syslinux/isolinux.bin           /install/cdrom/boot/isolinux/isolinux.bin; \
                sed -e 's/boot IPFire/boot IPFire $(VERSION)/' $(DIR_SRC)/config/kernel/install-message \
@@ -131,7 +127,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
                dd bs=1024 count=$$((`du -k -s ../cdrom|awk '{print $$1}'` + 64)) if=/dev/zero of=/install/images/$(SNAME)-install-usb-$(VERSION).$(MACHINE).iso; \
                echo "move boot files on top of disk" && \
                rm -rf boot && \
-               mkdosfs -n IPCOPBOOT -F 16 -I /install/images/$(SNAME)-install-usb-$(VERSION).$(MACHINE).iso && \
+               mkdosfs -n IPFIREBOOT -F 16 -I /install/images/$(SNAME)-install-usb-$(VERSION).$(MACHINE).iso && \
                mount -t vfat -o loop /install/images/$(SNAME)-install-usb-$(VERSION).$(MACHINE).iso /install/mnt && \
                cp -R ../cdrom/* /install/mnt && \
                cp /install/images/cdinitrd.gz              /install/mnt/instroot.gz && \