summaryrefslogtreecommitdiff
path: root/scripts/build/lb_binary_includes
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2010-12-05 14:27:08 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:20:37 +0100
commit51944c015f98cf25b3f8a51ccd35a8c77a674d27 (patch)
tree0f7cfc897e02a2194df886fdcdd6b8411d22daaf /scripts/build/lb_binary_includes
parentd703d361fc6b707934ac521516999d31c92e6bc7 (diff)
downloadvyos-live-build-51944c015f98cf25b3f8a51ccd35a8c77a674d27.tar.gz
vyos-live-build-51944c015f98cf25b3f8a51ccd35a8c77a674d27.zip
Renaming --architecture to --architectures in preparation for multi-arch.
Diffstat (limited to 'scripts/build/lb_binary_includes')
-rwxr-xr-xscripts/build/lb_binary_includes6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/build/lb_binary_includes b/scripts/build/lb_binary_includes
index 43c7a9930..8f2666460 100755
--- a/scripts/build/lb_binary_includes
+++ b/scripts/build/lb_binary_includes
@@ -62,7 +62,7 @@ then
fi
# Assemble architecture
-case "${LB_ARCHITECTURE}" in
+case "${LB_ARCHITECTURES}" in
amd64)
ARCH="amd"
;;
@@ -133,7 +133,7 @@ then
fi
# Adjusting install templates
- ARCHITECTURE="$(echo ${LB_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}`"
@@ -148,7 +148,7 @@ then
DEBIAN_NAME="Debian GNU/Linux ${VERSION} \"${DISTRIBUTION}\" - Official ${ARCHITECTURE} ${TYPE} Binary $(date +%Y%m%d-%H:%M)"
DEBIAN_DATE="$(date +%Y%m%d-%H:%M)"
- if [ "${LB_ARCHITECTURE}" = "i386" ]
+ if [ "${LB_ARCHITECTURES}" = "i386" ]
then
DEBIAN_TOOLS_HTML=" <P>\n <tt>&nbsp;\n <A href="tools/">/tools/</a>\n </tt>\n\n and\n <tt>&nbsp;\n <A href="install/floppy/">/install/floppy/</a>\n </tt>"
DEBIAN_TOOLS_TXT="/tools/ and /install/floppy/"