diff options
| author | Daniel Baumann <daniel@debian.org> | 2012-10-26 10:58:48 +0200 |
|---|---|---|
| committer | Daniel Baumann <daniel@debian.org> | 2012-10-26 10:58:54 +0200 |
| commit | 2eaa6eeb7176db8400baa04297697f5eda35ecc1 (patch) | |
| tree | 46535bb140923000f494c9dca1a043c5b07d6685 /scripts/build | |
| parent | 9a33f681fa4fa7a7271ae244dd7812ff40d3e417 (diff) | |
| download | vyos-live-build-2eaa6eeb7176db8400baa04297697f5eda35ecc1.tar.gz vyos-live-build-2eaa6eeb7176db8400baa04297697f5eda35ecc1.zip | |
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.
Diffstat (limited to 'scripts/build')
| -rwxr-xr-x | scripts/build/bootstrap_cdebootstrap | 3 | ||||
| -rwxr-xr-x | scripts/build/bootstrap_debootstrap | 3 |
2 files changed, 0 insertions, 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 |