X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcdrom;h=5a85002bae545d35d6b3bb75e086505bcaaaf796;hp=28a172edbc816947ec1948146f6174147a445870;hb=42e4fa805ec8c3bbc085d2d9d8746afd97062009;hpb=5609904bde49006904d3f745578e9163397fcebc diff --git a/lfs/cdrom b/lfs/cdrom index 28a172edb..5a85002ba 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-2013 IPFire Team # +# # +# 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 . # # # ############################################################################### @@ -31,6 +29,12 @@ VER = ipfire THISAPP = cdrom TARGET = $(DIR_INFO)/$(THISAPP) +ifeq "$(MACHINE_TYPE)" "arm" + TAR_OPTIONS = +else + TAR_OPTIONS = --lzma +endif + ############################################################################### # Top-level Rules ############################################################################### @@ -48,15 +52,25 @@ md5 : ############################################################################### $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) + # Update /etc/system-release, because the string might have changed + # since stage2 has been executed.. + echo "$(SYSTEM_RELEASE)" > /etc/system-release + rm -rf /install/cdrom /tmp/* + mkdir -p /install/cdrom/doc + + # Clear mtab (prevents .journal problems) + rm -vf /etc/mtab + echo > /etc/mtab + + # Create filelist for packaging. + BUILDTARGET="$(BUILDTARGET)" MACHINE="$(MACHINE)" KVER="$(KVER)" \ + $(DIR_SRC)/src/scripts/archive.files \ + $(DIR_SRC)/config/rootfiles/common \ + > /tmp/ROOTFILES # 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 - find $(DIR_SRC)/config/rootfiles/common -maxdepth 1 -type f | xargs cat >> /tmp/ROOTFILES - find $(DIR_SRC)/config/rootfiles/ver_$(ED) -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' @@ -64,9 +78,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) 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 * + cd /tmp && tar cf /install/cdrom/$(SNAME)-$(VERSION).tlz $(TAR_OPTIONS) * && rm -rf * # Other files + touch /install/cdrom/$(SNAME)-$(VERSION)-core$(CORE).media 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 @@ -76,16 +91,31 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) 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/initrd /install/cdrom/boot/isolinux/instroot; \ - 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; \ + mkdir -p /install/cdrom/boot/isolinux + dd if=/dev/zero bs=1k count=2 > /install/cdrom/boot/isolinux/boot.catalog +ifneq "$(MACHINE_TYPE)" "arm" + cp /boot/vmlinuz-$(KVER)-ipfire /install/cdrom/boot/isolinux/vmlinuz + cp /install/images/initrd /install/cdrom/boot/isolinux/instroot + 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 + cp /usr/share/syslinux/isolinux.bin /install/cdrom/boot/isolinux/isolinux.bin + cp /usr/share/hwdata/pci.ids /install/cdrom/boot/isolinux/pci.ids + cp -vf /usr/share/syslinux/*.c32 /install/cdrom/boot/isolinux/ + sed -e "s/VERSION/$(VERSION) - Core $(CORE)/g" \ + $(DIR_SRC)/config/syslinux/syslinux.cfg \ + > /install/cdrom/boot/isolinux/isolinux.cfg +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 + cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \ + . > /install/images/$(SNAME)-$(VERSION).$(MACHINE)-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)-$(ED).iso + -c boot/isolinux/boot.catalog . > /install/images/$(SNAME)-$(VERSION).$(MACHINE)-full-core$(CORE).iso + isohybrid /install/images/$(SNAME)-$(VERSION).$(MACHINE)-full-core$(CORE).iso +endif