From 9bc35759aab95d849cba38bcb6fd1bb072df9907 Mon Sep 17 00:00:00 2001 From: Lyndon Brown Date: Sun, 3 May 2020 18:02:04 +0100 Subject: config: fix stale live-build version in iso-preparer using `$VERSION` as part of the default `$LB_ISO_PREPARER` means that when you simply run `lb config` once, this variable is stored as a part of the string, and replaced on use, but if you run `lb config` twice, it gets replaced with a fixed version, that is then used in all subsequent builds. let's replace with a placeholder (`@LB_VERSION@`) that can be used both in the default, or in user strings, and will be replaced on use only. this means that subsequent builds will always reflect the actual version of live-build used. Gbp-Dch: Ignore --- scripts/build/source_iso | 1 + 1 file changed, 1 insertion(+) (limited to 'scripts/build/source_iso') diff --git a/scripts/build/source_iso b/scripts/build/source_iso index 3c9c08125..7c4f67f17 100755 --- a/scripts/build/source_iso +++ b/scripts/build/source_iso @@ -79,6 +79,7 @@ fi if [ -n "${LB_ISO_PREPARER}" ] && [ "${LB_ISO_PREPARER}" != "none" ] then + LB_ISO_PREPARER="$(echo "${LB_ISO_PREPARER}" | sed "s|@LB_VERSION@|${VERSION}|")" XORRISO_OPTIONS="${XORRISO_OPTIONS} -p \"${LB_ISO_PREPARER}\"" fi -- cgit v1.2.3