SquashFS hinzugefuegt damit wir auf OpenVZ-Maschinen bauen koennen.

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

diff --git a/lfs/cdrom b/lfs/cdrom
index 439b9a41576aa434922b0fd011aeaad6c4bb1408..33fc9a8a794b6a3604c3ce32e39792600af4d00b 100644 (file)
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -29,43 +29,19 @@ include Config
 VER = ipfire
 
 THISAPP    = cdrom
-DL_FILE    = rawrite.exe
-DL_FROM    = $(URL_IPFIRE)
 TARGET     = $(DIR_INFO)/$(THISAPP)
 
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) \
-       rawwritewin-0.7.zip
-
-$(DL_FILE)                  = $(DL_FROM)/$(DL_FILE)
-rawwritewin-0.7.zip         = http://uranus.it.swin.edu.au/~jn/linux/rawwritewin-0.7.zip
-
-$(DL_FILE)_MD5                  = 7dac6ea496014d32dbce6c50feb254ca
-rawwritewin-0.7.zip_MD5         = 0130b497c8c3bc7d136a4236b0d9fbf6
-
 install : $(TARGET)
 
-check : $(patsubst %,$(DIR_CHK)/%,$(objects))
-
-download :$(patsubst %,$(DIR_DL)/%,$(objects))
-
-md5 : $(subst %,%_MD5,$(objects))
-
-###############################################################################
-# Downloading, checking, md5sum
-###############################################################################
-
-$(patsubst %,$(DIR_CHK)/%,$(objects)) :
-       @$(CHECK)
+check :
 
-$(patsubst %,$(DIR_DL)/%,$(objects)) :
-       @$(LOAD)
+download :
 
-$(subst %,%_MD5,$(objects)) :
-       @$(MD5)
+md5 :
 
 ###############################################################################
 # Installation Details
@@ -76,7 +52,7 @@ $(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}
+       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
        tar -c -C / --files-from=/tmp/ROOTFILES \
@@ -85,26 +61,28 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        rm -f /tmp/ROOTFILES
        tar -x -C /tmp -f /$(SNAME).tar
        rm -f /$(SNAME).tar
+       @mkdir /tmp/sys
        cd /tmp && tar jcf /install/cdrom/$(SNAME)-$(VERSION).tbz2 * && rm -rf *
 
        # 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/{ChangeLog,packages-list.txt} /install/cdrom/doc
-       cp $(DIR_DL)/rawrite.exe                                /install/cdrom/dosutils
-       unzip -j -L $(DIR_DL)/rawwritewin*.zip -x "*.txt" -d /install/cdrom/dosutils
 
        # Configuration
        mkdir -p /install/cdrom/boot
-       cp $(DIR_SRC)/config/kernel/unattended.conf    /install/cdrom/boot/unattended.conf
+       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; \
-       cp /install/images/cdinitrd.gz              /install/cdrom/boot/isolinux/instroot.gz; \
+       cp /install/images/initrd                   /install/cdrom/boot/isolinux/instroot; \
        cp /boot/vmlinuz-$(KVER)                    /install/cdrom/boot/isolinux/vmlinuz; \
-       cp $(DIR_SRC)/config/kernel/syslinux.cfg    /install/cdrom/boot/isolinux/isolinux.cfg; \
-       cp $(DIR_SRC)/config/kernel/install-message /install/cdrom/boot/isolinux/message; \
+       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/options.msg   /install/cdrom/boot/isolinux/options.msg; \
+       cp $(DIR_SRC)/config/syslinux/splash.lss    /install/cdrom/boot/isolinux/splash.lss; \
+       cp /usr/lib/memtest86+/memtest.bin          /install/cdrom/boot/isolinux/memtest; \
        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 \