summaryrefslogtreecommitdiff
path: root/scripts/build/binary_syslinux
diff options
context:
space:
mode:
authorLyndon Brown <jnqnfe@gmail.com>2020-04-01 10:58:47 +0100
committerRaphaƫl Hertzog <hertzog@debian.org>2020-04-23 15:54:19 +0200
commit6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4 (patch)
treec91a79037457e7bb2c0630fa8c065bee6c465bad /scripts/build/binary_syslinux
parent6def2c27be28169cf3e0757a6928e3f13de157a8 (diff)
downloadvyos-live-build-6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4.tar.gz
vyos-live-build-6cc72509541404dc0af57bf2b29dfaaa1ee3e1a4.zip
rename LB_ARCHITECTURES to LB_ARCHITECTURE
this was previously not done in 8b109ffb96282a6dd1aa5d61aa935bcba69c56f1 to keep the renaming simple, but leaving the variable plural is a cause for confusion. since this property is stored in the INI style config/build config file rather than a shell script based one, at the property there is already singular, there was no need for a backwards compatibility hack. Gbp-Dch: Short
Diffstat (limited to 'scripts/build/binary_syslinux')
-rwxr-xr-xscripts/build/binary_syslinux3
1 files changed, 1 insertions, 2 deletions
diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux
index 86488fec4..ad9db9a83 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -198,7 +198,6 @@ fi
_VERSION="${_VERSION:-none}"
_DISTRIBUTION="${LB_DISTRIBUTION_BINARY}"
-_ARCHITECTURE="${LB_ARCHITECTURES}"
_DATE=$(date -R)
_YEAR="$(date +%Y)"
@@ -228,7 +227,7 @@ do
-e "s|@DISTRIBUTION@|${_DISTRIBUTION}|g" \
-e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION_BINARY}|g" \
-e "s|@VERSION@|${_VERSION}|g" \
- -e "s|@ARCHITECTURE@|${_ARCHITECTURE}|g" \
+ -e "s|@ARCHITECTURE@|${LB_ARCHITECTURE}|g" \
-e "s|@DATE@|${_DATE}|g" \
-e "s|@YEAR@|${_YEAR}|g" \
-e "s|@MONTH@|${_MONTH}|g" \