X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=lfs%2Fcdrom;h=56d1fa8fe1f55601ec9600f4caba862543db7c7c;hp=d21f69c7de61e09531916ee286907c1e990bf956;hb=15b1a3e360a277dc7481103f8ddcbf189033e3a6;hpb=5f387a1b8630c73cd0d573961356f579fd5520e4 diff --git a/lfs/cdrom b/lfs/cdrom index d21f69c7de..56d1fa8fe1 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2013 IPFire Team # +# Copyright (C) 2007-2018 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 # @@ -35,30 +35,97 @@ else TAR_OPTIONS = --lzma endif -ISO_ARGS = -J -r -v \ - -A "$(NAME) $(VERSION)" \ - -V "$(NAME)_$(VERSION)" \ - -no-emul-boot \ - -boot-load-size 4 \ - -boot-info-table \ - -b boot/isolinux/isolinux.bin \ - -c boot/isolinux/boot.catalog - -# Only build a stub ISO for ARM -ifeq "$(BUILD_PLATFORM)" "arm" - ISO_ARGS = -J -r -V "$(NAME)_$(VERSION)" +HAS_MEMTEST = 0 +HAS_IPXE = 0 +HAS_ISOLINUX = 0 +HAS_KERNEL = 1 + +ifeq "$(BUILD_PLATFORM)" "x86" + HAS_MEMTEST = 1 + HAS_IPXE = 1 + HAS_ISOLINUX = 1 endif +ifeq "$(BUILD_ARCH)" "armv5tel" + HAS_KERNEL = 0 +endif + +ISO_ARGS = -J -r -v \ + -A "$(NAME) $(VERSION) $(BUILD_ARCH)" \ + -V "$(NAME) $(VERSION) $(BUILD_ARCH)" + ISOHYBRID_ARGS = +ifeq "$(HAS_ISOLINUX)" "1" + ISO_ARGS += \ + -no-emul-boot \ + -boot-load-size 4 \ + -boot-info-table \ + -b boot/isolinux/isolinux.bin \ + -c boot/isolinux/boot.catalog +endif + ifeq "$(EFI)" "1" ISO_ARGS += \ -eltorito-alt-boot \ - -e boot/isolinux/efiboot.img + -e boot/isolinux/efiboot.img \ + -no-emul-boot ISOHYBRID_ARGS += --uefi endif +GRUB_EFI_MODULES = \ + all_video \ + at_keyboard \ + boot \ + bitmap_scale \ + cat \ + chain \ + configfile \ + disk \ + echo \ + efi_gop \ + efi_uga \ + ext2 \ + extcmd \ + fat \ + file \ + font \ + fxterm_menu \ + gfxterm \ + gfxmenu \ + gfxterm_background \ + gzio \ + halt \ + help \ + iso9660 \ + jpeg \ + loadbios \ + loadenv \ + loopback \ + linux \ + ls \ + memdisk \ + minicmd \ + nativedisk \ + normal \ + ntfs \ + part_gpt \ + part_msdos \ + png \ + probe \ + reboot \ + regexp \ + search \ + search_fs_file \ + search_fs_uuid \ + search_label \ + tar \ + test \ + tga \ + true \ + usb_keyboard + ############################################################################### # Top-level Rules ############################################################################### @@ -109,30 +176,56 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cp $(DIR_SRC)/doc/COPYING /install/cdrom/ cp $(DIR_SRC)/doc/{ChangeLog,packages-list.txt} /install/cdrom/doc - # Make the ISO mkdir -p /install/cdrom/boot/isolinux - dd if=/dev/zero bs=1k count=2 > /install/cdrom/boot/isolinux/boot.catalog -ifneq "$(BUILD_PLATFORM)" "arm" + +ifeq "$(HAS_KERNEL)" "1" cp /boot/vmlinuz-$(KVER)-ipfire /install/cdrom/boot/isolinux/vmlinuz - dracut --force -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire + dracut --force --early-microcode -a "installer" --strip --xz /install/cdrom/boot/isolinux/instroot $(KVER)-ipfire +endif + +ifeq "$(HAS_ISOLINUX)" "1" + dd if=/dev/zero bs=1k count=2 > /install/cdrom/boot/isolinux/boot.catalog cp $(DIR_SRC)/config/syslinux/boot.png /install/cdrom/boot/isolinux/boot.png + 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 + +ifeq "$(HAS_MEMTEST)" "1" + # Install memtest cp /usr/lib/memtest86+/memtest.bin /install/cdrom/boot/isolinux/memtest +endif + +ifeq "$(HAS_IPXE)" "1" cp /usr/share/ipfire-netboot/ipxe.lkrn /install/cdrom/boot/isolinux/netboot - cp /usr/share/syslinux/isolinux.bin /install/cdrom/boot/isolinux/isolinux.bin +endif ifeq "$(EFI)" "1" - # Create the EFI Eltorito image - dd if=/dev/zero of=/install/cdrom/boot/isolinux/efiboot.img bs=1k count=1440 - mkdosfs -F 12 -n "IPFIRE_EFI" /install/cdrom/boot/isolinux/efiboot.img + # Generate embedded GRUB configuration + sed -e "s/NAME/$(NAME)/g" -e "s/VERSION/$(VERSION)/g" -e "s/ARCH/$(BUILD_ARCH)/g" \ + $(DIR_SRC)/config/cdrom/grub-efi.cfg > /tmp/grub-efi.cfg # Build a GRUB EFI image + mkdir -pv /install/cdrom/EFI/BOOT grub-mkimage \ - --format=$(BUILD_ARCH)-efi \ - --output=/tmp/boot$(EFI_ARCH).efi \ - --config=$(DIR_SRC)/config/cdrom/grub-efi.cfg \ + --format=$(GRUB_ARCH)-efi \ + --output=/install/cdrom/EFI/BOOT/boot$(EFI_ARCH).efi \ + --config=/tmp/grub-efi.cfg \ --compression=xz \ --prefix=/EFI/BOOT \ - $(GRUB_EFI_MODULES) + $$(for mod in $(GRUB_EFI_MODULES); do [ -f "/usr/lib/grub/$(GRUB_ARCH)-efi/$${mod}.mod" ] && echo "$${mod}"; done) + + # Install GRUB configuration + mkdir -pv /install/cdrom/EFI/BOOT + sed -e "s/NAME/$(NAME)/g" -e "s/VERSION/$(VERSION)/g" -e "s/ARCH/$(BUILD_ARCH)/g" \ + < $(DIR_SRC)/config/cdrom/grub.cfg > /install/cdrom/EFI/BOOT/grub.cfg + + # Create the EFI Eltorito image + dd if=/dev/zero of=/install/cdrom/boot/isolinux/efiboot.img bs=1k count=1440 + mkdosfs -F 12 -n "IPFIRE_EFI" /install/cdrom/boot/isolinux/efiboot.img # Mount the EFI image mkdir -pv /install/efiboot.img @@ -140,19 +233,14 @@ ifeq "$(EFI)" "1" # Copy the bootloader into the image mkdir -pv /install/efiboot.img/EFI/BOOT - cp -a /tmp/boot$(EFI_ARCH).efi /install/efiboot.img/EFI/BOOT/boot$(EFI_ARCH).efi + cp -a /install/cdrom/EFI/BOOT/boot$(EFI_ARCH).efi \ + /install/efiboot.img/EFI/BOOT/boot$(EFI_ARCH).efi # Cleanup umount /install/efiboot.img - rm -rf /install/efiboot.img /tmp/boot$(EFI_ARCH).efi + rm -rf /install/efiboot.img /tmp/grub-efi.cfg endif - 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 @@ -160,4 +248,6 @@ endif cd /install/cdrom && mkisofs $(ISO_ARGS) \ -o /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso . +ifeq "$(HAS_ISOLINUX)" "1" isohybrid $(ISOHYBRID_ARGS) /install/images/$(SNAME)-$(VERSION).$(BUILD_ARCH)-full-core$(CORE).iso +endif