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/source_debian | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts/build/source_debian') diff --git a/scripts/build/source_debian b/scripts/build/source_debian index 321ed1b4a..3960ea2a8 100755 --- a/scripts/build/source_debian +++ b/scripts/build/source_debian @@ -117,19 +117,19 @@ fi # where available. workaround: disable backports case "${LB_MODE}" in progress-linux) - case "${LB_DISTRIBUTION}" in + case "${LB_DISTRIBUTION_BINARY}" in *-backports) ;; *) - if grep -qs "${LB_DISTRIBUTION}-backports" chroot/etc/apt/sources.list.d/progress-linux.list + if grep -qs "${LB_DISTRIBUTION_BINARY}-backports" chroot/etc/apt/sources.list.d/progress-linux.list then cp chroot/etc/apt/sources.list.d/progress-linux.list chroot/etc/apt/sources.list.d/progress-linux.list.orig while read _LINE do - if echo "${_LINE}" | grep -qs ${LB_DISTRIBUTION}-backports + if echo "${_LINE}" | grep -qs ${LB_DISTRIBUTION_BINARY}-backports then sed -i -e "s|${_LINE}|#${_LINE}|" chroot/etc/apt/sources.list.d/progress-linux.list fi -- cgit v1.2.3