From 0d51e06c6543c6422d1fb2b671cb077076fea345 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Tue, 25 Dec 2012 10:07:34 +0100 Subject: [PATCH] [molecules] switch back to cdrtools (from cdrkit) and support UEFI USB boot, via isohybrid --uefi --- molecules/awesome.common | 2 +- molecules/corecdx.common | 2 +- molecules/e17.common | 2 +- molecules/forensicxfce.common | 2 +- molecules/gaming.common | 2 +- molecules/gnome.common | 2 +- molecules/hardenedserver.common | 2 +- molecules/kde.common | 2 +- molecules/lxde.common | 2 +- molecules/mate.common | 2 +- molecules/sabayon-amd64+x86-gnome.spec | 2 +- molecules/sabayon-amd64+x86-kde.spec | 2 +- molecules/serverbase.common | 2 +- molecules/spinbase.common | 2 +- molecules/xfce.common | 2 +- scripts/generic_post_iso_script.sh | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/molecules/awesome.common b/molecules/awesome.common index 4fe4dc9..5942de2 100644 --- a/molecules/awesome.common +++ b/molecules/awesome.common @@ -33,7 +33,7 @@ iso_title: Sabayon Awesome %env error_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_error_script.sh # Extra mkisofs parameters, perhaps something to include/use your bootloader -extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-boot boot/grub/efi.img +extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-platform 0xef -eltorito-boot boot/grub/efi.img # Pre-ISO building script. Hook to be able to copy kernel images in place, for example %env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh Awesome diff --git a/molecules/corecdx.common b/molecules/corecdx.common index c59e3b2..f8da1fd 100644 --- a/molecules/corecdx.common +++ b/molecules/corecdx.common @@ -33,7 +33,7 @@ extra_mksquashfs_parameters: -comp xz -Xbcj x86 %env error_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_error_script.sh # Extra mkisofs parameters, perhaps something to include/use your bootloader -extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-boot boot/grub/efi.img +extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-platform 0xef -eltorito-boot boot/grub/efi.img # Pre-ISO building script. Hook to be able to copy kernel images in place, for example %env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh CoreCDX diff --git a/molecules/e17.common b/molecules/e17.common index 0cf515b..7333975 100644 --- a/molecules/e17.common +++ b/molecules/e17.common @@ -33,7 +33,7 @@ extra_mksquashfs_parameters: -comp xz -Xbcj x86 %env error_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_error_script.sh # Extra mkisofs parameters, perhaps something to include/use your bootloader -extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-boot boot/grub/efi.img +extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-platform 0xef -eltorito-boot boot/grub/efi.img # Pre-ISO building script. Hook to be able to copy kernel images in place, for example %env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh E17 diff --git a/molecules/forensicxfce.common b/molecules/forensicxfce.common index fa7d008..d187534 100644 --- a/molecules/forensicxfce.common +++ b/molecules/forensicxfce.common @@ -33,7 +33,7 @@ extra_mksquashfs_parameters: -comp xz -Xbcj x86 %env error_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_error_script.sh # Extra mkisofs parameters, perhaps something to include/use your bootloader -extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-boot boot/grub/efi.img +extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-platform 0xef -eltorito-boot boot/grub/efi.img # Pre-ISO building script. Hook to be able to copy kernel images in place, for example %env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/xfceforensic_pre_iso_script.sh diff --git a/molecules/gaming.common b/molecules/gaming.common index 6c16d3c..1384615 100644 --- a/molecules/gaming.common +++ b/molecules/gaming.common @@ -37,7 +37,7 @@ extra_mksquashfs_parameters: -comp xz -Xbcj x86 # Please use cdrkit to make this molecule working !!! Or drop some games and remove the switch. # The aim is supporting >4GB files without enabling ISO LEVEL 2/3 (that would make the ISO # unbootable with syslinux -- no fragmented files support, for good). -extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-boot boot/grub/efi.img -allow-limited-size +extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-platform 0xef -eltorito-boot boot/grub/efi.img -allow-limited-size # Pre-ISO building script. Hook to be able to copy kernel images in place, for example %env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh "Gaming Edition" diff --git a/molecules/gnome.common b/molecules/gnome.common index 15aeafa..a8c1111 100644 --- a/molecules/gnome.common +++ b/molecules/gnome.common @@ -33,7 +33,7 @@ extra_mksquashfs_parameters: -comp xz -Xbcj x86 %env error_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_error_script.sh # Extra mkisofs parameters, perhaps something to include/use your bootloader -extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-boot boot/grub/efi.img +extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-platform 0xef -eltorito-boot boot/grub/efi.img # Pre-ISO building script. Hook to be able to copy kernel images in place, for example %env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh GNOME diff --git a/molecules/hardenedserver.common b/molecules/hardenedserver.common index 573d5e6..5335857 100644 --- a/molecules/hardenedserver.common +++ b/molecules/hardenedserver.common @@ -33,7 +33,7 @@ extra_mksquashfs_parameters: -comp xz -Xbcj x86 %env error_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_error_script.sh # Extra mkisofs parameters, perhaps something to include/use your bootloader -extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-boot boot/grub/efi.img +extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-platform 0xef -eltorito-boot boot/grub/efi.img # Pre-ISO building script. Hook to be able to copy kernel images in place, for example %env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh HardenedServer diff --git a/molecules/kde.common b/molecules/kde.common index 2ac864c..d15ad55 100644 --- a/molecules/kde.common +++ b/molecules/kde.common @@ -33,7 +33,7 @@ extra_mksquashfs_parameters: -comp xz -Xbcj x86 %env error_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_error_script.sh # Extra mkisofs parameters, perhaps something to include/use your bootloader -extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-boot boot/grub/efi.img +extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-platform 0xef -eltorito-boot boot/grub/efi.img # Pre-ISO building script. Hook to be able to copy kernel images in place, for example %env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh KDE diff --git a/molecules/lxde.common b/molecules/lxde.common index bcc073f..8fb4010 100644 --- a/molecules/lxde.common +++ b/molecules/lxde.common @@ -33,7 +33,7 @@ extra_mksquashfs_parameters: -comp xz -Xbcj x86 %env error_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_error_script.sh # Extra mkisofs parameters, perhaps something to include/use your bootloader -extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-boot boot/grub/efi.img +extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-platform 0xef -eltorito-boot boot/grub/efi.img # Pre-ISO building script. Hook to be able to copy kernel images in place, for example %env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh LXDE diff --git a/molecules/mate.common b/molecules/mate.common index 7735afb..de12560 100644 --- a/molecules/mate.common +++ b/molecules/mate.common @@ -33,7 +33,7 @@ extra_mksquashfs_parameters: -comp xz -Xbcj x86 %env error_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_error_script.sh # Extra mkisofs parameters, perhaps something to include/use your bootloader -extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-boot boot/grub/efi.img +extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-platform 0xef -eltorito-boot boot/grub/efi.img # Pre-ISO building script. Hook to be able to copy kernel images in place, for example %env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh MATE diff --git a/molecules/sabayon-amd64+x86-gnome.spec b/molecules/sabayon-amd64+x86-gnome.spec index 52b5062..33147ad 100644 --- a/molecules/sabayon-amd64+x86-gnome.spec +++ b/molecules/sabayon-amd64+x86-gnome.spec @@ -30,7 +30,7 @@ iso_title: Sabayon GNOME %env error_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_error_script.sh # Extra mkisofs parameters, perhaps something to include/use your bootloader -extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-boot boot/grub/efi.img +extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-platform 0xef -eltorito-boot boot/grub/efi.img # Pre-ISO building script. Hook to be able to copy kernel images in place, for example %env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/amd64_x86_pre_iso_script.sh GNOME 64 32 ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_10_x86_G.iso diff --git a/molecules/sabayon-amd64+x86-kde.spec b/molecules/sabayon-amd64+x86-kde.spec index d7d296a..245333f 100644 --- a/molecules/sabayon-amd64+x86-kde.spec +++ b/molecules/sabayon-amd64+x86-kde.spec @@ -30,7 +30,7 @@ iso_title: Sabayon KDE %env error_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_error_script.sh # Extra mkisofs parameters, perhaps something to include/use your bootloader -extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-boot boot/grub/efi.img +extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-platform 0xef -eltorito-boot boot/grub/efi.img # Pre-ISO building script. Hook to be able to copy kernel images in place, for example %env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/amd64_x86_pre_iso_script.sh KDE 64 32 ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_10_x86_K.iso diff --git a/molecules/serverbase.common b/molecules/serverbase.common index 74456de..260cce2 100644 --- a/molecules/serverbase.common +++ b/molecules/serverbase.common @@ -33,7 +33,7 @@ extra_mksquashfs_parameters: -comp xz -Xbcj x86 %env error_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_error_script.sh # Extra mkisofs parameters, perhaps something to include/use your bootloader -extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-boot boot/grub/efi.img +extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-platform 0xef -eltorito-boot boot/grub/efi.img # Pre-ISO building script. Hook to be able to copy kernel images in place, for example %env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh ServerBase diff --git a/molecules/spinbase.common b/molecules/spinbase.common index 65daf09..242dc55 100644 --- a/molecules/spinbase.common +++ b/molecules/spinbase.common @@ -30,7 +30,7 @@ extra_mksquashfs_parameters: -comp xz -Xbcj x86 %env merge_livecd_root: ${SABAYON_MOLECULE_HOME:-/sabayon}/boot/core # Extra mkisofs parameters, perhaps something to include/use your bootloader -extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-boot boot/grub/efi.img +extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-platform 0xef -eltorito-boot boot/grub/efi.img # Pre-ISO building script. Hook to be able to copy kernel images in place, for example %env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/spinbase_pre_iso_script.sh diff --git a/molecules/xfce.common b/molecules/xfce.common index 5046a05..b46d122 100644 --- a/molecules/xfce.common +++ b/molecules/xfce.common @@ -33,7 +33,7 @@ extra_mksquashfs_parameters: -comp xz -Xbcj x86 %env error_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_error_script.sh # Extra mkisofs parameters, perhaps something to include/use your bootloader -extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-boot boot/grub/efi.img +extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-platform 0xef -eltorito-boot boot/grub/efi.img # Pre-ISO building script. Hook to be able to copy kernel images in place, for example %env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh Xfce diff --git a/scripts/generic_post_iso_script.sh b/scripts/generic_post_iso_script.sh index 67eddbc..6b83e90 100755 --- a/scripts/generic_post_iso_script.sh +++ b/scripts/generic_post_iso_script.sh @@ -17,7 +17,7 @@ echo "ISO_PATH = ${ISO_PATH}" echo "ISO_CHECKSUM_PATH = ${ISO_CHECKSUM_PATH}" echo -isohybrid "${ISO_PATH}" || exit 1 +isohybrid --uefi "${ISO_PATH}" || exit 1 cd "$(dirname "${ISO_PATH}")" || exit 1 iso_name=$(basename "${ISO_PATH}") md5sum "${iso_name}" > "${ISO_CHECKSUM_PATH}"