From 2eaa6eeb7176db8400baa04297697f5eda35ecc1 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 26 Oct 2012 10:58:48 +0200 Subject: Removing workaround for #657560 where we had to temporarily include bzip2 into the bootstrapped chroot to avoid sids apt failing on mirrors with bzip2 indices only. --- scripts/build/bootstrap_cdebootstrap | 3 --- scripts/build/bootstrap_debootstrap | 3 --- 2 files changed, 6 deletions(-) diff --git a/scripts/build/bootstrap_cdebootstrap b/scripts/build/bootstrap_cdebootstrap index 3c8843e2b..0f8ba956b 100755 --- a/scripts/build/bootstrap_cdebootstrap +++ b/scripts/build/bootstrap_cdebootstrap @@ -60,9 +60,6 @@ Create_lockfile .lock # Creating chroot directory mkdir -p chroot -# Temporarily including bzip2 manually until #657560 has been fixed in unstable -CDEBOOTSTRAP_OPTIONS="${CDEBOOTSTRAP_OPTIONS} --include=bzip2" - # Setting cdebootstrap options if [ -n "${LB_ARCHITECTURES}" ] then diff --git a/scripts/build/bootstrap_debootstrap b/scripts/build/bootstrap_debootstrap index b0fa09fa1..fedc45e36 100755 --- a/scripts/build/bootstrap_debootstrap +++ b/scripts/build/bootstrap_debootstrap @@ -60,9 +60,6 @@ Create_lockfile .lock # Creating chroot directory mkdir -p chroot -# Temporarily including bzip2 manually until #657560 has been fixed in unstable -DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --include=bzip2" - # Setting debootstrap options if [ -n "${LB_ARCHITECTURES}" ] then -- cgit v1.2.3