From b36a548e7f65dc546b23a617da0ec9138e1fabbf Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Thu, 30 May 2013 10:46:36 +0200 Subject: [PATCH] [molecules] fix BeagleBoard xM and PandaBoard molecule scripts --- molecules/sabayon-arm-pandaboard-4G.spec | 2 +- ...tor_script.sh => beagleboard_image_generator_script.sh} | 5 ++--- scripts/pandaboard_image_generator_script.sh | 7 +++++++ 3 files changed, 10 insertions(+), 4 deletions(-) rename scripts/{beagleboard_xm_image_generator_script.sh => beagleboard_image_generator_script.sh} (61%) create mode 100755 scripts/pandaboard_image_generator_script.sh diff --git a/molecules/sabayon-arm-pandaboard-4G.spec b/molecules/sabayon-arm-pandaboard-4G.spec index e6781e8..7409148 100644 --- a/molecules/sabayon-arm-pandaboard-4G.spec +++ b/molecules/sabayon-arm-pandaboard-4G.spec @@ -21,4 +21,4 @@ image_mb: 3800 # External script that will generate the image file. # The same can be copied onto a MMC by using dd -%env image_generator_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/beagleboard_xm_image_generator_script.sh +%env image_generator_script: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/pandaboard_image_generator_script.sh diff --git a/scripts/beagleboard_xm_image_generator_script.sh b/scripts/beagleboard_image_generator_script.sh similarity index 61% rename from scripts/beagleboard_xm_image_generator_script.sh rename to scripts/beagleboard_image_generator_script.sh index 479f69e..1b06e56 100755 --- a/scripts/beagleboard_xm_image_generator_script.sh +++ b/scripts/beagleboard_image_generator_script.sh @@ -8,6 +8,5 @@ export SABAYON_MOLECULE_HOME export DTB_FILES="${1}" shift -# rootfs and bootfs tarball is generated by beaglebone image -export MAKE_TARBALL="0" -exec "${SABAYON_MOLECULE_HOME}"/scripts/mkloopcard.sh "${SABAYON_MOLECULE_HOME}"/scripts/mkloopcard_beagleboard_xm_chroot_hook.sh "$@" +export MAKE_TARBALL="1" +exec "${SABAYON_MOLECULE_HOME}"/scripts/mkloopcard.sh "${SABAYON_MOLECULE_HOME}"/scripts/mkloopcard_beagleboard_chroot_hook.sh "$@" diff --git a/scripts/pandaboard_image_generator_script.sh b/scripts/pandaboard_image_generator_script.sh new file mode 100755 index 0000000..c85f74c --- /dev/null +++ b/scripts/pandaboard_image_generator_script.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +# Path to molecules.git dir +SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}" +export SABAYON_MOLECULE_HOME + +exec "${SABAYON_MOLECULE_HOME}"/scripts/mkloopcard.sh "${SABAYON_MOLECULE_HOME}"/scripts/mkloopcard_beagleboard_chroot_hook.sh "$@"