[SCM] live-build branch, debian, updated. debian/3.0_a51-1-31-gf271c83

Daniel Baumann daniel at debian.org
Wed Jul 18 21:10:53 UTC 2012


The following commit has been merged in the debian branch:
commit 3776a96b20f5ceefdab784054301b4bf3ff931be
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jul 18 21:40:52 2012 +0200

    Correcting live-build and live-boot versions for splash.svg post-processing.

diff --git a/scripts/build/lb_binary_syslinux b/scripts/build/lb_binary_syslinux
index 6e28db6..9663fa3 100755
--- a/scripts/build/lb_binary_syslinux
+++ b/scripts/build/lb_binary_syslinux
@@ -293,8 +293,8 @@ then
 	_MINUTE="$(date +%M)"
 	_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 -u)"
-	_LIVE_BUILD_VERSIONS="$(chroot chroot apt-cache policy live-build | awk '/Installed: / { print $2 }')"
-	_LIVE_BOOT_VERSIONS="$(chroot chroot apt-cache policy live-boot | awk '/Installed: / { print $2 }')"
+	_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 }')"
 
@@ -311,7 +311,7 @@ then
 		-e "s|@MINUTE@|${_MINUTE}|g" \
 		-e "s|@SECOND@|${_SECOND}|g" \
 		-e "s|@LINUX_VERSIONS@|${_LINUX_VERSIONS}|g" \
-		-e "s|@LIVE_BUILD_VERSION@|${_LIVE_BUILD_VERSIONS}|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" \

-- 
live-build



More information about the debian-live-changes mailing list