[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 5/7] docker: make sure debootstrap is at least 1.
From: |
Sascha Silbe |
Subject: |
[Qemu-devel] [PATCH v2 5/7] docker: make sure debootstrap is at least 1.0.67 |
Date: |
Wed, 24 Aug 2016 20:31:01 +0200 |
debootstrap prior to 1.0.67 generated an empty sources.list during
foreign bootstraps (Debian#732255 [1]). Fall back to the git checkout
if the installed debootstrap version is too old.
[1] https://bugs.debian.org/732255
Signed-off-by: Sascha Silbe <address@hidden>
---
Not sure if this used to work in even older debootstrap versions; I
don't remember running into this before. But then I needed to set up
several config files manually after a debootstrap anyway (both foreign
and native), so sources.list might just have been another one to fix
up manually.
tests/docker/dockerfiles/debian-bootstrap.pre | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/tests/docker/dockerfiles/debian-bootstrap.pre
b/tests/docker/dockerfiles/debian-bootstrap.pre
index 2ae363f..3c3e781 100755
--- a/tests/docker/dockerfiles/debian-bootstrap.pre
+++ b/tests/docker/dockerfiles/debian-bootstrap.pre
@@ -3,6 +3,8 @@
# Simple wrapper for debootstrap, run in the docker build context
#
FAKEROOT=`which fakeroot 2> /dev/null`
+# debootstrap < 1.0.67 generates empty sources.list, see Debian#732255
+MIN_DEBOOTSTRAP_VERSION=1.0.67
exit_and_skip()
{
@@ -40,9 +42,16 @@ fi
#
if [ -z $DEBOOTSTRAP_DIR ]; then
+ NEED_DEBOOTSTRAP=false
DEBOOTSTRAP=`which debootstrap 2> /dev/null`
if [ -z $DEBOOTSTRAP ]; then
echo "No debootstrap installed, attempting to install from SCM"
+ NEED_DEBOOTSTRAP=true
+ elif ! (echo "${MIN_DEBOOTSTRAP_VERSION}" ; "${DEBOOTSTRAP}" --version
|cut -d ' ' -f 2) |sort -VC; then
+ echo "debootstrap too old, attempting to install from SCM"
+ NEED_DEBOOTSTRAP=true
+ fi
+ if $NEED_DEBOOTSTRAP; then
DEBOOTSTRAP_SOURCE=https://anonscm.debian.org/git/d-i/debootstrap.git
git clone ${DEBOOTSTRAP_SOURCE} ./debootstrap.git
export DEBOOTSTRAP_DIR=./debootstrap.git
--
1.9.1
- [Qemu-devel] [PATCH v2 0/7] docker tests fixes, Sascha Silbe, 2016/08/24
- [Qemu-devel] [PATCH v2 3/7] docker: debian-bootstrap.pre: print helpful message if DEB_ARCH/DEB_TYPE unset, Sascha Silbe, 2016/08/24
- [Qemu-devel] [PATCH v2 4/7] docker: print warning if EXECUTABLE is not set when building debootstrap image, Sascha Silbe, 2016/08/24
- [Qemu-devel] [PATCH v2 5/7] docker: make sure debootstrap is at least 1.0.67,
Sascha Silbe <=
- [Qemu-devel] [PATCH v2 7/7] docker: silence debootstrap when --quiet is given, Sascha Silbe, 2016/08/24
- [Qemu-devel] [PATCH v2 1/7] docker.py: don't hang on large docker output, Sascha Silbe, 2016/08/24
- [Qemu-devel] [PATCH v2 2/7] docker: avoid dependency on 'realpath' package, Sascha Silbe, 2016/08/24
- [Qemu-devel] [PATCH v2 6/7] docker: build debootstrap after cloning, Sascha Silbe, 2016/08/24