X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcdrom;h=5a85002bae545d35d6b3bb75e086505bcaaaf796;hp=9a20b2ffb453c2d7a94d83574a45b1dc780b3fb9;hb=42e4fa805ec8c3bbc085d2d9d8746afd97062009;hpb=bf021abd3bafb517b2e0eefb92cb57576924d7ec diff --git a/lfs/cdrom b/lfs/cdrom index 9a20b2ffb..5a85002ba 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -1,28 +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 # -# # -# 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 $ +# along with this program. If not, see . # # # ############################################################################### @@ -32,134 +24,98 @@ include Config +VER = ipfire + THISAPP = cdrom -DL_FILE = rawrite.exe -DL_FROM = http://www.tux.org/pub/dos/rawrite TARGET = $(DIR_INFO)/$(THISAPP) +ifeq "$(MACHINE_TYPE)" "arm" + TAR_OPTIONS = +else + TAR_OPTIONS = --lzma +endif + ############################################################################### # Top-level Rules ############################################################################### -objects = $(DL_FILE) \ - rawwritewin-0.7.zip \ - install-en-1.4.0.pdf.zip \ - install-fr-1.4.0.pdf.zip \ - quickstart-en.pdf.zip \ - quickstart-fr-1.4.0.pdf.zip - -$(DL_FILE) = $(DL_FROM)/$(DL_FILE) -rawwritewin-0.7.zip = http://uranus.it.swin.edu.au/~jn/linux/rawwritewin-0.7.zip -install-en-1.4.0.pdf.zip = $(URL_SFNET)/ipcop/install-en-1.4.0.pdf.zip -install-fr-1.4.0.pdf.zip = $(URL_SFNET)/ipcop/install-fr-1.4.0.pdf.zip -quickstart-en.pdf.zip = http://www.ipcop.org/1.4.0/en/quickstart/quickstart-en.pdf.zip -quickstart-fr-1.4.0.pdf.zip = http://www.ipcop.org/1.4.0/fr/quickstart/quickstart-fr-1.4.0.pdf.zip - -$(DL_FILE)_MD5 = 7dac6ea496014d32dbce6c50feb254ca -rawwritewin-0.7.zip_MD5 = 0130b497c8c3bc7d136a4236b0d9fbf6 -install-en-1.4.0.pdf.zip_MD5 = 07e0b5131f1434010d8a00571f9acd81 -install-fr-1.4.0.pdf.zip_MD5 = 2deb9d3bc46779cff18b681625fc4418 -quickstart-en.pdf.zip_MD5 = ca77ef5f1efca6bc519cc42acfd69aa4 -quickstart-fr-1.4.0.pdf.zip_MD5 = 7ec474aea03acba10371eb92579b0dec - install : $(TARGET) -check : $(patsubst %,$(DIR_CHK)/%,$(objects)) - -download :$(patsubst %,$(DIR_DL)/%,$(objects)) - -md5 : $(subst %,%_MD5,$(objects)) +check : -############################################################################### -# Downloading, checking, md5sum -############################################################################### - -$(patsubst %,$(DIR_CHK)/%,$(objects)) : - @$(CHECK) +download : -$(patsubst %,$(DIR_DL)/%,$(objects)) : - @$(LOAD) - -$(subst %,%_MD5,$(objects)) : - @$(MD5) +md5 : ############################################################################### # Installation Details ############################################################################### $(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,dosutils,images} - tar -c -C / --files-from=$(DIR_SRC)/src/ROOTFILES.$(MACHINE) \ - -f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \ - --exclude='proc/*' + tar -c -C / --files-from=/tmp/ROOTFILES \ + -f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \ + --exclude='proc/*' --exclude='tmp/ROOTFILES' + 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 * - # Other files - sed 's/VERSION/$(VERSION)/' $(DIR_SRC)/config/cdrom/README.txt \ - > /install/cdrom/README.txt - cp $(DIR_SRC)/doc/COPYING /install/cdrom/ - cp /install/images/*.img /install/cdrom/images - unzip $(DIR_DL)/install-en-1.4.0.pdf.zip -d /install/cdrom/doc/english - unzip $(DIR_DL)/quickstart-en.pdf.zip -d /install/cdrom/doc/english - unzip $(DIR_DL)/install-fr-1.4.0.pdf.zip -d /install/cdrom/doc/francais - unzip $(DIR_DL)/quickstart-fr-1.4.0.pdf.zip -d /install/cdrom/doc/francais - 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 - - # make the CDROM iso, USB(superfloppy&partionned) iso - if [ "$(MACHINE)" == "i386" ]; then \ - 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 $(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 \ - > /install/message; \ - cp /install/message /install/cdrom/boot/isolinux/message; \ - 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)-install-$(VERSION).$(MACHINE).iso; \ - echo "compute size +64 blocks for bootsector/fat/etc..." && \ - 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 && \ - 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 && \ - cp /boot/vmlinuz-installer /install/mnt/vmlinuz && \ - cp $(DIR_SRC)/config/kernel/syslinux.cfg /install/mnt/syslinux.cfg && \ - cp /install/message /install/mnt/message && \ - umount /install/mnt && echo "and make the isofile a bootable system ready for dd" && \ - syslinux /install/images/$(SNAME)-install-usb-$(VERSION).$(MACHINE).iso && \ - echo "# Build the USB-partitionned scheme ISO (cover majority of BIOS)" && \ - ISOs=/install/images/$(SNAME)-install-usb-$(VERSION).$(MACHINE).iso && \ - ISOp=/install/images/$(SNAME)-install-usbp-$(VERSION).$(MACHINE).iso && \ - dd bs=1k if=/dev/zero of=$$ISOp count=$$((`du -k -s $$ISOs | awk '{print $$1}'` + 10 )) && \ - echo "# Partitionning with 32 sectors geometry." && \ - echo "# If less, some (my) bios do not recognize the key as a bootable disk." && \ - echo -e "0,,6,*\n;\n;\n;" > /tmp/sdisk.txt && \ - sfdisk -qLDH 256 -S 32 $$ISOp < /tmp/sdisk.txt && \ - echo "#Just put a mbr and superfloppy at the right place. seek=32 is due to -D & 32 sectors" && \ - echo "#in sfdisk. If you ever change partitionning, adjust also here." && \ - /usr/local/sbin/install-mbr $$ISOp && \ - dd if=$$ISOs of=$$ISOp bs=512 seek=32; \ - elif [ "$(MACHINE)" == "alpha" ]; then \ - mkdir -p /install/cdrom/etc; \ - cp /boot/vmlinuz-$(KVER) /install/cdrom/vmlinuz; \ - cp /install/images/cdinitrd.gz /install/cdrom/instroot.gz; \ - cp /boot/bootlx /install/cdrom; \ - cp $(DIR_SRC)/config/kernel/aboot.conf /install/cdrom/etc/aboot.conf; \ - cd /install/cdrom && mkisofs -J -r -V "$(NAME)_$(VERSION)" \ - . > /install/images/$(SNAME)-install-$(VERSION).$(MACHINE).iso; \ - isomarkboot /install/images/$(SNAME)-install-$(VERSION).$(MACHINE).iso bootlx; \ - fi + @mkdir /tmp/sys + 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 + + # Configuration + mkdir -p /install/cdrom/boot + 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 +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)-full-core$(CORE).iso + isohybrid /install/images/$(SNAME)-$(VERSION).$(MACHINE)-full-core$(CORE).iso +endif