diff options
| author | Alex Bennée <alex.bennee@linaro.org> | 2018-07-13 12:23:14 +0100 |
|---|---|---|
| committer | Alex Bennée <alex.bennee@linaro.org> | 2018-07-24 11:45:25 +0100 |
| commit | f7b446b5defeaa249a18e261879316f27d6c899c (patch) | |
| tree | b58ed8134e79e5febfd449098c051a4ae9e43639 | |
| parent | 11cc24a126d3e370c7fc8e6c9be51138713616b5 (diff) | |
| download | focaccia-qemu-f7b446b5defeaa249a18e261879316f27d6c899c.tar.gz focaccia-qemu-f7b446b5defeaa249a18e261879316f27d6c899c.zip | |
docker: ignore distro versioning of debootstrap
We do a minimum version check for the debootstrap but if the distro has added their own minor version tick it would fail and fall-back to the SCM version. This is sub-optimal as the latest/greatest version may be broken at any one particular time. We fix that with a little sed magic on the version string before passing to our ugly shell versioning check. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
| -rwxr-xr-x | tests/docker/dockerfiles/debian-bootstrap.pre | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tests/docker/dockerfiles/debian-bootstrap.pre b/tests/docker/dockerfiles/debian-bootstrap.pre index ea324d6e4a..3b0ef95374 100755 --- a/tests/docker/dockerfiles/debian-bootstrap.pre +++ b/tests/docker/dockerfiles/debian-bootstrap.pre @@ -56,10 +56,13 @@ if [ -z $DEBOOTSTRAP_DIR ]; then 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 -t . -n -k 1,1 -k 2,2 -k 3,3 -c &>/dev/null; then - echo "debootstrap too old, attempting to install from SCM" - NEED_DEBOOTSTRAP=true + else + INSTALLED_VERSION=$(${DEBOOTSTRAP} --version | sed 's/debootstrap \([0-9\.]*\)[^0-9\.]*.*/\1/') + if ! (echo "${MIN_DEBOOTSTRAP_VERSION}" ; echo "${INSTALLED_VERSION}") \ + | sort -t . -n -k 1,1 -k 2,2 -k 3,3 -C ; then + echo "debootstrap too old, attempting to install from SCM" + NEED_DEBOOTSTRAP=true + fi fi if $NEED_DEBOOTSTRAP; then DEBOOTSTRAP_SOURCE=https://salsa.debian.org/installer-team/debootstrap.git |