summaryrefslogtreecommitdiff
path: root/scripts/build/binary_syslinux
diff options
context:
space:
mode:
authorRaphaël Hertzog <hertzog@debian.org>2020-04-23 17:10:25 +0200
committerRaphaël Hertzog <hertzog@debian.org>2020-04-23 17:10:25 +0200
commite2243dbacbd5b2005e1b334bdacde6f73a0ada9e (patch)
treea7974b6f3d4bffa69a32c99a1a6ca27ace1edecd /scripts/build/binary_syslinux
parentfb41c190094040105ed57de0950d2d4af87f92b7 (diff)
downloadvyos-live-build-e2243dbacbd5b2005e1b334bdacde6f73a0ada9e.tar.gz
vyos-live-build-e2243dbacbd5b2005e1b334bdacde6f73a0ada9e.zip
binary_syslinux: rely on $LIVE_BUILD_VERSION instead of lb --version
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 ad9db9a83..1fdd5a97c 100755
--- a/scripts/build/binary_syslinux
+++ b/scripts/build/binary_syslinux
@@ -209,7 +209,6 @@ _SECOND="$(date +%S)"
_LINUX_VERSIONS="$(for _LINUX in chroot/boot/vmlinuz-* ; do chroot chroot apt-cache policy $(basename ${_LINUX} | sed -e 's|vmlinuz-|linux-image-|') | awk '/Installed: / { print $2 }' ; done | sort -Vru | tr "\n" " ")"
-_LIVE_BUILD_VERSION="$(lb --version)"
_LIVE_BOOT_VERSION="$(chroot chroot apt-cache policy live-boot | awk '/Installed: / { print $2 }')"
_LIVE_CONFIG_VERSION="$(chroot chroot apt-cache policy live-config | awk '/Installed: / { print $2 }')"
_LIVE_TOOLS_VERSION="$(chroot chroot apt-cache policy live-tools | awk '/Installed: / { print $2 }')"
@@ -236,7 +235,7 @@ do
-e "s|@MINUTE@|${_MINUTE}|g" \
-e "s|@SECOND@|${_SECOND}|g" \
-e "s|@LINUX_VERSIONS@|${_LINUX_VERSIONS}|g" \
- -e "s|@LIVE_BUILD_VERSION@|${_LIVE_BUILD_VERSION}|g" \
+ -e "s|@LIVE_BUILD_VERSION@|${LIVE_BUILD_VERSION}|g" \
-e "s|@LIVE_BOOT_VERSION@|${_LIVE_BOOT_VERSION}|g" \
-e "s|@LIVE_CONFIG_VERSION@|${_LIVE_CONFIG_VERSION}|g" \
-e "s|@LIVE_TOOLS_VERSION@|${_LIVE_TOOLS_VERSION}|g" \