sablink/molecules
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[molecules] move post_iso_script to amd64.common and x86.common

Browse Source 
This way isohybrid can be called without --uefi on x86
This commit is contained in:
Fabio Erculiani
2013-08-03 07:35:12 +02:00
parent 3ae47789e1
commit fbc25100cc
14 changed files with 17 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
molecules/amd64.common
+3
View File
@@ -1,2 +1,5 @@
# Extra mkisofs parameters, enable EFI support
extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -eltorito-alt-boot -no-emul-boot -eltorito-platform efi -eltorito-boot boot/grub/efi.img
# Post-ISO building script, called after ISO image generation.
%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh amd64
molecules/awesome.common
-3
View File
@@ -35,9 +35,6 @@ iso_title: Sabayon Awesome
# 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
# Post-ISO building script, called after ISO image generation.
%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh
# Destination directory for the ISO image path (MANDATORY)
%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso
molecules/e17.common
-3
View File
@@ -35,9 +35,6 @@ extra_mksquashfs_parameters: -comp xz -Xbcj x86
# 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
# Post-ISO building script, called after ISO image generation.
%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh
# Destination directory for the ISO image path (MANDATORY)
%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso
molecules/forensicxfce.common
-3
View File
@@ -35,9 +35,6 @@ extra_mksquashfs_parameters: -comp xz -Xbcj x86
# 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
# Post-ISO building script, called after ISO image generation.
%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh
# Destination directory for the ISO image path (MANDATORY)
%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso
molecules/gaming.common
-3
View File
@@ -35,9 +35,6 @@ extra_mksquashfs_parameters: -comp xz -Xbcj x86
# 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"
# Post-ISO building script, called after ISO image generation.
%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh
# Destination directory for the ISO image path (MANDATORY)
%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso
molecules/gnome.common
-3
View File
@@ -35,9 +35,6 @@ extra_mksquashfs_parameters: -comp xz -Xbcj x86
# 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
# Post-ISO building script, called after ISO image generation.
%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh
# Destination directory for the ISO image path (MANDATORY)
%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso
molecules/kde.common
-3
View File
@@ -35,9 +35,6 @@ extra_mksquashfs_parameters: -comp xz -Xbcj x86
# 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
# Post-ISO building script, called after ISO image generation.
%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh
# Destination directory for the ISO image path (MANDATORY)
%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso
molecules/lxde.common
-3
View File
@@ -35,9 +35,6 @@ extra_mksquashfs_parameters: -comp xz -Xbcj x86
# 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
# Post-ISO building script, called after ISO image generation.
%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh
# Destination directory for the ISO image path (MANDATORY)
%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso
molecules/mate.common
-3
View File
@@ -35,9 +35,6 @@ extra_mksquashfs_parameters: -comp xz -Xbcj x86
# 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
# Post-ISO building script, called after ISO image generation.
%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh
# Destination directory for the ISO image path (MANDATORY)
%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso
molecules/minimal.common
-3
View File
@@ -35,9 +35,6 @@ extra_mksquashfs_parameters: -comp xz -Xbcj x86
# 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 Minimal
# Post-ISO building script, called after ISO image generation.
%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh
# Destination directory for the ISO image path (MANDATORY)
%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso
molecules/spinbase.common
-3
View File
@@ -32,9 +32,6 @@ extra_mksquashfs_parameters: -comp xz -Xbcj x86
# 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
# Post-ISO building script, called after ISO image generation.
%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh
# Destination directory for the ISO image path
%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso
molecules/x86.common
+4 -1
View File
@@ -1,2 +1,5 @@
# Extra mkisofs parameters, enable EFI support
# Extra mkisofs parameters, disable EFI support
extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat
# Post-ISO building script, called after ISO image generation.
%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh x86
molecules/xfce.common
-3
View File
@@ -35,9 +35,6 @@ extra_mksquashfs_parameters: -comp xz -Xbcj x86
# 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
# Post-ISO building script, called after ISO image generation.
%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh
# Destination directory for the ISO image path (MANDATORY)
%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso
scripts/generic_post_iso_script.sh
+10 -1
View File
@@ -11,13 +11,22 @@
/usr/sbin/env-update
. /etc/profile
ISO_ARCH="${1}"
shift
echo
echo "Spawning isohybrid for:"
echo "ISO_PATH = ${ISO_PATH}"
echo "ISO_CHECKSUM_PATH = ${ISO_CHECKSUM_PATH}"
echo "ISO_ARCH = ${ISO_ARCH}"
echo
isohybrid --uefi "${ISO_PATH}" || exit 1
ih_args=""
if [ "${ISO_ARCH}" = "amd64" ]; then
ih_args+=" --uefi"
fi
isohybrid ${ih_args} "${ISO_PATH}" || exit 1
cd "$(dirname "${ISO_PATH}")" || exit 1
iso_name=$(basename "${ISO_PATH}")
md5sum "${iso_name}" > "${ISO_CHECKSUM_PATH}"