From c12f7d715eda1dec63d035362630d11ea0cc1f8e Mon Sep 17 00:00:00 2001 From: Sjoerd Simons Date: Tue, 22 Nov 2016 18:37:56 +0100 Subject: 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 --- scripts/build/bootstrap_debootstrap | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'scripts/build/bootstrap_debootstrap') 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 -- cgit v1.2.3