diff --git a/molecules/arm-base.common b/molecules/arm-base.common index eba737f..d98f984 100644 --- a/molecules/arm-base.common +++ b/molecules/arm-base.common @@ -44,13 +44,13 @@ execution_strategy: chroot_to_mmc # CHROOT_DIR = path pointing to the chroot # IMAGE_PATH = path pointing to the destination image file # IMAGE_CHECKSUM_PATH = path pointing to the destination image file checksum (md5) -post_image_script: /sabayon/scripts/post_mmc_image_script.sh +%env post_image_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/post_mmc_image_script.sh # Destination directory for the image path (MANDATORY) -destination_image_directory: /sabayon/images +%env destination_image_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/images # Path to source chroot (mandatory) -source_chroot: /sabayon/sources/armv7l_core-2012 +%env source_chroot: ${SABAYON_MOLECULE_HOME:-/sabayon}/sources/armv7l_core-2012 # Release file that will be created onto the root filesystem release_file: /etc/sabayon-edition diff --git a/molecules/armel-base.common b/molecules/armel-base.common index d402f61..2b336d0 100644 --- a/molecules/armel-base.common +++ b/molecules/armel-base.common @@ -34,7 +34,7 @@ execution_strategy: chroot_to_mmc # IMAGE_NAME = name of the final MMC image # DESTINATION_IMAGE_DIR = path to the destination image directory # CHROOT_DIR = path pointing to the chroot -# pre_image_script: /sabayon/scripts/pre_image_script.sh +# %env pre_image_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/pre_image_script.sh # Post-image building script. Hook called after image file creation and move # into destination directory. @@ -44,13 +44,13 @@ execution_strategy: chroot_to_mmc # CHROOT_DIR = path pointing to the chroot # IMAGE_PATH = path pointing to the destination image file # IMAGE_CHECKSUM_PATH = path pointing to the destination image file checksum (md5) -post_image_script: /sabayon/scripts/post_mmc_image_script.sh +%env post_image_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/post_mmc_image_script.sh # Destination directory for the image path (MANDATORY) -destination_image_directory: /sabayon/images +%env destination_image_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/images # Path to source chroot (mandatory) -source_chroot: /sabayon/sources/armv7l_softfp_core-2012 +%env source_chroot: ${SABAYON_MOLECULE_HOME:-/sabayon}/sources/armv7l_softfp_core-2012 # Release file that will be created onto the root filesystem release_file: /etc/sabayon-edition diff --git a/molecules/awesome.common b/molecules/awesome.common index fcb7dc5..6c3203e 100644 --- a/molecules/awesome.common +++ b/molecules/awesome.common @@ -13,33 +13,33 @@ iso_title: Sabayon Awesome # Outer chroot script command, to be executed outside destination chroot before # before entering it (and before inner_chroot_script) -outer_chroot_script: /sabayon/scripts/remaster_pre.sh +%env outer_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_pre.sh # Execute repositories update here, in a more fault-tolerant flavor -inner_chroot_script: /sabayon/scripts/remaster_generic_inner_chroot_script.sh +%env inner_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script.sh # Inner chroot script command, to be executed inside destination chroot after # packages installation and removal -inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh awesome +%env inner_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script_after.sh awesome # Outer chroot script command, to be executed outside destination chroot before # before entering it (and AFTER inner_chroot_script) -outer_chroot_script_after: /sabayon/scripts/remaster_post.sh +%env outer_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_post.sh # Used to umount /proc and unbind packages dir -error_script: /sabayon/scripts/remaster_error_script.sh +%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 # Pre-ISO building script. Hook to be able to copy kernel images in place, for example -pre_iso_script: /sabayon/scripts/generic_pre_iso_script.sh Awesome +%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh Awesome # Post-ISO building script, called after ISO image generation. -post_iso_script: /sabayon/scripts/generic_post_iso_script.sh +%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh # Destination directory for the ISO image path (MANDATORY) -destination_iso_directory: /sabayon/iso +%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso # List of packages that would be removed from chrooted system (comma separated) # packages_to_remove: diff --git a/molecules/corecdx.common b/molecules/corecdx.common index 74f9b90..c1e3008 100644 --- a/molecules/corecdx.common +++ b/molecules/corecdx.common @@ -13,33 +13,33 @@ release_file: /etc/sabayon-edition # Outer chroot script command, to be executed outside destination chroot before # before entering it (and before inner_chroot_script) -outer_chroot_script: /sabayon/scripts/remaster_pre.sh +%env outer_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_pre.sh # Execute repositories update here, in a more fault-tolerant flavor -inner_chroot_script: /sabayon/scripts/remaster_generic_inner_chroot_script.sh +%env inner_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script.sh # Inner chroot script command, to be executed inside destination chroot after # packages installation and removal -inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh fluxbox +%env inner_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script_after.sh fluxbox # Outer chroot script command, to be executed outside destination chroot before # before entering it (and AFTER inner_chroot_script) -outer_chroot_script_after: /sabayon/scripts/remaster_post.sh +%env outer_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_post.sh # Used to umount /proc and unbind packages dir -error_script: /sabayon/scripts/remaster_error_script.sh +%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 # Pre-ISO building script. Hook to be able to copy kernel images in place, for example -pre_iso_script: /sabayon/scripts/generic_pre_iso_script.sh CoreCDX +%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh CoreCDX # Post-ISO building script, called after ISO image generation. -post_iso_script: /sabayon/scripts/generic_post_iso_script.sh +%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh # Destination directory for the ISO image path (MANDATORY) -destination_iso_directory: /sabayon/iso +%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso # sabayon-skel required to make anaconda autostart # libgnomecanvas-python required by anaconda diff --git a/molecules/e17.common b/molecules/e17.common index 2d20ef6..c1d7a23 100644 --- a/molecules/e17.common +++ b/molecules/e17.common @@ -13,33 +13,33 @@ iso_title: Sabayon E17 # Outer chroot script command, to be executed outside destination chroot before # before entering it (and before inner_chroot_script) -outer_chroot_script: /sabayon/scripts/remaster_pre.sh +%env outer_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_pre.sh # Execute repositories update here, in a more fault-tolerant flavor -inner_chroot_script: /sabayon/scripts/remaster_generic_inner_chroot_script.sh +%env inner_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script.sh # Inner chroot script command, to be executed inside destination chroot after # packages installation and removal -inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh e17 +%env inner_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script_after.sh e17 # Outer chroot script command, to be executed outside destination chroot before # before entering it (and AFTER inner_chroot_script) -outer_chroot_script_after: /sabayon/scripts/remaster_post.sh +%env outer_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_post.sh # Used to umount /proc and unbind packages dir -error_script: /sabayon/scripts/remaster_error_script.sh +%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 # Pre-ISO building script. Hook to be able to copy kernel images in place, for example -pre_iso_script: /sabayon/scripts/generic_pre_iso_script.sh E17 +%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh E17 # Post-ISO building script, called after ISO image generation. -post_iso_script: /sabayon/scripts/generic_post_iso_script.sh +%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh # Destination directory for the ISO image path (MANDATORY) -destination_iso_directory: /sabayon/iso +%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso # Custom shell call to packages removal (default is: equo remove) # custom_packages_remove_cmd: diff --git a/molecules/forensicxfce.common b/molecules/forensicxfce.common index b6b9976..29053e4 100644 --- a/molecules/forensicxfce.common +++ b/molecules/forensicxfce.common @@ -13,33 +13,33 @@ iso_title: Sabayon Forensics Xfce # Outer chroot script command, to be executed outside destination chroot before # before entering it (and before inner_chroot_script) -outer_chroot_script: /sabayon/scripts/remaster_pre.sh +%env outer_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_pre.sh # Execute repositories update here, in a more fault-tolerant flavor -inner_chroot_script: /sabayon/scripts/remaster_generic_inner_chroot_script.sh +%env inner_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script.sh # Inner chroot script command, to be executed inside destination chroot after # packages installation and removal -inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh xfceforensic +%env inner_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script_after.sh xfceforensic # Outer chroot script command, to be executed outside destination chroot before # before entering it (and AFTER inner_chroot_script) -outer_chroot_script_after: /sabayon/scripts/xfce_remaster_post.sh +%env outer_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/xfce_remaster_post.sh # Used to umount /proc and unbind packages dir -error_script: /sabayon/scripts/remaster_error_script.sh +%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 # Pre-ISO building script. Hook to be able to copy kernel images in place, for example -pre_iso_script: /sabayon/scripts/xfceforensic_pre_iso_script.sh +%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/xfceforensic_pre_iso_script.sh # Post-ISO building script, called after ISO image generation. -post_iso_script: /sabayon/scripts/generic_post_iso_script.sh +%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh # Destination directory for the ISO image path (MANDATORY) -destination_iso_directory: /sabayon/iso +%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso # List of packages that would be removed from chrooted system (comma separated ) packages_to_remove: diff --git a/molecules/gaming.common b/molecules/gaming.common index a43d9de..86902b6 100644 --- a/molecules/gaming.common +++ b/molecules/gaming.common @@ -13,21 +13,21 @@ iso_title: Sabayon Gaming Edition # Outer chroot script command, to be executed outside destination chroot before # before entering it (and before inner_chroot_script) -outer_chroot_script: /sabayon/scripts/remaster_pre.sh +%env outer_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_pre.sh # Execute repositories update here, in a more fault-tolerant flavor -inner_chroot_script: /sabayon/scripts/remaster_generic_inner_chroot_script.sh +%env inner_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script.sh # Inner chroot script command, to be executed inside destination chroot after # packages installation and removal -inner_chroot_script_after: /sabayon/scripts/remaster_gaming_inner_chroot_script_after.sh +%env inner_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_gaming_inner_chroot_script_after.sh # Outer chroot script command, to be executed outside destination chroot before # before entering it (and AFTER inner_chroot_script) -outer_chroot_script_after: /sabayon/scripts/gaming_remaster_post.sh +%env outer_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/gaming_remaster_post.sh # Used to umount /proc and unbind packages dir -error_script: /sabayon/scripts/remaster_error_script.sh +%env error_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_error_script.sh # Extra mkisofs parameters, perhaps something to include/use your bootloader # IMPORTANT NOTE: -allow-limited-size is only supported by cdrkit provided mkisofs. @@ -37,13 +37,13 @@ error_script: /sabayon/scripts/remaster_error_script.sh extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat -allow-limited-size # Pre-ISO building script. Hook to be able to copy kernel images in place, for example -pre_iso_script: /sabayon/scripts/generic_pre_iso_script.sh "Gaming Edition" +%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. -post_iso_script: /sabayon/scripts/generic_post_iso_script.sh +%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh # Destination directory for the ISO image path (MANDATORY) -destination_iso_directory: /sabayon/iso +%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso # List of packages that would be added from chrooted system (comma separated) packages_to_add: diff --git a/molecules/gnome.common b/molecules/gnome.common index 35d7560..65cb3dd 100644 --- a/molecules/gnome.common +++ b/molecules/gnome.common @@ -13,33 +13,33 @@ iso_title: Sabayon GNOME # Outer chroot script command, to be executed outside destination chroot before # before entering it (and before inner_chroot_script) -outer_chroot_script: /sabayon/scripts/remaster_pre.sh +%env outer_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_pre.sh # Execute repositories update here, in a more fault-tolerant flavor -inner_chroot_script: /sabayon/scripts/remaster_generic_inner_chroot_script.sh +%env inner_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script.sh # Inner chroot script command, to be executed inside destination chroot after # packages installation and removal -inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh gnome +%env inner_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script_after.sh gnome # Outer chroot script command, to be executed outside destination chroot before # before entering it (and AFTER inner_chroot_script) -outer_chroot_script_after: /sabayon/scripts/remaster_post.sh +%env outer_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_post.sh # Used to umount /proc and unbind packages dir -error_script: /sabayon/scripts/remaster_error_script.sh +%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 # Pre-ISO building script. Hook to be able to copy kernel images in place, for example -pre_iso_script: /sabayon/scripts/generic_pre_iso_script.sh GNOME +%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh GNOME # Post-ISO building script, called after ISO image generation. -post_iso_script: /sabayon/scripts/generic_post_iso_script.sh +%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh # Destination directory for the ISO image path (MANDATORY) -destination_iso_directory: /sabayon/iso +%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso # List of packages that would be removed from chrooted system (comma separated) # packages_to_remove: diff --git a/molecules/kde.common b/molecules/kde.common index 25436e3..f55b216 100644 --- a/molecules/kde.common +++ b/molecules/kde.common @@ -13,33 +13,33 @@ iso_title: Sabayon KDE # Outer chroot script command, to be executed outside destination chroot before # before entering it (and before inner_chroot_script) -outer_chroot_script: /sabayon/scripts/remaster_pre.sh +%env outer_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_pre.sh # Execute repositories update here, in a more fault-tolerant flavor -inner_chroot_script: /sabayon/scripts/remaster_generic_inner_chroot_script.sh +%env inner_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script.sh # Inner chroot script command, to be executed inside destination chroot after # packages installation and removal -inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh kde +%env inner_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script_after.sh kde # Outer chroot script command, to be executed outside destination chroot before # before entering it (and AFTER inner_chroot_script) -outer_chroot_script_after: /sabayon/scripts/remaster_post.sh +%env outer_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_post.sh # Used to umount /proc and unbind packages dir -error_script: /sabayon/scripts/remaster_error_script.sh +%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 # Pre-ISO building script. Hook to be able to copy kernel images in place, for example -pre_iso_script: /sabayon/scripts/generic_pre_iso_script.sh KDE +%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh KDE # Post-ISO building script, called after ISO image generation. -post_iso_script: /sabayon/scripts/generic_post_iso_script.sh +%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh # Destination directory for the ISO image path (MANDATORY) -destination_iso_directory: /sabayon/iso +%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso # List of packages that would be removed from chrooted system (comma separated) # packages_to_remove: diff --git a/molecules/lxde.common b/molecules/lxde.common index ba77c70..62df680 100644 --- a/molecules/lxde.common +++ b/molecules/lxde.common @@ -13,33 +13,33 @@ iso_title: Sabayon LXDE # Outer chroot script command, to be executed outside destination chroot before # before entering it (and before inner_chroot_script) -outer_chroot_script: /sabayon/scripts/remaster_pre.sh +%env outer_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_pre.sh # Execute repositories update here, in a more fault-tolerant flavor -inner_chroot_script: /sabayon/scripts/remaster_generic_inner_chroot_script.sh +%env inner_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script.sh # Inner chroot script command, to be executed inside destination chroot after # packages installation and removal -inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh lxde +%env inner_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script_after.sh lxde # Outer chroot script command, to be executed outside destination chroot before # before entering it (and AFTER inner_chroot_script) -outer_chroot_script_after: /sabayon/scripts/remaster_post.sh +%env outer_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_post.sh # Used to umount /proc and unbind packages dir -error_script: /sabayon/scripts/remaster_error_script.sh +%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 # Pre-ISO building script. Hook to be able to copy kernel images in place, for example -pre_iso_script: /sabayon/scripts/generic_pre_iso_script.sh LXDE +%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh LXDE # Post-ISO building script, called after ISO image generation. -post_iso_script: /sabayon/scripts/generic_post_iso_script.sh +%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh # Destination directory for the ISO image path (MANDATORY) -destination_iso_directory: /sabayon/iso +%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso # List of packages that would be removed from chrooted system (comma separated) packages_to_remove: diff --git a/molecules/mate.common b/molecules/mate.common index f037d04..8a42b90 100644 --- a/molecules/mate.common +++ b/molecules/mate.common @@ -13,33 +13,33 @@ iso_title: Sabayon MATE # Outer chroot script command, to be executed outside destination chroot before # before entering it (and before inner_chroot_script) -outer_chroot_script: /sabayon/scripts/remaster_pre.sh +%env outer_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_pre.sh # Execute repositories update here, in a more fault-tolerant flavor -inner_chroot_script: /sabayon/scripts/remaster_generic_inner_chroot_script.sh +%env inner_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script.sh # Inner chroot script command, to be executed inside destination chroot after # packages installation and removal -inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh mate +%env inner_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script_after.sh mate # Outer chroot script command, to be executed outside destination chroot before # before entering it (and AFTER inner_chroot_script) -outer_chroot_script_after: /sabayon/scripts/remaster_post.sh +%env outer_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_post.sh # Used to umount /proc and unbind packages dir -error_script: /sabayon/scripts/remaster_error_script.sh +%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 # Pre-ISO building script. Hook to be able to copy kernel images in place, for example -pre_iso_script: /sabayon/scripts/generic_pre_iso_script.sh MATE +%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh MATE # Post-ISO building script, called after ISO image generation. -post_iso_script: /sabayon/scripts/generic_post_iso_script.sh +%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh # Destination directory for the ISO image path (MANDATORY) -destination_iso_directory: /sabayon/iso +%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso # List of packages that would be removed from chrooted system (comma separated) packages_to_remove: diff --git a/molecules/sabayon-amd64+x86-gnome.spec b/molecules/sabayon-amd64+x86-gnome.spec index bff02b6..8d5a60a 100644 --- a/molecules/sabayon-amd64+x86-gnome.spec +++ b/molecules/sabayon-amd64+x86-gnome.spec @@ -20,26 +20,26 @@ iso_title: Sabayon GNOME # Inner chroot script command, to be executed inside destination chroot after # packages installation and removal -inner_chroot_script_after: /sabayon/scripts/amd64_x86_inner_chroot_script_after.sh +%env inner_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/amd64_x86_inner_chroot_script_after.sh # Outer chroot script command, to be executed outside destination chroot before # before entering it (and AFTER inner_chroot_script) # outer_chroot_script_after: # Used to umount /proc and unbind packages dir -error_script: /sabayon/scripts/remaster_error_script.sh +%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 # Pre-ISO building script. Hook to be able to copy kernel images in place, for example -pre_iso_script: /sabayon/scripts/amd64_x86_pre_iso_script.sh GNOME 64 32 /sabayon/iso/Sabayon_Linux_9_x86_G.iso +%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_9_x86_G.iso # Post-ISO building script, called after ISO image generation. -post_iso_script: /sabayon/scripts/generic_post_iso_script.sh +%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh # Destination directory for the ISO image path (MANDATORY) -destination_iso_directory: /sabayon/iso +%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso # List of packages that would be removed from chrooted system (comma separated) # packages_to_remove: @@ -70,7 +70,7 @@ release_version: 9 release_desc: amd64+x86 GNOME # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_9_amd64_G.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_9_amd64_G.iso # Destination ISO image name, call whatever you want.iso, not mandatory destination_iso_image_name: Sabayon_Linux_9_amd64+x86_G.iso diff --git a/molecules/sabayon-amd64+x86-kde.spec b/molecules/sabayon-amd64+x86-kde.spec index a8e1a37..d46a004 100644 --- a/molecules/sabayon-amd64+x86-kde.spec +++ b/molecules/sabayon-amd64+x86-kde.spec @@ -20,26 +20,26 @@ iso_title: Sabayon KDE # Inner chroot script command, to be executed inside destination chroot after # packages installation and removal -inner_chroot_script_after: /sabayon/scripts/amd64_x86_inner_chroot_script_after.sh +%env inner_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/amd64_x86_inner_chroot_script_after.sh # Outer chroot script command, to be executed outside destination chroot before # before entering it (and AFTER inner_chroot_script) # outer_chroot_script_after: # Used to umount /proc and unbind packages dir -error_script: /sabayon/scripts/remaster_error_script.sh +%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 # Pre-ISO building script. Hook to be able to copy kernel images in place, for example -pre_iso_script: /sabayon/scripts/amd64_x86_pre_iso_script.sh KDE 64 32 /sabayon/iso/Sabayon_Linux_9_x86_K.iso +%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_9_x86_K.iso # Post-ISO building script, called after ISO image generation. -post_iso_script: /sabayon/scripts/generic_post_iso_script.sh +%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh # Destination directory for the ISO image path (MANDATORY) -destination_iso_directory: /sabayon/iso +%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso # List of packages that would be removed from chrooted system (comma separated) # packages_to_remove: @@ -70,7 +70,7 @@ release_version: 9 release_desc: amd64+x86 KDE # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_9_amd64_K.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_9_amd64_K.iso # Destination ISO image name, call whatever you want.iso, not mandatory destination_iso_image_name: Sabayon_Linux_9_amd64+x86_K.iso diff --git a/molecules/sabayon-amd64-awesome.spec b/molecules/sabayon-amd64-awesome.spec index 596fdaa..58327df 100644 --- a/molecules/sabayon-amd64-awesome.spec +++ b/molecules/sabayon-amd64-awesome.spec @@ -1,5 +1,5 @@ # Use abs path, otherwise daily iso build won't work -%import /sabayon/molecules/awesome.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/awesome.common # Release Version release_version: 9 @@ -8,7 +8,7 @@ release_version: 9 release_desc: amd64 Awesome # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso # Destination ISO image name, call whatever you want.iso, not mandatory destination_iso_image_name: Sabayon_Linux_9_amd64_Awesome.iso diff --git a/molecules/sabayon-amd64-corecdx.spec b/molecules/sabayon-amd64-corecdx.spec index 675b230..b21e62c 100644 --- a/molecules/sabayon-amd64-corecdx.spec +++ b/molecules/sabayon-amd64-corecdx.spec @@ -1,11 +1,11 @@ # Use abs path, otherwise daily iso build won't work -%import /sabayon/molecules/corecdx.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/corecdx.common release_version: 9 release_desc: amd64 CoreCDX # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso # Destination ISO image name, call whatever you want.iso, not mandatory destination_iso_image_name: Sabayon_Linux_CoreCDX_9_amd64.iso diff --git a/molecules/sabayon-amd64-e17.spec b/molecules/sabayon-amd64-e17.spec index bb89509..0c8d65e 100644 --- a/molecules/sabayon-amd64-e17.spec +++ b/molecules/sabayon-amd64-e17.spec @@ -1,5 +1,5 @@ # Use abs path, otherwise daily builds automagic won't work -%import /sabayon/molecules/e17.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/e17.common # Release Version release_version: 9 @@ -8,7 +8,7 @@ release_version: 9 release_desc: amd64 E17 # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso # Destination ISO image name, call whatever you want.iso, not mandatory destination_iso_image_name: Sabayon_Linux_9_amd64_E17.iso diff --git a/molecules/sabayon-amd64-gaming.spec b/molecules/sabayon-amd64-gaming.spec index e1e546e..61f1dba 100644 --- a/molecules/sabayon-amd64-gaming.spec +++ b/molecules/sabayon-amd64-gaming.spec @@ -1,5 +1,5 @@ # Use abs path, otherwise daily builds automagic won't work -%import /sabayon/molecules/gaming.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/gaming.common # Release Version release_version: 9 @@ -8,7 +8,7 @@ release_version: 9 release_desc: amd64 Gaming Edition # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_DAILY_amd64_G.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_DAILY_amd64_G.iso # Destination ISO image name, call whatever you want.iso, not mandatory destination_iso_image_name: Sabayon_Linux_9_amd64_Gaming.iso diff --git a/molecules/sabayon-amd64-gnome.spec b/molecules/sabayon-amd64-gnome.spec index 95a6ab6..9bb0aeb 100644 --- a/molecules/sabayon-amd64-gnome.spec +++ b/molecules/sabayon-amd64-gnome.spec @@ -1,5 +1,5 @@ # Use abs path, otherwise daily builds automagic won't work -%import /sabayon/molecules/gnome.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/gnome.common # Release Version release_version: 9 @@ -8,7 +8,7 @@ release_version: 9 release_desc: amd64 GNOME # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso # Destination ISO image name, call whatever you want.iso, not mandatory destination_iso_image_name: Sabayon_Linux_9_amd64_G.iso diff --git a/molecules/sabayon-amd64-kde.spec b/molecules/sabayon-amd64-kde.spec index 3ffad4a..8ef19b8 100644 --- a/molecules/sabayon-amd64-kde.spec +++ b/molecules/sabayon-amd64-kde.spec @@ -1,5 +1,5 @@ # Use abs path, otherwise daily builds automagic won't work -%import /sabayon/molecules/kde.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/kde.common # Release Version release_version: 9 @@ -8,7 +8,7 @@ release_version: 9 release_desc: amd64 KDE # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso # Destination ISO image name, call whatever you want.iso, not mandatory destination_iso_image_name: Sabayon_Linux_9_amd64_K.iso diff --git a/molecules/sabayon-amd64-lxde.spec b/molecules/sabayon-amd64-lxde.spec index 647eafe..d2b2caf 100644 --- a/molecules/sabayon-amd64-lxde.spec +++ b/molecules/sabayon-amd64-lxde.spec @@ -1,5 +1,5 @@ # Use abs path, otherwise daily builds automagic won't work -%import /sabayon/molecules/lxde.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/lxde.common # Release Version release_version: 9 @@ -8,7 +8,7 @@ release_version: 9 release_desc: amd64 LXDE # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso # Destination ISO image name, call whatever you want.iso, not mandatory destination_iso_image_name: Sabayon_Linux_9_amd64_LXDE.iso diff --git a/molecules/sabayon-amd64-mate.spec b/molecules/sabayon-amd64-mate.spec index 6c41ed2..c3a01bb 100644 --- a/molecules/sabayon-amd64-mate.spec +++ b/molecules/sabayon-amd64-mate.spec @@ -1,5 +1,5 @@ # Use abs path, otherwise daily builds automagic won't work -%import /sabayon/molecules/mate.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/mate.common # Release Version release_version: 9 @@ -8,7 +8,7 @@ release_version: 9 release_desc: amd64 MATE # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso # Destination ISO image name, call whatever you want.iso, not mandatory destination_iso_image_name: Sabayon_Linux_9_amd64_MATE.iso diff --git a/molecules/sabayon-amd64-serverbase.spec b/molecules/sabayon-amd64-serverbase.spec index ca9afcb..b8c8c98 100644 --- a/molecules/sabayon-amd64-serverbase.spec +++ b/molecules/sabayon-amd64-serverbase.spec @@ -1,11 +1,11 @@ # Use abs path, otherwise daily iso build won't work -%import /sabayon/molecules/serverbase.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/serverbase.common release_version: 9 release_desc: amd64 ServerBase # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso # Destination ISO image name, call whatever you want.iso, not mandatory destination_iso_image_name: Sabayon_Linux_ServerBase_9_amd64.iso diff --git a/molecules/sabayon-amd64-spinbase-amazon-ami-template.spec b/molecules/sabayon-amd64-spinbase-amazon-ami-template.spec index aae7ecb..150edd0 100644 --- a/molecules/sabayon-amd64-spinbase-amazon-ami-template.spec +++ b/molecules/sabayon-amd64-spinbase-amazon-ami-template.spec @@ -1,13 +1,13 @@ # Use abs path, otherwise daily builds automagic won't work # For further documentation, see the file above: -%import /sabayon/molecules/spinbase-amazon-ami-image-template.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/spinbase-amazon-ami-image-template.common # pre chroot command, example, for 32bit chroots on 64bit system, you always # have to append "linux32" this is useful for inner_chroot_script # prechroot: # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso release_version: 9 image_name: Sabayon_Linux_SpinBase_9_amd64_ami.img diff --git a/molecules/sabayon-amd64-spinbase-amazon-ebs-image.spec b/molecules/sabayon-amd64-spinbase-amazon-ebs-image.spec index 4b6859b..2795779 100644 --- a/molecules/sabayon-amd64-spinbase-amazon-ebs-image.spec +++ b/molecules/sabayon-amd64-spinbase-amazon-ebs-image.spec @@ -1,12 +1,12 @@ # Use abs path, otherwise daily builds automagic won't work -%import /sabayon/molecules/spinbase-amazon-ami-ebs-image.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/spinbase-amazon-ami-ebs-image.common # pre chroot command, example, for 32bit chroots on 64bit system, you always # have to append "linux32" this is useful for inner_chroot_script # prechroot: # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso release_version: 9 tar_name: Sabayon_Linux_SpinBase_9_amd64_Amazon_EBS_ext4_filesystem_image.tar.gz diff --git a/molecules/sabayon-amd64-spinbase-openvz-template.spec b/molecules/sabayon-amd64-spinbase-openvz-template.spec index 1a921d4..f8b0c33 100644 --- a/molecules/sabayon-amd64-spinbase-openvz-template.spec +++ b/molecules/sabayon-amd64-spinbase-openvz-template.spec @@ -1,12 +1,12 @@ # Use abs path, otherwise daily builds automagic won't work -%import /sabayon/molecules/spinbase-openvz-template.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/spinbase-openvz-template.common # pre chroot command, example, for 32bit chroots on 64bit system, you always # have to append "linux32" this is useful for inner_chroot_script # prechroot: # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso release_version: 9 tar_name: Sabayon_Linux_SpinBase_9_amd64_openvz.tar.gz diff --git a/molecules/sabayon-amd64-xfce.spec b/molecules/sabayon-amd64-xfce.spec index 39ef001..e89cf5f 100644 --- a/molecules/sabayon-amd64-xfce.spec +++ b/molecules/sabayon-amd64-xfce.spec @@ -1,5 +1,5 @@ # Use abs path, otherwise daily builds automagic won't work -%import /sabayon/molecules/xfce.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/xfce.common # Release Version release_version: 9 @@ -8,7 +8,7 @@ release_version: 9 release_desc: amd64 Xfce # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso # Destination ISO image name, call whatever you want.iso, not mandatory destination_iso_image_name: Sabayon_Linux_9_amd64_Xfce.iso diff --git a/molecules/sabayon-amd64-xfceforensic.spec b/molecules/sabayon-amd64-xfceforensic.spec index 2dde01f..e5aeb8e 100644 --- a/molecules/sabayon-amd64-xfceforensic.spec +++ b/molecules/sabayon-amd64-xfceforensic.spec @@ -1,5 +1,5 @@ # Use abs path, otherwise daily builds automagic won't work -%import /sabayon/molecules/forensicxfce.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/forensicxfce.common # Release Version release_version: 9 @@ -8,6 +8,6 @@ release_version: 9 release_desc: amd64 ForensicsXfce # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_DAILY_amd64_Xfce.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_DAILY_amd64_Xfce.iso destination_iso_image_name: Sabayon_Linux_DAILY_amd64_ForensicsXfce.iso diff --git a/molecules/sabayon-arm-beagleboard-xm-4G.spec b/molecules/sabayon-arm-beagleboard-xm-4G.spec index 02ced68..b17b86c 100644 --- a/molecules/sabayon-arm-beagleboard-xm-4G.spec +++ b/molecules/sabayon-arm-beagleboard-xm-4G.spec @@ -1,5 +1,5 @@ -%import /sabayon/molecules/arm-base.common -%import /sabayon/molecules/beagleboard-xm.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/arm-base.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/beagleboard-xm.common # Release desc (the actual release description) release_desc: armv7a BeagleBoard xM @@ -17,8 +17,8 @@ image_name: Sabayon_Linux_9_armv7a_BeagleBoard_xM_4GB.img image_mb: 3800 # Path to boot partition data (MLO, u-boot.img etc) -source_boot_directory: /sabayon/boot/arm/beagleboard-xm +%env source_boot_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/boot/arm/beagleboard-xm # External script that will generate the image file. # The same can be copied onto a MMC by using dd -image_generator_script: /sabayon/scripts/beagleboard_xm_image_generator_script.sh +%env image_generator_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/beagleboard_xm_image_generator_script.sh diff --git a/molecules/sabayon-arm-beagleboard-xm-8G.spec b/molecules/sabayon-arm-beagleboard-xm-8G.spec index 104df71..a8b7b59 100644 --- a/molecules/sabayon-arm-beagleboard-xm-8G.spec +++ b/molecules/sabayon-arm-beagleboard-xm-8G.spec @@ -1,5 +1,5 @@ -%import /sabayon/molecules/arm-base.common -%import /sabayon/molecules/beagleboard-xm.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/arm-base.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/beagleboard-xm.common # Release desc (the actual release description) release_desc: armv7a BeagleBoard xM @@ -17,8 +17,8 @@ image_name: Sabayon_Linux_9_armv7a_BeagleBoard_xM_8GB.img image_mb: 7400 # Path to boot partition data (MLO, u-boot.img etc) -source_boot_directory: /sabayon/boot/arm/beagleboard-xm +%env source_boot_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/boot/arm/beagleboard-xm # External script that will generate the image file. # The same can be copied onto a MMC by using dd -image_generator_script: /sabayon/scripts/beagleboard_xm_image_generator_script.sh +%env image_generator_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/beagleboard_xm_image_generator_script.sh diff --git a/molecules/sabayon-arm-beaglebone-base-2G.spec b/molecules/sabayon-arm-beaglebone-base-2G.spec index 2929ef3..62fed28 100644 --- a/molecules/sabayon-arm-beaglebone-base-2G.spec +++ b/molecules/sabayon-arm-beaglebone-base-2G.spec @@ -1,5 +1,5 @@ -%import /sabayon/molecules/arm-base.common -%import /sabayon/molecules/beaglebone.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/arm-base.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/beaglebone.common # Release desc (the actual release description) release_desc: armv7a BeagleBone @@ -17,8 +17,8 @@ image_name: Sabayon_Linux_9_armv7a_BeagleBone_Base_2GB.img image_mb: 2000 # Path to boot partition data (MLO, u-boot.img etc) -source_boot_directory: /sabayon/boot/arm/beaglebone +%env source_boot_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/boot/arm/beaglebone # External script that will generate the image file. # The same can be copied onto a MMC by using dd -image_generator_script: /sabayon/scripts/beaglebone_image_generator_script.sh +%env image_generator_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/beaglebone_image_generator_script.sh diff --git a/molecules/sabayon-arm-beaglebone-base-4G.spec b/molecules/sabayon-arm-beaglebone-base-4G.spec index ecde340..aee1056 100644 --- a/molecules/sabayon-arm-beaglebone-base-4G.spec +++ b/molecules/sabayon-arm-beaglebone-base-4G.spec @@ -1,5 +1,5 @@ -%import /sabayon/molecules/arm-base.common -%import /sabayon/molecules/beaglebone.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/arm-base.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/beaglebone.common # Release desc (the actual release description) release_desc: armv7a BeagleBone @@ -17,8 +17,8 @@ image_name: Sabayon_Linux_9_armv7a_BeagleBone_Base_4GB.img image_mb: 3800 # Path to boot partition data (MLO, u-boot.img etc) -source_boot_directory: /sabayon/boot/arm/beaglebone +%env source_boot_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/boot/arm/beaglebone # External script that will generate the image file. # The same can be copied onto a MMC by using dd -image_generator_script: /sabayon/scripts/beaglebone_image_generator_script.sh +%env image_generator_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/beaglebone_image_generator_script.sh diff --git a/molecules/sabayon-arm-efikamx-4G.spec b/molecules/sabayon-arm-efikamx-4G.spec index 971f488..0430cad 100644 --- a/molecules/sabayon-arm-efikamx-4G.spec +++ b/molecules/sabayon-arm-efikamx-4G.spec @@ -1,5 +1,5 @@ -%import /sabayon/molecules/arm-base.common -%import /sabayon/molecules/efikamx-showcase.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/arm-base.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/efikamx-showcase.common # Release desc (the actual release description) release_desc: armv7a Efika MX @@ -17,8 +17,8 @@ image_name: Sabayon_Linux_9_armv7a_EfikaMX_4GB.img image_mb: 3800 # Path to boot partition data (MLO, u-boot.img etc) -source_boot_directory: /sabayon/boot/arm/efikamx +%env source_boot_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/boot/arm/efikamx # External script that will generate the image file. # The same can be copied onto a MMC by using dd -image_generator_script: /sabayon/scripts/efikamx_image_generator_script.sh +%env image_generator_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/efikamx_image_generator_script.sh diff --git a/molecules/sabayon-arm-efikamx-base-4G.spec b/molecules/sabayon-arm-efikamx-base-4G.spec index f85cb84..64763a9 100644 --- a/molecules/sabayon-arm-efikamx-base-4G.spec +++ b/molecules/sabayon-arm-efikamx-base-4G.spec @@ -1,5 +1,5 @@ -%import /sabayon/molecules/arm-base.common -%import /sabayon/molecules/efikamx-base.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/arm-base.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/efikamx-base.common # Release desc (the actual release description) release_desc: armv7a Efika MX @@ -17,8 +17,8 @@ image_name: Sabayon_Linux_9_armv7a_EfikaMX_Base_4GB.img image_mb: 3800 # Path to boot partition data (MLO, u-boot.img etc) -source_boot_directory: /sabayon/boot/arm/efikamx +%env source_boot_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/boot/arm/efikamx # External script that will generate the image file. # The same can be copied onto a MMC by using dd -image_generator_script: /sabayon/scripts/efikamx_image_generator_script.sh +%env image_generator_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/efikamx_image_generator_script.sh diff --git a/molecules/sabayon-arm-pandaboard-4G.spec b/molecules/sabayon-arm-pandaboard-4G.spec index 9903db8..47cbc08 100644 --- a/molecules/sabayon-arm-pandaboard-4G.spec +++ b/molecules/sabayon-arm-pandaboard-4G.spec @@ -1,5 +1,5 @@ -%import /sabayon/molecules/arm-base.common -%import /sabayon/molecules/pandaboard.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/arm-base.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/pandaboard.common # Release desc (the actual release description) release_desc: armv7a PandaBoard @@ -17,8 +17,8 @@ image_name: Sabayon_Linux_9_armv7a_PandaBoard_4GB.img image_mb: 3800 # Path to boot partition data (MLO, u-boot.img etc) -source_boot_directory: /sabayon/boot/arm/pandaboard +%env source_boot_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/boot/arm/pandaboard # External script that will generate the image file. # The same can be copied onto a MMC by using dd -image_generator_script: /sabayon/scripts/beagleboard_xm_image_generator_script.sh +%env image_generator_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/beagleboard_xm_image_generator_script.sh diff --git a/molecules/sabayon-arm-pandaboard-8G.spec b/molecules/sabayon-arm-pandaboard-8G.spec index 3437b97..9ef7ed6 100644 --- a/molecules/sabayon-arm-pandaboard-8G.spec +++ b/molecules/sabayon-arm-pandaboard-8G.spec @@ -1,5 +1,5 @@ -%import /sabayon/molecules/arm-base.common -%import /sabayon/molecules/pandaboard.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/arm-base.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/pandaboard.common # Release desc (the actual release description) release_desc: armv7a PandaBoard @@ -17,8 +17,8 @@ image_name: Sabayon_Linux_9_armv7a_PandaBoard_8GB.img image_mb: 7400 # Path to boot partition data (MLO, u-boot.img etc) -source_boot_directory: /sabayon/boot/arm/pandaboard +%env source_boot_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/boot/arm/pandaboard # External script that will generate the image file. # The same can be copied onto a MMC by using dd -image_generator_script: /sabayon/scripts/beagleboard_xm_image_generator_script.sh +%env image_generator_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/beagleboard_xm_image_generator_script.sh diff --git a/molecules/sabayon-armel-beagleboard-xm-4G.spec b/molecules/sabayon-armel-beagleboard-xm-4G.spec index 0942540..937bb1f 100644 --- a/molecules/sabayon-armel-beagleboard-xm-4G.spec +++ b/molecules/sabayon-armel-beagleboard-xm-4G.spec @@ -1,5 +1,5 @@ -%import /sabayon/molecules/armel-base.common -%import /sabayon/molecules/beagleboard-xm.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/armel-base.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/beagleboard-xm.common # Release desc (the actual release description) release_desc: armelv7a BeagleBoard xM @@ -17,8 +17,8 @@ image_name: Sabayon_Linux_9_armelv7a_BeagleBoard_xM_4GB.img image_mb: 3800 # Path to boot partition data (MLO, u-boot.img etc) -source_boot_directory: /sabayon/boot/arm/beagleboard-xm +%env source_boot_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/boot/arm/beagleboard-xm # External script that will generate the image file. # The same can be copied onto a MMC by using dd -image_generator_script: /sabayon/scripts/beagleboard_xm_image_generator_script.sh +%env image_generator_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/beagleboard_xm_image_generator_script.sh diff --git a/molecules/sabayon-armel-beagleboard-xm-8G.spec b/molecules/sabayon-armel-beagleboard-xm-8G.spec index 343da12..043f06b 100644 --- a/molecules/sabayon-armel-beagleboard-xm-8G.spec +++ b/molecules/sabayon-armel-beagleboard-xm-8G.spec @@ -1,5 +1,5 @@ -%import /sabayon/molecules/armel-base.common -%import /sabayon/molecules/beagleboard-xm.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/armel-base.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/beagleboard-xm.common # Release desc (the actual release description) release_desc: armelv7a BeagleBoard xM @@ -17,8 +17,8 @@ image_name: Sabayon_Linux_9_armelv7a_BeagleBoard_xM_8GB.img image_mb: 7400 # Path to boot partition data (MLO, u-boot.img etc) -source_boot_directory: /sabayon/boot/arm/beagleboard-xm +%env source_boot_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/boot/arm/beagleboard-xm # External script that will generate the image file. # The same can be copied onto a MMC by using dd -image_generator_script: /sabayon/scripts/beagleboard_xm_image_generator_script.sh +%env image_generator_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/beagleboard_xm_image_generator_script.sh diff --git a/molecules/sabayon-armel-beaglebone-base-2G.spec b/molecules/sabayon-armel-beaglebone-base-2G.spec index ffd9850..eec8e6f 100644 --- a/molecules/sabayon-armel-beaglebone-base-2G.spec +++ b/molecules/sabayon-armel-beaglebone-base-2G.spec @@ -1,5 +1,5 @@ -%import /sabayon/molecules/armel-base.common -%import /sabayon/molecules/beaglebone.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/armel-base.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/beaglebone.common # Release desc (the actual release description) release_desc: armelv7a BeagleBone @@ -17,8 +17,8 @@ image_name: Sabayon_Linux_9_armelv7a_BeagleBone_Base_2GB.img image_mb: 2000 # Path to boot partition data (MLO, u-boot.img etc) -source_boot_directory: /sabayon/boot/arm/beaglebone +%env source_boot_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/boot/arm/beaglebone # External script that will generate the image file. # The same can be copied onto a MMC by using dd -image_generator_script: /sabayon/scripts/beaglebone_image_generator_script.sh +%env image_generator_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/beaglebone_image_generator_script.sh diff --git a/molecules/sabayon-armel-beaglebone-base-4G.spec b/molecules/sabayon-armel-beaglebone-base-4G.spec index d34bc47..38d6d7f 100644 --- a/molecules/sabayon-armel-beaglebone-base-4G.spec +++ b/molecules/sabayon-armel-beaglebone-base-4G.spec @@ -1,5 +1,5 @@ -%import /sabayon/molecules/armel-base.common -%import /sabayon/molecules/beaglebone.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/armel-base.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/beaglebone.common # Release desc (the actual release description) release_desc: armelv7a BeagleBone @@ -17,8 +17,8 @@ image_name: Sabayon_Linux_9_armelv7a_BeagleBone_Base_4GB.img image_mb: 3800 # Path to boot partition data (MLO, u-boot.img etc) -source_boot_directory: /sabayon/boot/arm/beaglebone +%env source_boot_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/boot/arm/beaglebone # External script that will generate the image file. # The same can be copied onto a MMC by using dd -image_generator_script: /sabayon/scripts/beaglebone_image_generator_script.sh +%env image_generator_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/beaglebone_image_generator_script.sh diff --git a/molecules/sabayon-armel-pandaboard-4G.spec b/molecules/sabayon-armel-pandaboard-4G.spec index d11c995..3526fd6 100644 --- a/molecules/sabayon-armel-pandaboard-4G.spec +++ b/molecules/sabayon-armel-pandaboard-4G.spec @@ -1,5 +1,5 @@ -%import /sabayon/molecules/armel-base.common -%import /sabayon/molecules/pandaboard.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/armel-base.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/pandaboard.common # Release desc (the actual release description) release_desc: armelv7a PandaBoard @@ -17,8 +17,8 @@ image_name: Sabayon_Linux_9_armelv7a_PandaBoard_4GB.img image_mb: 3800 # Path to boot partition data (MLO, u-boot.img etc) -source_boot_directory: /sabayon/boot/arm/pandaboard +%env source_boot_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/boot/arm/pandaboard # External script that will generate the image file. # The same can be copied onto a MMC by using dd -image_generator_script: /sabayon/scripts/beagleboard_xm_image_generator_script.sh +%env image_generator_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/beagleboard_xm_image_generator_script.sh diff --git a/molecules/sabayon-armel-pandaboard-8G.spec b/molecules/sabayon-armel-pandaboard-8G.spec index 6bbcd19..558598c 100644 --- a/molecules/sabayon-armel-pandaboard-8G.spec +++ b/molecules/sabayon-armel-pandaboard-8G.spec @@ -1,5 +1,5 @@ -%import /sabayon/molecules/armel-base.common -%import /sabayon/molecules/pandaboard.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/armel-base.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/pandaboard.common # Release desc (the actual release description) release_desc: armelv7a PandaBoard @@ -17,8 +17,8 @@ image_name: Sabayon_Linux_9_armelv7a_PandaBoard_8GB.img image_mb: 7400 # Path to boot partition data (MLO, u-boot.img etc) -source_boot_directory: /sabayon/boot/arm/pandaboard +%env source_boot_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/boot/arm/pandaboard # External script that will generate the image file. # The same can be copied onto a MMC by using dd -image_generator_script: /sabayon/scripts/beagleboard_xm_image_generator_script.sh +%env image_generator_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/beagleboard_xm_image_generator_script.sh diff --git a/molecules/sabayon-x86-awesome.spec b/molecules/sabayon-x86-awesome.spec index f3afa8d..6434da0 100644 --- a/molecules/sabayon-x86-awesome.spec +++ b/molecules/sabayon-x86-awesome.spec @@ -1,5 +1,5 @@ # Use abs path, otherwise daily iso build won't work -%import /sabayon/molecules/awesome.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/awesome.common prechroot: linux32 @@ -10,7 +10,7 @@ release_version: 9 release_desc: x86 Awesome # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso # Destination ISO image name, call whatever you want.iso, not mandatory destination_iso_image_name: Sabayon_Linux_9_x86_Awesome.iso diff --git a/molecules/sabayon-x86-corecdx.spec b/molecules/sabayon-x86-corecdx.spec index a09df0d..6ac53f6 100644 --- a/molecules/sabayon-x86-corecdx.spec +++ b/molecules/sabayon-x86-corecdx.spec @@ -1,5 +1,5 @@ # use abs path, otherwise daily iso build automagic won't work -%import /sabayon/molecules/corecdx.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/corecdx.common release_version: 9 release_desc: x86 CoreCDX @@ -9,7 +9,7 @@ release_desc: x86 CoreCDX prechroot: linux32 # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso # Destination ISO image name, call whatever you want.iso, not mandatory destination_iso_image_name: Sabayon_Linux_CoreCDX_9_x86.iso diff --git a/molecules/sabayon-x86-e17.spec b/molecules/sabayon-x86-e17.spec index d9d10d6..cbdb2e6 100644 --- a/molecules/sabayon-x86-e17.spec +++ b/molecules/sabayon-x86-e17.spec @@ -1,5 +1,5 @@ # Use abs path, otherwise daily builds automagic won't work -%import /sabayon/molecules/e17.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/e17.common # Release Version release_version: 9 @@ -11,7 +11,7 @@ release_desc: x86 E17 prechroot: linux32 # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso # Destination ISO image name, call whatever you want.iso, not mandatory destination_iso_image_name: Sabayon_Linux_9_x86_E17.iso diff --git a/molecules/sabayon-x86-gaming.spec b/molecules/sabayon-x86-gaming.spec index 3118823..b0e0e6d 100644 --- a/molecules/sabayon-x86-gaming.spec +++ b/molecules/sabayon-x86-gaming.spec @@ -1,5 +1,5 @@ # Use abs path, otherwise daily builds automagic won't work -%import /sabayon/molecules/gaming.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/gaming.common # This is 32bit prechroot: linux32 @@ -11,7 +11,7 @@ release_version: 9 release_desc: x86 Gaming Edition # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_DAILY_x86_G.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_DAILY_x86_G.iso # Destination ISO image name, call whatever you want.iso, not mandatory destination_iso_image_name: Sabayon_Linux_9_x86_Gaming.iso diff --git a/molecules/sabayon-x86-gnome.spec b/molecules/sabayon-x86-gnome.spec index d8f6289..3febfa7 100644 --- a/molecules/sabayon-x86-gnome.spec +++ b/molecules/sabayon-x86-gnome.spec @@ -1,5 +1,5 @@ # Use abs path, otherwise daily builds automagic won't work -%import /sabayon/molecules/gnome.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/gnome.common prechroot: linux32 @@ -10,7 +10,7 @@ release_version: 9 release_desc: x86 GNOME # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso # Destination ISO image name, call whatever you want.iso, not mandatory destination_iso_image_name: Sabayon_Linux_9_x86_G.iso diff --git a/molecules/sabayon-x86-kde.spec b/molecules/sabayon-x86-kde.spec index 6863aa3..a5e412f 100644 --- a/molecules/sabayon-x86-kde.spec +++ b/molecules/sabayon-x86-kde.spec @@ -1,5 +1,5 @@ # Use abs path, otherwise daily builds automagic won't work -%import /sabayon/molecules/kde.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/kde.common prechroot: linux32 @@ -10,7 +10,7 @@ release_version: 9 release_desc: x86 KDE # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso # Destination ISO image name, call whatever you want.iso, not mandatory destination_iso_image_name: Sabayon_Linux_9_x86_K.iso diff --git a/molecules/sabayon-x86-lxde.spec b/molecules/sabayon-x86-lxde.spec index 47eb916..2188a2f 100644 --- a/molecules/sabayon-x86-lxde.spec +++ b/molecules/sabayon-x86-lxde.spec @@ -1,5 +1,5 @@ # Use abs path, otherwise daily builds automagic won't work -%import /sabayon/molecules/lxde.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/lxde.common # Release Version release_version: 9 @@ -11,7 +11,7 @@ release_desc: x86 LXDE prechroot: linux32 # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso # Destination ISO image name, call whatever you want.iso, not mandatory destination_iso_image_name: Sabayon_Linux_9_x86_LXDE.iso diff --git a/molecules/sabayon-x86-mate.spec b/molecules/sabayon-x86-mate.spec index 851e869..652d1ee 100644 --- a/molecules/sabayon-x86-mate.spec +++ b/molecules/sabayon-x86-mate.spec @@ -1,5 +1,5 @@ # Use abs path, otherwise daily builds automagic won't work -%import /sabayon/molecules/mate.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/mate.common prechroot: linux32 @@ -10,7 +10,7 @@ release_version: 9 release_desc: amd64 MATE # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso # Destination ISO image name, call whatever you want.iso, not mandatory destination_iso_image_name: Sabayon_Linux_9_x86_MATE.iso diff --git a/molecules/sabayon-x86-serverbase.spec b/molecules/sabayon-x86-serverbase.spec index 0bb91e9..70cc2a9 100644 --- a/molecules/sabayon-x86-serverbase.spec +++ b/molecules/sabayon-x86-serverbase.spec @@ -1,5 +1,5 @@ # use abs path, otherwise daily iso build automagic won't work -%import /sabayon/molecules/serverbase.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/serverbase.common release_version: 9 release_desc: x86 ServerBase @@ -9,7 +9,7 @@ release_desc: x86 ServerBase prechroot: linux32 # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso # Destination ISO image name, call whatever you want.iso, not mandatory destination_iso_image_name: Sabayon_Linux_ServerBase_9_x86.iso diff --git a/molecules/sabayon-x86-spinbase-amazon-ami-template.spec b/molecules/sabayon-x86-spinbase-amazon-ami-template.spec index 7335c25..bf4fbca 100644 --- a/molecules/sabayon-x86-spinbase-amazon-ami-template.spec +++ b/molecules/sabayon-x86-spinbase-amazon-ami-template.spec @@ -1,13 +1,13 @@ # Use abs path, otherwise daily builds automagic won't work # For further documentation, see the file above: -%import /sabayon/molecules/spinbase-amazon-ami-image-template.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/spinbase-amazon-ami-image-template.common # pre chroot command, example, for 32bit chroots on 64bit system, you always # have to append "linux32" this is useful for inner_chroot_script prechroot: linux32 # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso release_version: 9 image_name: Sabayon_Linux_SpinBase_9_x86_ami.img diff --git a/molecules/sabayon-x86-spinbase-amazon-ebs-image.spec b/molecules/sabayon-x86-spinbase-amazon-ebs-image.spec index a331dc3..8e97504 100644 --- a/molecules/sabayon-x86-spinbase-amazon-ebs-image.spec +++ b/molecules/sabayon-x86-spinbase-amazon-ebs-image.spec @@ -1,12 +1,12 @@ # Use abs path, otherwise daily builds automagic won't work -%import /sabayon/molecules/spinbase-amazon-ami-ebs-image.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/spinbase-amazon-ami-ebs-image.common # pre chroot command, example, for 32bit chroots on 64bit system, you always # have to append "linux32" this is useful for inner_chroot_script prechroot: linux32 # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso release_version: 9 tar_name: Sabayon_Linux_SpinBase_9_x86_Amazon_EBS_ext4_filesystem_image.tar.gz diff --git a/molecules/sabayon-x86-spinbase-openvz-template.spec b/molecules/sabayon-x86-spinbase-openvz-template.spec index 832afd4..8fc2c40 100644 --- a/molecules/sabayon-x86-spinbase-openvz-template.spec +++ b/molecules/sabayon-x86-spinbase-openvz-template.spec @@ -1,12 +1,12 @@ # Use abs path, otherwise daily builds automagic won't work -%import /sabayon/molecules/spinbase-openvz-template.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/spinbase-openvz-template.common # pre chroot command, example, for 32bit chroots on 64bit system, you always # have to append "linux32" this is useful for inner_chroot_script prechroot: linux32 # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso release_version: 9 tar_name: Sabayon_Linux_SpinBase_9_x86_openvz.tar.gz diff --git a/molecules/sabayon-x86-xfce.spec b/molecules/sabayon-x86-xfce.spec index 7b0398d..5a30275 100644 --- a/molecules/sabayon-x86-xfce.spec +++ b/molecules/sabayon-x86-xfce.spec @@ -1,5 +1,5 @@ # Use abs path, otherwise daily builds automagic won't work -%import /sabayon/molecules/xfce.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/xfce.common # Release Version release_version: 9 @@ -11,7 +11,7 @@ release_desc: x86 Xfce prechroot: linux32 # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso # Destination ISO image name, call whatever you want.iso, not mandatory destination_iso_image_name: Sabayon_Linux_9_x86_Xfce.iso diff --git a/molecules/sabayon-x86-xfceforensic.spec b/molecules/sabayon-x86-xfceforensic.spec index 8573248..a1d5030 100644 --- a/molecules/sabayon-x86-xfceforensic.spec +++ b/molecules/sabayon-x86-xfceforensic.spec @@ -1,5 +1,5 @@ # Use abs path, otherwise daily builds automagic won't work -%import /sabayon/molecules/forensicxfce.common +%env %import ${SABAYON_MOLECULE_HOME:-/sabayon}/molecules/forensicxfce.common prechroot: linux32 @@ -10,6 +10,6 @@ release_version: 9 release_desc: x86 ForensicsXfce # Path to source ISO file (MANDATORY) -source_iso: /sabayon/iso/Sabayon_Linux_DAILY_x86_Xfce.iso +%env source_iso: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso/Sabayon_Linux_DAILY_x86_Xfce.iso destination_iso_image_name: Sabayon_Linux_DAILY_x86_ForensicsXfce.iso diff --git a/molecules/serverbase.common b/molecules/serverbase.common index c108f03..10596b5 100644 --- a/molecules/serverbase.common +++ b/molecules/serverbase.common @@ -13,33 +13,33 @@ release_file: /etc/sabayon-edition # Outer chroot script command, to be executed outside destination chroot before # before entering it (and before inner_chroot_script) -outer_chroot_script: /sabayon/scripts/remaster_pre.sh +%env outer_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_pre.sh # Execute repositories update here, in a more fault-tolerant flavor -inner_chroot_script: /sabayon/scripts/remaster_generic_inner_chroot_script.sh +%env inner_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script.sh # Inner chroot script command, to be executed inside destination chroot after # packages installation and removal -inner_chroot_script_after: /sabayon/scripts/remaster_serverbase_inner_chroot_script_after.sh +%env inner_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_serverbase_inner_chroot_script_after.sh # Outer chroot script command, to be executed outside destination chroot before # before entering it (and AFTER inner_chroot_script) -outer_chroot_script_after: /sabayon/scripts/remaster_post.sh +%env outer_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_post.sh # Used to umount /proc and unbind packages dir -error_script: /sabayon/scripts/remaster_error_script.sh +%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 # Pre-ISO building script. Hook to be able to copy kernel images in place, for example -pre_iso_script: /sabayon/scripts/generic_pre_iso_script.sh ServerBase +%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh ServerBase # Post-ISO building script, called after ISO image generation. -post_iso_script: /sabayon/scripts/generic_post_iso_script.sh +%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh # Destination directory for the ISO image path (MANDATORY) -destination_iso_directory: /sabayon/iso +%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso packages_to_add: sys-kernel/linux-server diff --git a/molecules/spinbase-amazon-ami-ebs-image.common b/molecules/spinbase-amazon-ami-ebs-image.common index c60e7cf..02c0c61 100644 --- a/molecules/spinbase-amazon-ami-ebs-image.common +++ b/molecules/spinbase-amazon-ami-ebs-image.common @@ -5,33 +5,33 @@ execution_strategy: iso_to_tar # to terminate the execution # Variables exported: # LOOP_DEVICE = loop device (/dev/loopN) currently in use -error_script: /sabayon/scripts/image_error_script.sh +%env error_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/image_error_script.sh # Outer chroot script command, to be executed outside destination chroot before # before entering it (and before inner_chroot_script) -outer_chroot_script: /sabayon/scripts/remaster_pre.sh +%env outer_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_pre.sh # Inner chroot script command, to be executed inside destination chroot before # packing it -inner_chroot_script: /sabayon/scripts/amazon_ebs_image_inner_chroot_script.sh +%env inner_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/amazon_ebs_image_inner_chroot_script.sh # Inner chroot script command, to be executed inside destination chroot after # packages installation and removal -inner_chroot_script_after: /sabayon/scripts/amazon_ebs_image_inner_chroot_script_after.sh +%env inner_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/amazon_ebs_image_inner_chroot_script_after.sh # Outer chroot script command, to be executed outside destination chroot before # before entering it (and AFTER inner_chroot_script) -outer_chroot_script_after: /sabayon/scripts/amazon_ebs_image_remaster_post.sh +%env outer_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/amazon_ebs_image_remaster_post.sh # Pre-tar building script. Hook called before tar file creation # Variables exported: # CHROOT_DIR = path pointing to the working chroot (the one that gets modified) # TAR_PATH = path pointing to the destination tar file # TAR_CHECKSUM_PATH = path pointing to the destination tar file checksum (md5) -pre_tar_script: /sabayon/scripts/amazon_ebs_image_pre_tar_script.sh +%env pre_tar_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/amazon_ebs_image_pre_tar_script.sh # Destination directory for the image path (MANDATORY) -destination_tar_directory: /sabayon/images +%env destination_tar_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/images # Compression method (default is: gz). Supported compression methods: gz, bz2 # compression_method: gz diff --git a/molecules/spinbase-amazon-ami-image-template.common b/molecules/spinbase-amazon-ami-image-template.common index 49574d6..00e230d 100644 --- a/molecules/spinbase-amazon-ami-image-template.common +++ b/molecules/spinbase-amazon-ami-image-template.common @@ -16,39 +16,39 @@ execution_strategy: iso_to_image # to terminate the execution # Variables exported: # LOOP_DEVICE = loop device (/dev/loopN) currently in use -error_script: /sabayon/scripts/image_error_script.sh +%env error_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/image_error_script.sh # Outer chroot script command, to be executed outside destination chroot before # before entering it (and before inner_chroot_script) -outer_chroot_script: /sabayon/scripts/remaster_pre.sh +%env outer_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_pre.sh # Inner chroot script command, to be executed inside destination chroot before # packing it -inner_chroot_script: /sabayon/scripts/remaster_generic_inner_chroot_script.sh +%env inner_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script.sh # Inner chroot script command, to be executed inside destination chroot after # packages installation and removal -inner_chroot_script_after: /sabayon/scripts/image_generic_inner_chroot_script_after.sh +%env inner_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/image_generic_inner_chroot_script_after.sh # Outer chroot script command, to be executed outside destination chroot before # before entering it (and AFTER inner_chroot_script) -outer_chroot_script_after: /sabayon/scripts/image_remaster_post.sh +%env outer_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/image_remaster_post.sh # Pre-image building script. Hook called before image file creation # Variables exported: # TMP_IMAGE_PATH = path pointing to the temporary destination image file # LOOP_DEVICE = loop device (/dev/loopN) currently in use -# pre_image_script: /sabayon/scripts/pre_image_script.sh +# %env pre_image_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/pre_image_script.sh # Post-image building script. Hook called after image file creation and move # into destination directory. # Variables exported: # IMAGE_PATH = path pointing to the destination image file # IMAGE_CHECKSUM_PATH = path pointing to the destination image file checksum (md5) -# post_image_script: /sabayon/scripts/post_image_script.sh +# %env post_image_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/post_image_script.sh # Destination directory for the image path (MANDATORY) -destination_image_directory: /sabayon/images +%env destination_image_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/images # Specify an alternative image file name (image file name will be automatically # produced otherwise) diff --git a/molecules/spinbase-openvz-template.common b/molecules/spinbase-openvz-template.common index 7ebd293..4b6cc5c 100644 --- a/molecules/spinbase-openvz-template.common +++ b/molecules/spinbase-openvz-template.common @@ -15,11 +15,11 @@ execution_strategy: iso_to_tar # Inner chroot script command, to be executed inside destination chroot before packing it # - kmerge.sh - setup kernel bins -# inner_chroot_script: /sabayon/scripts/openvz_inner_chroot_script.sh +# %env inner_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/openvz_inner_chroot_script.sh # Inner chroot script command, to be executed inside destination chroot after # packages installation and removal -inner_chroot_script_after: /sabayon/scripts/tar_generic_inner_chroot_script_after.sh +%env inner_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/tar_generic_inner_chroot_script_after.sh # Outer chroot script command, to be executed outside destination chroot before # before entering it (and AFTER inner_chroot_script) @@ -30,10 +30,10 @@ inner_chroot_script_after: /sabayon/scripts/tar_generic_inner_chroot_script_afte # CHROOT_DIR = path pointing to the working chroot (the one that gets modified) # TAR_PATH = path pointing to the destination tar file # TAR_CHECKSUM_PATH = path pointing to the destination tar file checksum (md5) -pre_tar_script: /sabayon/scripts/spinbase_openvz_pre_tar_script.sh +%env pre_tar_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/spinbase_openvz_pre_tar_script.sh # Destination directory for the ISO image path (MANDATORY) -destination_tar_directory: /sabayon/iso +%env destination_tar_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso # Compression method (default is: gz). Supported compression methods: gz, bz2 # compression_method: gz diff --git a/molecules/spinbase.common b/molecules/spinbase.common index fe9e3eb..e35c6d7 100644 --- a/molecules/spinbase.common +++ b/molecules/spinbase.common @@ -16,7 +16,7 @@ extra_rsync_parameters: --one-file-system --exclude /proc --exclude /dev/pts # Inner chroot script command, to be executed inside destination chroot before packing it # - kmerge.sh - setup kernel bins -# inner_chroot_script: /sabayon/scripts/inner_chroot_script.sh +# %env inner_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/inner_chroot_script.sh %env inner_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/inner_chroot_script.sh spinbase # Destination LiveCD root directory, where files are placed before getting mkisofs'ed diff --git a/molecules/xfce.common b/molecules/xfce.common index 6cbaefe..6f2b6ab 100644 --- a/molecules/xfce.common +++ b/molecules/xfce.common @@ -13,33 +13,33 @@ iso_title: Sabayon Xfce # Outer chroot script command, to be executed outside destination chroot before # before entering it (and before inner_chroot_script) -outer_chroot_script: /sabayon/scripts/remaster_pre.sh +%env outer_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_pre.sh # Execute repositories update here, in a more fault-tolerant flavor -inner_chroot_script: /sabayon/scripts/remaster_generic_inner_chroot_script.sh +%env inner_chroot_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script.sh # Inner chroot script command, to be executed inside destination chroot after # packages installation and removal -inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh xfce +%env inner_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script_after.sh xfce # Outer chroot script command, to be executed outside destination chroot before # before entering it (and AFTER inner_chroot_script) -outer_chroot_script_after: /sabayon/scripts/remaster_post.sh +%env outer_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_post.sh # Used to umount /proc and unbind packages dir -error_script: /sabayon/scripts/remaster_error_script.sh +%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 # Pre-ISO building script. Hook to be able to copy kernel images in place, for example -pre_iso_script: /sabayon/scripts/generic_pre_iso_script.sh Xfce +%env pre_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_pre_iso_script.sh Xfce # Post-ISO building script, called after ISO image generation. -post_iso_script: /sabayon/scripts/generic_post_iso_script.sh +%env post_iso_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/generic_post_iso_script.sh # Destination directory for the ISO image path (MANDATORY) -destination_iso_directory: /sabayon/iso +%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso # List of packages that would be removed from chrooted system (comma separated) # packages_to_remove: