diff options
| author | Sjoerd Simons <sjoerd.simons@collabora.co.uk> | 2016-11-22 18:37:56 +0100 |
|---|---|---|
| committer | Raphaël Hertzog <hertzog@debian.org> | 2016-11-28 20:58:18 +0100 |
| commit | c12f7d715eda1dec63d035362630d11ea0cc1f8e (patch) | |
| tree | 6359da68d74c5e63f0dde80b9d2a2bc033c5a0d3 | |
| parent | f152f99599c7f2db16cdf38a5a5ab2d3fdba0791 (diff) | |
| download | vyos-live-build-c12f7d715eda1dec63d035362630d11ea0cc1f8e.tar.gz vyos-live-build-c12f7d715eda1dec63d035362630d11ea0cc1f8e.zip | |
Pass components to debootstrap --second-stage
Commit e24e4b in debootstrap fixed setup_available to work in the
--foreign case (iotw at the second stage). Unfortunately this breaks
things if components aren't passed to the second stage _and_ your main
component isn't called main.
To fix this, pass --components to both the first and second stage
debootstrap when needed.
Signed-off-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rwxr-xr-x | scripts/build/bootstrap_debootstrap | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 1f76b390b..e6a14aa89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ live-build (1:20160105) UNRELEASED; urgency=medium after building. Closes: #816204 * Try to reuse /isolinux/splash.png in default grub configuration. * Drop debian/source/{local-options,options} as they are no longer needed. + * Pass components to debootstrap --second-stage. Closes: #806782 + Thanks to Sjoerd Simons <sjoerd.simons@collabora.co.uk> for the patch. -- Raphaël Hertzog <hertzog@debian.org> Tue, 05 Jan 2016 18:03:44 +0100 diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap index bd646fffc..446cc6ca4 100755 --- a/scripts/build/bootstrap_debootstrap +++ b/scripts/build/bootstrap_debootstrap @@ -62,6 +62,7 @@ if [ "${LB_ARCHIVE_AREAS}" != "main" ] then # Modify archive areas to remove leading/trailing whitespaces and replace other whitepspace with commas DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components=$(echo ${LB_ARCHIVE_AREAS} | sed -e 's| |,|g')" + FOREIGN_DEBOOTSTRAP_OPTIONS="--components=$(echo ${LB_ARCHIVE_AREAS} | sed -e 's| |,|g')" fi if [ "${_VERBOSE}" = "true" ] @@ -112,7 +113,7 @@ then Echo_message "Running debootstrap second stage under QEMU" cp ${LB_BOOTSTRAP_QEMU_STATIC} chroot/usr/bin - Chroot chroot /bin/sh /debootstrap/debootstrap --second-stage + Chroot chroot /bin/sh /debootstrap/debootstrap --second-stage ${FOREIGN_DEBOOTSTRAP_OPTIONS} else debootstrap ${DEBOOTSTRAP_OPTIONS} "${LB_PARENT_DISTRIBUTION}" chroot "${LB_PARENT_MIRROR_BOOTSTRAP}" fi |