summaryrefslogtreecommitdiff
path: root/scripts/build/binary_disk
diff options
context:
space:
mode:
authorDaniel Baumann <mail@daniel-baumann.ch>2014-12-10 07:39:58 +0100
committerDaniel Baumann <mail@daniel-baumann.ch>2014-12-10 07:39:58 +0100
commit1f7f6dd88a36403c0bc877ee6c4a58f7acfc2034 (patch)
treeb98ff62505af2e1d3b2e0e394ffb92f81239cfec /scripts/build/binary_disk
parent7b6dfd9d167b5ef09c6c1812f17e6df302f45897 (diff)
downloadvyos-live-build-1f7f6dd88a36403c0bc877ee6c4a58f7acfc2034.tar.gz
vyos-live-build-1f7f6dd88a36403c0bc877ee6c4a58f7acfc2034.zip
Cleaning up from python removal (LIVE_IMAGE_ARCHITECTURE).
Diffstat (limited to 'scripts/build/binary_disk')
-rwxr-xr-xscripts/build/binary_disk8
1 files changed, 4 insertions, 4 deletions
diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk
index 2184a3f9b..a784049f6 100755
--- a/scripts/build/binary_disk
+++ b/scripts/build/binary_disk
@@ -48,7 +48,7 @@ Create_lockfile .lock
mkdir -p binary/.disk
-ARCHITECTURE="$(echo ${LIVE_IMAGE_ARCHITECTURE} | sed -e 's| |/|g')"
+ARCHITECTURE="$(echo ${LB_ARCHITECTURES} | sed -e 's| |/|g')"
DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | cut -b 1 | tr '[a-z]' '[A-Z]')"
DISTRIBUTION="${DISTRIBUTION}$(echo ${LB_DISTRIBUTION} | cut -b 2-)"
eval VERSION="$`echo RELEASE_${LB_DISTRIBUTION}`"
@@ -133,7 +133,7 @@ case "${LB_DEBIAN_INSTALLER}" in
do
if [ -e "${LOCATION}" ]
then
- cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LIVE_IMAGE_ARCHITECTURE}_udeb_include" binary/.disk/udeb_include
+ cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_udeb_include" binary/.disk/udeb_include
continue
fi
@@ -158,7 +158,7 @@ case "${LB_DEBIAN_INSTALLER}" in
do
if [ -e "${LOCATION}" ]
then
- cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LIVE_IMAGE_ARCHITECTURE}_netinst_udeb_include" binary/.disk/udeb_include
+ cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_netinst_udeb_include" binary/.disk/udeb_include
continue
fi
@@ -181,7 +181,7 @@ case "${LB_DEBIAN_INSTALLER}" in
do
if [ -e "${LOCATION}" ]
then
- cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LIVE_IMAGE_ARCHITECTURE}_businesscard_udeb_include" binary/.disk/udeb_include
+ cp "${LOCATION}/${LB_PARENT_DISTRIBUTION}/${LB_ARCHITECTURES}_businesscard_udeb_include" binary/.disk/udeb_include
continue
fi