From 4c67f10e33599e9fa3f795f082f61f0db22a8a9e Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Wed, 25 Jan 2012 17:16:48 +0100 Subject: [PATCH] [molecules/*] rename sabayon-arm-base to sabayon-arm-beaglebone-base This in order to make room for the BeagleBoard xM and others ;-) --- molecules/arm-base.common | 3 --- ...16G.spec => sabayon-arm-beaglebone-base-16G.spec} | 6 +++++- ...e-4G.spec => sabayon-arm-beaglebone-base-4G.spec} | 6 +++++- ...e-8G.spec => sabayon-arm-beaglebone-base-8G.spec} | 6 +++++- scripts/iso_build.sh | 12 ++++++------ 5 files changed, 21 insertions(+), 12 deletions(-) rename molecules/{sabayon-arm-base-16G.spec => sabayon-arm-beaglebone-base-16G.spec} (73%) rename molecules/{sabayon-arm-base-4G.spec => sabayon-arm-beaglebone-base-4G.spec} (73%) rename molecules/{sabayon-arm-base-8G.spec => sabayon-arm-beaglebone-base-8G.spec} (73%) diff --git a/molecules/arm-base.common b/molecules/arm-base.common index aff0d82..9312f42 100644 --- a/molecules/arm-base.common +++ b/molecules/arm-base.common @@ -56,9 +56,6 @@ image_generator_script: /sabayon/scripts/mkloopcard.txt # Path to source chroot (mandatory) source_chroot: /sabayon/sources/armv7l_core-2012 -# Path to boot partition data (MLO, u-boot.img etc) -source_boot_directory: /sabayon/beaglebone/boot - # Release file that will be created onto the root filesystem release_file: /etc/sabayon-edition diff --git a/molecules/sabayon-arm-base-16G.spec b/molecules/sabayon-arm-beaglebone-base-16G.spec similarity index 73% rename from molecules/sabayon-arm-base-16G.spec rename to molecules/sabayon-arm-beaglebone-base-16G.spec index aea3239..3fce8c9 100644 --- a/molecules/sabayon-arm-base-16G.spec +++ b/molecules/sabayon-arm-beaglebone-base-16G.spec @@ -8,9 +8,13 @@ release_version: 8 # Specify image file name (image file name will be automatically # produced otherwise) -image_name: Sabayon_Linux_8_armv7a_Base_16GB.img +image_name: Sabayon_Linux_8_armv7a_BeagleBone_Base_16GB.img # Specify the image file size in Megabytes. This is mandatory. # To avoid runtime failure, make sure the image is large enough to fit your # chroot data. image_mb: 16000 + +# Path to boot partition data (MLO, u-boot.img etc) +source_boot_directory: /sabayon/beaglebone/boot + diff --git a/molecules/sabayon-arm-base-4G.spec b/molecules/sabayon-arm-beaglebone-base-4G.spec similarity index 73% rename from molecules/sabayon-arm-base-4G.spec rename to molecules/sabayon-arm-beaglebone-base-4G.spec index b266c0b..22e3b75 100644 --- a/molecules/sabayon-arm-base-4G.spec +++ b/molecules/sabayon-arm-beaglebone-base-4G.spec @@ -8,9 +8,13 @@ release_version: 8 # Specify image file name (image file name will be automatically # produced otherwise) -image_name: Sabayon_Linux_8_armv7a_Base_4GB.img +image_name: Sabayon_Linux_8_armv7a_BeagleBone_Base_4GB.img # Specify the image file size in Megabytes. This is mandatory. # To avoid runtime failure, make sure the image is large enough to fit your # chroot data. image_mb: 3800 + +# Path to boot partition data (MLO, u-boot.img etc) +source_boot_directory: /sabayon/beaglebone/boot + diff --git a/molecules/sabayon-arm-base-8G.spec b/molecules/sabayon-arm-beaglebone-base-8G.spec similarity index 73% rename from molecules/sabayon-arm-base-8G.spec rename to molecules/sabayon-arm-beaglebone-base-8G.spec index f1026f5..e395cdd 100644 --- a/molecules/sabayon-arm-base-8G.spec +++ b/molecules/sabayon-arm-beaglebone-base-8G.spec @@ -8,9 +8,13 @@ release_version: 8 # Specify image file name (image file name will be automatically # produced otherwise) -image_name: Sabayon_Linux_8_armv7a_Base_8GB.img +image_name: Sabayon_Linux_8_armv7a_BeagleBone_Base_8GB.img # Specify the image file size in Megabytes. This is mandatory. # To avoid runtime failure, make sure the image is large enough to fit your # chroot data. image_mb: 7800 + +# Path to boot partition data (MLO, u-boot.img etc) +source_boot_directory: /sabayon/beaglebone/boot + diff --git a/scripts/iso_build.sh b/scripts/iso_build.sh index 09fe281..178b79d 100755 --- a/scripts/iso_build.sh +++ b/scripts/iso_build.sh @@ -38,14 +38,14 @@ export LANGUAGE="en_US.UTF-8" if [ "${ACTION}" = "weekly" ]; then ARM_SOURCE_SPECS=( - "sabayon-arm-base-4G.spec" - "sabayon-arm-base-8G.spec" - "sabayon-arm-base-16G.spec" + "sabayon-arm-beaglebone-base-4G.spec" + "sabayon-arm-beaglebone-base-8G.spec" + "sabayon-arm-beaglebone-base-16G.spec" ) ARM_SOURCE_SPECS_IMG=( - "Sabayon_Linux_DAILY_armv7a_Base_4GB.img" - "Sabayon_Linux_DAILY_armv7a_Base_8GB.img" - "Sabayon_Linux_DAILY_armv7a_Base_16GB.img" + "Sabayon_Linux_DAILY_armv7a_BeagleBone_Base_4GB.img" + "Sabayon_Linux_DAILY_armv7a_BeagleBone_Base_8GB.img" + "Sabayon_Linux_DAILY_armv7a_BeagleBone_Base_16GB.img" ) SOURCE_SPECS=() SOURCE_SPECS_ISO=()