From 44b9b0a6501476de594ce3783cea5df0c141478c Mon Sep 17 00:00:00 2001 From: Raphaël Hertzog Date: Thu, 19 Dec 2019 18:18:44 +0100 Subject: Support --distribution-binary and --distribution-chroot This makes it possible to build an image against a first distribution (--distribution-chroot) and have the resulting image point to another distribution (--distribution-binary). We can use this to build against a snapshot and have the result use the original distribution that was snapshotted. Closes: #888507 --- scripts/build/binary_syslinux | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'scripts/build/binary_syslinux') diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux index bb6658826..df58f7d62 100755 --- a/scripts/build/binary_syslinux +++ b/scripts/build/binary_syslinux @@ -204,7 +204,7 @@ fi _VERSION="${_VERSION:-none}" -_DISTRIBUTION="${LB_DISTRIBUTION}" +_DISTRIBUTION="${LB_DISTRIBUTION_BINARY}" _ARCHITECTURE="${LB_ARCHITECTURES}" _DATE=$(date -R) @@ -242,7 +242,7 @@ do -e "s#@APPEND_INSTALL_FAILSAFE@#${LB_BOOTAPPEND_INSTALL_FAILSAFE}#g" \ -e "s|@PROJECT@|${_PROJECT}|g" \ -e "s|@DISTRIBUTION@|${_DISTRIBUTION}|g" \ - -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION}|g" \ + -e "s|@PARENT_DISTRIBUTION@|${LB_PARENT_DISTRIBUTION_BINARY}|g" \ -e "s|@VERSION@|${_VERSION}|g" \ -e "s|@ARCHITECTURE@|${_ARCHITECTURE}|g" \ -e "s|@DATE@|${_DATE}|g" \ -- cgit v1.2.3