This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, efi has been updated via 3deac294f5760a00e42eec0265ded0b10e9291ee (commit) via 479d82d1b8e20b63ed645ce8fdaae9d418c180b6 (commit) from 37dc79434ad752c7115c01aa26264c933e9de647 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 3deac294f5760a00e42eec0265ded0b10e9291ee Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jul 16 22:35:21 2018 +0100
cdrom: mkisofs seems to not like the order of the arguments
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
commit 479d82d1b8e20b63ed645ce8fdaae9d418c180b6 Author: Michael Tremer michael.tremer@ipfire.org Date: Mon Jul 16 22:31:11 2018 +0100
Rootfile update
We don't have EFI on i586
Signed-off-by: Michael Tremer michael.tremer@ipfire.org
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/i586/grub | 437 +------------------------------------- lfs/cdrom | 16 +- 2 files changed, 13 insertions(+), 440 deletions(-)
Difference in files: diff --git a/config/rootfiles/common/i586/grub b/config/rootfiles/common/i586/grub index 16e76aa0f..bc28d4593 100644 --- a/config/rootfiles/common/i586/grub +++ b/config/rootfiles/common/i586/grub @@ -1,13 +1,6 @@ -#boot/efi -#boot/efi/EFI -#boot/efi/EFI/ipfire -#boot/efi/EFI/ipfire/grub-efi -boot/efi/EFI/ipfire/grub-efi/grub.cfg -boot/efi/EFI/ipfire/grub-efi/grub.efi #boot/grub boot/grub/grub.cfg boot/grub/splash.png -boot/grub/unifont.pf2 #etc/bash_completion.d #etc/bash_completion.d/grub etc/default/grub @@ -37,429 +30,6 @@ usr/bin/grub-render-label usr/bin/grub-script-check usr/bin/grub-syslinux2cfg #usr/lib/grub -usr/lib/grub -usr/lib/grub/i386-efi -usr/lib/grub/i386-efi/acpi.mod -usr/lib/grub/i386-efi/acpi.module -usr/lib/grub/i386-efi/adler32.mod -usr/lib/grub/i386-efi/adler32.module -usr/lib/grub/i386-efi/affs.mod -usr/lib/grub/i386-efi/affs.module -usr/lib/grub/i386-efi/afs.mod -usr/lib/grub/i386-efi/afs.module -usr/lib/grub/i386-efi/ahci.mod -usr/lib/grub/i386-efi/ahci.module -usr/lib/grub/i386-efi/all_video.mod -usr/lib/grub/i386-efi/all_video.module -usr/lib/grub/i386-efi/aout.mod -usr/lib/grub/i386-efi/aout.module -usr/lib/grub/i386-efi/appleldr.mod -usr/lib/grub/i386-efi/appleldr.module -usr/lib/grub/i386-efi/at_keyboard.mod -usr/lib/grub/i386-efi/at_keyboard.module -usr/lib/grub/i386-efi/ata.mod -usr/lib/grub/i386-efi/ata.module -usr/lib/grub/i386-efi/backtrace.mod -usr/lib/grub/i386-efi/backtrace.module -usr/lib/grub/i386-efi/bfs.mod -usr/lib/grub/i386-efi/bfs.module -usr/lib/grub/i386-efi/bitmap.mod -usr/lib/grub/i386-efi/bitmap.module -usr/lib/grub/i386-efi/bitmap_scale.mod -usr/lib/grub/i386-efi/bitmap_scale.module -usr/lib/grub/i386-efi/blocklist.mod -usr/lib/grub/i386-efi/blocklist.module -usr/lib/grub/i386-efi/boot.mod -usr/lib/grub/i386-efi/boot.module -usr/lib/grub/i386-efi/bsd.mod -usr/lib/grub/i386-efi/bsd.module -usr/lib/grub/i386-efi/btrfs.mod -usr/lib/grub/i386-efi/btrfs.module -usr/lib/grub/i386-efi/bufio.mod -usr/lib/grub/i386-efi/bufio.module -usr/lib/grub/i386-efi/cat.mod -usr/lib/grub/i386-efi/cat.module -usr/lib/grub/i386-efi/chain.mod -usr/lib/grub/i386-efi/chain.module -usr/lib/grub/i386-efi/cmp.mod -usr/lib/grub/i386-efi/cmp.module -usr/lib/grub/i386-efi/command.lst -usr/lib/grub/i386-efi/config.h -usr/lib/grub/i386-efi/configfile.mod -usr/lib/grub/i386-efi/configfile.module -usr/lib/grub/i386-efi/cpio.mod -usr/lib/grub/i386-efi/cpio.module -usr/lib/grub/i386-efi/cpio_be.mod -usr/lib/grub/i386-efi/cpio_be.module -usr/lib/grub/i386-efi/cpuid.mod -usr/lib/grub/i386-efi/cpuid.module -usr/lib/grub/i386-efi/crc64.mod -usr/lib/grub/i386-efi/crc64.module -usr/lib/grub/i386-efi/crypto.lst -usr/lib/grub/i386-efi/crypto.mod -usr/lib/grub/i386-efi/crypto.module -usr/lib/grub/i386-efi/cryptodisk.mod -usr/lib/grub/i386-efi/cryptodisk.module -usr/lib/grub/i386-efi/cs5536.mod -usr/lib/grub/i386-efi/cs5536.module -usr/lib/grub/i386-efi/date.mod -usr/lib/grub/i386-efi/date.module -usr/lib/grub/i386-efi/datehook.mod -usr/lib/grub/i386-efi/datehook.module -usr/lib/grub/i386-efi/datetime.mod -usr/lib/grub/i386-efi/datetime.module -usr/lib/grub/i386-efi/diskfilter.mod -usr/lib/grub/i386-efi/diskfilter.module -usr/lib/grub/i386-efi/dm_nv.mod -usr/lib/grub/i386-efi/dm_nv.module -usr/lib/grub/i386-efi/echo.mod -usr/lib/grub/i386-efi/echo.module -usr/lib/grub/i386-efi/efi_gop.mod -usr/lib/grub/i386-efi/efi_gop.module -usr/lib/grub/i386-efi/efi_uga.mod -usr/lib/grub/i386-efi/efi_uga.module -usr/lib/grub/i386-efi/efinet.mod -usr/lib/grub/i386-efi/efinet.module -usr/lib/grub/i386-efi/ehci.mod -usr/lib/grub/i386-efi/ehci.module -usr/lib/grub/i386-efi/elf.mod -usr/lib/grub/i386-efi/elf.module -usr/lib/grub/i386-efi/exfat.mod -usr/lib/grub/i386-efi/exfat.module -usr/lib/grub/i386-efi/exfctest.mod -usr/lib/grub/i386-efi/exfctest.module -usr/lib/grub/i386-efi/ext2.mod -usr/lib/grub/i386-efi/ext2.module -usr/lib/grub/i386-efi/extcmd.mod -usr/lib/grub/i386-efi/extcmd.module -usr/lib/grub/i386-efi/fat.mod -usr/lib/grub/i386-efi/fat.module -usr/lib/grub/i386-efi/fixvideo.mod -usr/lib/grub/i386-efi/fixvideo.module -usr/lib/grub/i386-efi/font.mod -usr/lib/grub/i386-efi/font.module -usr/lib/grub/i386-efi/fs.lst -usr/lib/grub/i386-efi/fshelp.mod -usr/lib/grub/i386-efi/fshelp.module -usr/lib/grub/i386-efi/functional_test.mod -usr/lib/grub/i386-efi/functional_test.module -usr/lib/grub/i386-efi/gcry_arcfour.mod -usr/lib/grub/i386-efi/gcry_arcfour.module -usr/lib/grub/i386-efi/gcry_blowfish.mod -usr/lib/grub/i386-efi/gcry_blowfish.module -usr/lib/grub/i386-efi/gcry_camellia.mod -usr/lib/grub/i386-efi/gcry_camellia.module -usr/lib/grub/i386-efi/gcry_cast5.mod -usr/lib/grub/i386-efi/gcry_cast5.module -usr/lib/grub/i386-efi/gcry_crc.mod -usr/lib/grub/i386-efi/gcry_crc.module -usr/lib/grub/i386-efi/gcry_des.mod -usr/lib/grub/i386-efi/gcry_des.module -usr/lib/grub/i386-efi/gcry_md4.mod -usr/lib/grub/i386-efi/gcry_md4.module -usr/lib/grub/i386-efi/gcry_md5.mod -usr/lib/grub/i386-efi/gcry_md5.module -usr/lib/grub/i386-efi/gcry_rfc2268.mod -usr/lib/grub/i386-efi/gcry_rfc2268.module -usr/lib/grub/i386-efi/gcry_rijndael.mod -usr/lib/grub/i386-efi/gcry_rijndael.module -usr/lib/grub/i386-efi/gcry_rmd160.mod -usr/lib/grub/i386-efi/gcry_rmd160.module -usr/lib/grub/i386-efi/gcry_seed.mod -usr/lib/grub/i386-efi/gcry_seed.module -usr/lib/grub/i386-efi/gcry_serpent.mod -usr/lib/grub/i386-efi/gcry_serpent.module -usr/lib/grub/i386-efi/gcry_sha1.mod -usr/lib/grub/i386-efi/gcry_sha1.module -usr/lib/grub/i386-efi/gcry_sha256.mod -usr/lib/grub/i386-efi/gcry_sha256.module -usr/lib/grub/i386-efi/gcry_sha512.mod -usr/lib/grub/i386-efi/gcry_sha512.module -usr/lib/grub/i386-efi/gcry_tiger.mod -usr/lib/grub/i386-efi/gcry_tiger.module -usr/lib/grub/i386-efi/gcry_twofish.mod -usr/lib/grub/i386-efi/gcry_twofish.module -usr/lib/grub/i386-efi/gcry_whirlpool.mod -usr/lib/grub/i386-efi/gcry_whirlpool.module -usr/lib/grub/i386-efi/gdb.mod -usr/lib/grub/i386-efi/gdb.module -usr/lib/grub/i386-efi/gdb_grub -usr/lib/grub/i386-efi/geli.mod -usr/lib/grub/i386-efi/geli.module -usr/lib/grub/i386-efi/gettext.mod -usr/lib/grub/i386-efi/gettext.module -usr/lib/grub/i386-efi/gfxmenu.mod -usr/lib/grub/i386-efi/gfxmenu.module -usr/lib/grub/i386-efi/gfxterm.mod -usr/lib/grub/i386-efi/gfxterm.module -usr/lib/grub/i386-efi/gmodule.pl -usr/lib/grub/i386-efi/gptsync.mod -usr/lib/grub/i386-efi/gptsync.module -usr/lib/grub/i386-efi/gzio.mod -usr/lib/grub/i386-efi/gzio.module -usr/lib/grub/i386-efi/halt.mod -usr/lib/grub/i386-efi/halt.module -usr/lib/grub/i386-efi/hashsum.mod -usr/lib/grub/i386-efi/hashsum.module -usr/lib/grub/i386-efi/hdparm.mod -usr/lib/grub/i386-efi/hdparm.module -usr/lib/grub/i386-efi/hello.mod -usr/lib/grub/i386-efi/hello.module -usr/lib/grub/i386-efi/help.mod -usr/lib/grub/i386-efi/help.module -usr/lib/grub/i386-efi/hexdump.mod -usr/lib/grub/i386-efi/hexdump.module -usr/lib/grub/i386-efi/hfs.mod -usr/lib/grub/i386-efi/hfs.module -usr/lib/grub/i386-efi/hfsplus.mod -usr/lib/grub/i386-efi/hfsplus.module -usr/lib/grub/i386-efi/http.mod -usr/lib/grub/i386-efi/http.module -usr/lib/grub/i386-efi/iorw.mod -usr/lib/grub/i386-efi/iorw.module -usr/lib/grub/i386-efi/iso9660.mod -usr/lib/grub/i386-efi/iso9660.module -usr/lib/grub/i386-efi/jfs.mod -usr/lib/grub/i386-efi/jfs.module -usr/lib/grub/i386-efi/jpeg.mod -usr/lib/grub/i386-efi/jpeg.module -usr/lib/grub/i386-efi/kernel.exec -usr/lib/grub/i386-efi/kernel.img -usr/lib/grub/i386-efi/keylayouts.mod -usr/lib/grub/i386-efi/keylayouts.module -usr/lib/grub/i386-efi/keystatus.mod -usr/lib/grub/i386-efi/keystatus.module -usr/lib/grub/i386-efi/ldm.mod -usr/lib/grub/i386-efi/ldm.module -usr/lib/grub/i386-efi/linux.mod -usr/lib/grub/i386-efi/linux.module -usr/lib/grub/i386-efi/loadbios.mod -usr/lib/grub/i386-efi/loadbios.module -usr/lib/grub/i386-efi/loadenv.mod -usr/lib/grub/i386-efi/loadenv.module -usr/lib/grub/i386-efi/loopback.mod -usr/lib/grub/i386-efi/loopback.module -usr/lib/grub/i386-efi/ls.mod -usr/lib/grub/i386-efi/ls.module -usr/lib/grub/i386-efi/lsacpi.mod -usr/lib/grub/i386-efi/lsacpi.module -usr/lib/grub/i386-efi/lsefimmap.mod -usr/lib/grub/i386-efi/lsefimmap.module -usr/lib/grub/i386-efi/lsefisystab.mod -usr/lib/grub/i386-efi/lsefisystab.module -usr/lib/grub/i386-efi/lsmmap.mod -usr/lib/grub/i386-efi/lsmmap.module -usr/lib/grub/i386-efi/lspci.mod -usr/lib/grub/i386-efi/lspci.module -usr/lib/grub/i386-efi/lssal.mod -usr/lib/grub/i386-efi/lssal.module -usr/lib/grub/i386-efi/luks.mod -usr/lib/grub/i386-efi/luks.module -usr/lib/grub/i386-efi/lvm.mod -usr/lib/grub/i386-efi/lvm.module -usr/lib/grub/i386-efi/lzopio.mod -usr/lib/grub/i386-efi/lzopio.module -usr/lib/grub/i386-efi/mdraid09.mod -usr/lib/grub/i386-efi/mdraid09.module -usr/lib/grub/i386-efi/mdraid09_be.mod -usr/lib/grub/i386-efi/mdraid09_be.module -usr/lib/grub/i386-efi/mdraid1x.mod -usr/lib/grub/i386-efi/mdraid1x.module -usr/lib/grub/i386-efi/memdisk.mod -usr/lib/grub/i386-efi/memdisk.module -usr/lib/grub/i386-efi/memrw.mod -usr/lib/grub/i386-efi/memrw.module -usr/lib/grub/i386-efi/minicmd.mod -usr/lib/grub/i386-efi/minicmd.module -usr/lib/grub/i386-efi/minix.mod -usr/lib/grub/i386-efi/minix.module -usr/lib/grub/i386-efi/minix2.mod -usr/lib/grub/i386-efi/minix2.module -usr/lib/grub/i386-efi/minix2_be.mod -usr/lib/grub/i386-efi/minix2_be.module -usr/lib/grub/i386-efi/minix3.mod -usr/lib/grub/i386-efi/minix3.module -usr/lib/grub/i386-efi/minix3_be.mod -usr/lib/grub/i386-efi/minix3_be.module -usr/lib/grub/i386-efi/minix_be.mod -usr/lib/grub/i386-efi/minix_be.module -usr/lib/grub/i386-efi/mmap.mod -usr/lib/grub/i386-efi/mmap.module -usr/lib/grub/i386-efi/moddep.lst -usr/lib/grub/i386-efi/modinfo.sh -usr/lib/grub/i386-efi/msdospart.mod -usr/lib/grub/i386-efi/msdospart.module -usr/lib/grub/i386-efi/multiboot.mod -usr/lib/grub/i386-efi/multiboot.module -usr/lib/grub/i386-efi/multiboot2.mod -usr/lib/grub/i386-efi/multiboot2.module -usr/lib/grub/i386-efi/net.mod -usr/lib/grub/i386-efi/net.module -usr/lib/grub/i386-efi/newc.mod -usr/lib/grub/i386-efi/newc.module -usr/lib/grub/i386-efi/nilfs2.mod -usr/lib/grub/i386-efi/nilfs2.module -usr/lib/grub/i386-efi/normal.mod -usr/lib/grub/i386-efi/normal.module -usr/lib/grub/i386-efi/ntfs.mod -usr/lib/grub/i386-efi/ntfs.module -usr/lib/grub/i386-efi/ntfscomp.mod -usr/lib/grub/i386-efi/ntfscomp.module -usr/lib/grub/i386-efi/odc.mod -usr/lib/grub/i386-efi/odc.module -usr/lib/grub/i386-efi/ohci.mod -usr/lib/grub/i386-efi/ohci.module -usr/lib/grub/i386-efi/part_acorn.mod -usr/lib/grub/i386-efi/part_acorn.module -usr/lib/grub/i386-efi/part_amiga.mod -usr/lib/grub/i386-efi/part_amiga.module -usr/lib/grub/i386-efi/part_apple.mod -usr/lib/grub/i386-efi/part_apple.module -usr/lib/grub/i386-efi/part_bsd.mod -usr/lib/grub/i386-efi/part_bsd.module -usr/lib/grub/i386-efi/part_dvh.mod -usr/lib/grub/i386-efi/part_dvh.module -usr/lib/grub/i386-efi/part_gpt.mod -usr/lib/grub/i386-efi/part_gpt.module -usr/lib/grub/i386-efi/part_msdos.mod -usr/lib/grub/i386-efi/part_msdos.module -usr/lib/grub/i386-efi/part_plan.mod -usr/lib/grub/i386-efi/part_plan.module -usr/lib/grub/i386-efi/part_sun.mod -usr/lib/grub/i386-efi/part_sun.module -usr/lib/grub/i386-efi/part_sunpc.mod -usr/lib/grub/i386-efi/part_sunpc.module -usr/lib/grub/i386-efi/partmap.lst -usr/lib/grub/i386-efi/parttool.lst -usr/lib/grub/i386-efi/parttool.mod -usr/lib/grub/i386-efi/parttool.module -usr/lib/grub/i386-efi/password.mod -usr/lib/grub/i386-efi/password.module -usr/lib/grub/i386-efi/password_pbkdf2.mod -usr/lib/grub/i386-efi/password_pbkdf2.module -usr/lib/grub/i386-efi/pata.mod -usr/lib/grub/i386-efi/pata.module -usr/lib/grub/i386-efi/pbkdf2.mod -usr/lib/grub/i386-efi/pbkdf2.module -usr/lib/grub/i386-efi/play.mod -usr/lib/grub/i386-efi/play.module -usr/lib/grub/i386-efi/png.mod -usr/lib/grub/i386-efi/png.module -usr/lib/grub/i386-efi/priority_queue.mod -usr/lib/grub/i386-efi/priority_queue.module -usr/lib/grub/i386-efi/probe.mod -usr/lib/grub/i386-efi/probe.module -usr/lib/grub/i386-efi/raid5rec.mod -usr/lib/grub/i386-efi/raid5rec.module -usr/lib/grub/i386-efi/raid6rec.mod -usr/lib/grub/i386-efi/raid6rec.module -usr/lib/grub/i386-efi/read.mod -usr/lib/grub/i386-efi/read.module -usr/lib/grub/i386-efi/reboot.mod -usr/lib/grub/i386-efi/reboot.module -usr/lib/grub/i386-efi/regexp.mod -usr/lib/grub/i386-efi/regexp.module -usr/lib/grub/i386-efi/reiserfs.mod -usr/lib/grub/i386-efi/reiserfs.module -usr/lib/grub/i386-efi/relocator.mod -usr/lib/grub/i386-efi/relocator.module -usr/lib/grub/i386-efi/romfs.mod -usr/lib/grub/i386-efi/romfs.module -usr/lib/grub/i386-efi/scsi.mod -usr/lib/grub/i386-efi/scsi.module -usr/lib/grub/i386-efi/search.mod -usr/lib/grub/i386-efi/search.module -usr/lib/grub/i386-efi/search_fs_file.mod -usr/lib/grub/i386-efi/search_fs_file.module -usr/lib/grub/i386-efi/search_fs_uuid.mod -usr/lib/grub/i386-efi/search_fs_uuid.module -usr/lib/grub/i386-efi/search_label.mod -usr/lib/grub/i386-efi/search_label.module -usr/lib/grub/i386-efi/serial.mod -usr/lib/grub/i386-efi/serial.module -usr/lib/grub/i386-efi/setjmp.mod -usr/lib/grub/i386-efi/setjmp.module -usr/lib/grub/i386-efi/setpci.mod -usr/lib/grub/i386-efi/setpci.module -usr/lib/grub/i386-efi/sfs.mod -usr/lib/grub/i386-efi/sfs.module -usr/lib/grub/i386-efi/sleep.mod -usr/lib/grub/i386-efi/sleep.module -usr/lib/grub/i386-efi/squash4.mod -usr/lib/grub/i386-efi/squash4.module -usr/lib/grub/i386-efi/tar.mod -usr/lib/grub/i386-efi/tar.module -usr/lib/grub/i386-efi/terminal.lst -usr/lib/grub/i386-efi/terminal.mod -usr/lib/grub/i386-efi/terminal.module -usr/lib/grub/i386-efi/terminfo.mod -usr/lib/grub/i386-efi/terminfo.module -usr/lib/grub/i386-efi/test.mod -usr/lib/grub/i386-efi/test.module -usr/lib/grub/i386-efi/test_blockarg.mod -usr/lib/grub/i386-efi/test_blockarg.module -usr/lib/grub/i386-efi/testload.mod -usr/lib/grub/i386-efi/testload.module -usr/lib/grub/i386-efi/tftp.mod -usr/lib/grub/i386-efi/tftp.module -usr/lib/grub/i386-efi/tga.mod -usr/lib/grub/i386-efi/tga.module -usr/lib/grub/i386-efi/time.mod -usr/lib/grub/i386-efi/time.module -usr/lib/grub/i386-efi/trig.mod -usr/lib/grub/i386-efi/trig.module -usr/lib/grub/i386-efi/true.mod -usr/lib/grub/i386-efi/true.module -usr/lib/grub/i386-efi/udf.mod -usr/lib/grub/i386-efi/udf.module -usr/lib/grub/i386-efi/ufs1.mod -usr/lib/grub/i386-efi/ufs1.module -usr/lib/grub/i386-efi/ufs2.mod -usr/lib/grub/i386-efi/ufs2.module -usr/lib/grub/i386-efi/uhci.mod -usr/lib/grub/i386-efi/uhci.module -usr/lib/grub/i386-efi/usb.mod -usr/lib/grub/i386-efi/usb.module -usr/lib/grub/i386-efi/usb_keyboard.mod -usr/lib/grub/i386-efi/usb_keyboard.module -usr/lib/grub/i386-efi/usbms.mod -usr/lib/grub/i386-efi/usbms.module -usr/lib/grub/i386-efi/usbserial_common.mod -usr/lib/grub/i386-efi/usbserial_common.module -usr/lib/grub/i386-efi/usbserial_ftdi.mod -usr/lib/grub/i386-efi/usbserial_ftdi.module -usr/lib/grub/i386-efi/usbserial_pl2303.mod -usr/lib/grub/i386-efi/usbserial_pl2303.module -usr/lib/grub/i386-efi/usbtest.mod -usr/lib/grub/i386-efi/usbtest.module -usr/lib/grub/i386-efi/video.lst -usr/lib/grub/i386-efi/video.mod -usr/lib/grub/i386-efi/video.module -usr/lib/grub/i386-efi/video_bochs.mod -usr/lib/grub/i386-efi/video_bochs.module -usr/lib/grub/i386-efi/video_cirrus.mod -usr/lib/grub/i386-efi/video_cirrus.module -usr/lib/grub/i386-efi/video_fb.mod -usr/lib/grub/i386-efi/video_fb.module -usr/lib/grub/i386-efi/videoinfo.mod -usr/lib/grub/i386-efi/videoinfo.module -usr/lib/grub/i386-efi/videotest.mod -usr/lib/grub/i386-efi/videotest.module -usr/lib/grub/i386-efi/xfs.mod -usr/lib/grub/i386-efi/xfs.module -usr/lib/grub/i386-efi/xnu.mod -usr/lib/grub/i386-efi/xnu.module -usr/lib/grub/i386-efi/xnu_uuid.mod -usr/lib/grub/i386-efi/xnu_uuid.module -usr/lib/grub/i386-efi/xzio.mod -usr/lib/grub/i386-efi/xzio.module -usr/lib/grub/i386-efi/zfs.mod -usr/lib/grub/i386-efi/zfs.module -usr/lib/grub/i386-efi/zfscrypt.mod -usr/lib/grub/i386-efi/zfscrypt.module -usr/lib/grub/i386-efi/zfsinfo.mod -usr/lib/grub/i386-efi/zfsinfo.module ->>>>>>> Enhance the flash image to support EFI usr/lib/grub/i386-pc #usr/lib/grub/i386-pc/acpi.mod #usr/lib/grub/i386-pc/acpi.module @@ -578,8 +148,6 @@ usr/lib/grub/i386-pc #usr/lib/grub/i386-pc/echo.module #usr/lib/grub/i386-pc/efiemu.mod #usr/lib/grub/i386-pc/efiemu.module -#usr/lib/grub/i386-pc/efiemu32.o -#usr/lib/grub/i386-pc/efiemu64.o #usr/lib/grub/i386-pc/ehci.mod #usr/lib/grub/i386-pc/ehci.module #usr/lib/grub/i386-pc/elf.mod @@ -1027,7 +595,12 @@ usr/sbin/grub-reboot usr/sbin/grub-set-default usr/sbin/grub-sparc64-setup #usr/share/grub +#usr/share/grub/ascii.h +usr/share/grub/ascii.pf2 +usr/share/grub/euro.pf2 usr/share/grub/grub-mkconfig_lib +usr/share/grub/unicode.pf2 +#usr/share/grub/widthspec.h #usr/share/info/grub-dev.info #usr/share/info/grub.info #usr/share/locale/ast/LC_MESSAGES/grub.mo diff --git a/lfs/cdrom b/lfs/cdrom index 7fa3999c2..faaa3dff1 100644 --- a/lfs/cdrom +++ b/lfs/cdrom @@ -56,14 +56,6 @@ ISO_ARGS = -J -r -v \
ISOHYBRID_ARGS =
-ifeq "$(EFI)" "1" - ISO_ARGS += \ - -eltorito-alt-boot \ - -e boot/isolinux/efiboot.img - - ISOHYBRID_ARGS += --uefi -endif - ifeq "$(HAS_ISOLINUX)" "1" ISO_ARGS += \ -no-emul-boot \ @@ -73,6 +65,14 @@ ifeq "$(HAS_ISOLINUX)" "1" -c boot/isolinux/boot.catalog endif
+ifeq "$(EFI)" "1" + ISO_ARGS += \ + -eltorito-alt-boot \ + -e boot/isolinux/efiboot.img + + ISOHYBRID_ARGS += --uefi +endif + ############################################################################### # Top-level Rules ###############################################################################
hooks/post-receive -- IPFire 2.x development tree