diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-12-19 11:16:57 +0100 |
|---|---|---|
| committer | Daniel Baumann <mail@daniel-baumann.ch> | 2013-05-06 14:50:03 +0200 |
| commit | 64994422120e4378ab4c67950297eedd0460ebcd (patch) | |
| tree | 9f465bb754bf921d214b76b543540f6965f96851 /scripts/build/config | |
| parent | f5acab633c5a8425987e472a40a113715891b301 (diff) | |
| download | vyos-live-build-64994422120e4378ab4c67950297eedd0460ebcd.tar.gz vyos-live-build-64994422120e4378ab4c67950297eedd0460ebcd.zip | |
Moving off binary image architecture into new config tree format.
Diffstat (limited to 'scripts/build/config')
| -rwxr-xr-x | scripts/build/config | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/scripts/build/config b/scripts/build/config index 17106e487..f97ae0ba3 100755 --- a/scripts/build/config +++ b/scripts/build/config @@ -370,7 +370,7 @@ Local_arguments () # config/bootstrap -a|--architectures) - LB_ARCHITECTURES="${2}" + LIVE_IMAGE_ARCHITECTURE="${2}" shift 2 ;; @@ -956,9 +956,9 @@ Check_defaults if [ ! -e config ] then - Echo_message "Creating config tree for a ${LB_MODE}/${LB_ARCHITECTURES} system" + Echo_message "Creating config tree for a ${LB_MODE}/${LIVE_IMAGE_ARCHITECTURE} system" else - Echo_message "Updating config tree for a ${LB_MODE}/${LB_ARCHITECTURES} system" + Echo_message "Updating config tree for a ${LB_MODE}/${LIVE_IMAGE_ARCHITECTURE} system" fi # Creating bootstrap configuration @@ -1108,10 +1108,6 @@ EOF cat > config/bootstrap << EOF # config/bootstrap - options for live-build(7), bootstrap stage -# \$LB_ARCHITECTURES: select chroot architectures -# (Default: autodetected) -LB_ARCHITECTURES="${LB_ARCHITECTURES}" - # \$LB_DISTRIBUTION: select distribution to use # (Default: ${LB_DISTRIBUTION}) LB_DISTRIBUTION="${LB_DISTRIBUTION}" @@ -1490,6 +1486,7 @@ Set_configuration "config/control" "Configuration-Version" "${LIVE_CONFIGURATION echo "" >> config/control Set_configuration "config/control" "Image" "binary" Set_configuration "config/control" "Type" "${LIVE_IMAGE_TYPE}" +Set_configuration "config/control" "Architecture" "${LIVE_IMAGE_ARCHITECTURE}" # Creating stage file Create_stagefile .build/config |