From dd98f0c2a65851d044b107fb332a879971ee844c Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 26 May 2013 21:53:43 +0200 Subject: [PATCH] [molecules] use /sabayon/iso for arm images as well This path is hardcoded into build_iso.sh and makes the --push flag work. --- molecules/arm-base.common | 2 +- molecules/spinbase-amazon-ami-ebs-image.common | 2 +- molecules/spinbase-amazon-ami-image-template.common | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/molecules/arm-base.common b/molecules/arm-base.common index d98f984..2b63af7 100644 --- a/molecules/arm-base.common +++ b/molecules/arm-base.common @@ -47,7 +47,7 @@ execution_strategy: chroot_to_mmc %env post_image_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/post_mmc_image_script.sh # Destination directory for the image path (MANDATORY) -%env destination_image_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/images +%env destination_image_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso # Path to source chroot (mandatory) %env source_chroot: ${SABAYON_MOLECULE_HOME:-/sabayon}/sources/armv7l_core-2012 diff --git a/molecules/spinbase-amazon-ami-ebs-image.common b/molecules/spinbase-amazon-ami-ebs-image.common index 02c0c61..9ca23a9 100644 --- a/molecules/spinbase-amazon-ami-ebs-image.common +++ b/molecules/spinbase-amazon-ami-ebs-image.common @@ -31,7 +31,7 @@ execution_strategy: iso_to_tar %env pre_tar_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/amazon_ebs_image_pre_tar_script.sh # Destination directory for the image path (MANDATORY) -%env destination_tar_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/images +%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-amazon-ami-image-template.common b/molecules/spinbase-amazon-ami-image-template.common index 00e230d..90e374b 100644 --- a/molecules/spinbase-amazon-ami-image-template.common +++ b/molecules/spinbase-amazon-ami-image-template.common @@ -48,7 +48,7 @@ execution_strategy: iso_to_image # %env post_image_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/post_image_script.sh # Destination directory for the image path (MANDATORY) -%env destination_image_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/images +%env destination_image_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso # Specify an alternative image file name (image file name will be automatically # produced otherwise)