X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;ds=sidebyside;f=lfs%2Fcdrom;h=0773547ae43d37e6351e62ca061a90ba34953a96;hb=eea7deabfe8c7eb8e8e044bbee8c7c6fb2aecc10;hp=33fc9a8a794b6a3604c3ce32e39792600af4d00b;hpb=26ec951359651f96257a4d701ffa3c92f3f598d2;p=people%2Fpmueller%2Fipfire-2.x.git diff --git a/lfs/cdrom b/lfs/cdrom index 33fc9a8a79..0773547ae4 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -1,22 +1,20 @@ ############################################################################### -# This file is part of the IPCop Firewall. # # # -# IPCop is free software; you can redistribute it and/or modify # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007 Michael Tremer & Christian Schmidt # +# # +# This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 2 of the License, or # +# the Free Software Foundation, either version 3 of the License, or # # (at your option) any later version. # # # -# IPCop is distributed in the hope that it will be useful, # +# This program is distributed in the hope that it will be useful, # # but WITHOUT ANY WARRANTY; without even the implied warranty of # # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # # GNU General Public License for more details. # # # # You should have received a copy of the GNU General Public License # -# along with IPCop; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Makefiles are based on LFSMake, which is # -# Copyright (C) 2002 Rod Roard # +# along with this program. If not, see . # # # ############################################################################### @@ -54,7 +52,10 @@ $(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 + find $(DIR_SRC)/config/rootfiles/core/*/files -maxdepth 1 -type f | xargs cat >> /tmp/ROOTFILES + sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES + tar -c -C / --files-from=/tmp/ROOTFILES \ -f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \ --exclude='proc/*' --exclude='tmp/ROOTFILES' @@ -77,13 +78,15 @@ $(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/initrd /install/cdrom/boot/isolinux/instroot; \ - cp /boot/vmlinuz-$(KVER) /install/cdrom/boot/isolinux/vmlinuz; \ + cp /boot/vmlinuz-$(KVER)-ipfire /install/cdrom/boot/isolinux/vmlinuz; \ 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 && find -type f ! -name md5sum.txt | grep -v "./boot" | \ + xargs md5sum > md5sum.txt; \ 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)-core$(CORE).iso