Merging upstream version 1.46.3.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 0 insertions, 62 deletions

diff --git a/build_external/bin/clean-install.sh b/build_external/bin/clean-install.sh
deleted file mode 100755
index 78d1f325f..000000000
--- a/build_external/bin/clean-install.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env bash
-
-DISTRO="$1"
-VERSION="$2"
-BuildBase="$(cd "$(dirname "$0")" && cd .. && pwd)"
-
-# This is temporary - not all of the package-builder images from the helper-images repo
-# are available on Docker Hub. When everything falls under the "happy case"  below this
-# can be deleted in a future iteration. This is written in a weird way for portability,
-# can't rely on bash 4.0+ to allow case fall-through with ;&
-
-if cat <<HAPPY_CASE | grep "$DISTRO-$VERSION" 
-    opensuse-15.1
-    fedora-29
-    debian-9
-    debian-8
-    fedora-30
-    opensuse-15.0
-    ubuntu-19.04
-    centos-7
-    fedora-31
-    ubuntu-16.04
-    ubuntu-18.04
-    ubuntu-19.10
-    debian-10
-    centos-8
-    ubuntu-1804
-    ubuntu-1904
-    ubuntu-1910
-    debian-stretch
-    debian-jessie
-    debian-buster
-HAPPY_CASE
-then
-    docker build -f "$BuildBase/clean-install.Dockerfile" -t "${DISTRO}_${VERSION}_dev" "$BuildBase/.." \
-            --build-arg "DISTRO=$DISTRO" --build-arg "VERSION=$VERSION" \
-            --build-arg EXTRA_CFLAGS="-DACLK_SSL_ALLOW_SELF_SIGNED"
-else
-    case "$DISTRO-$VERSION" in
-        arch-current)
-            docker build -f "$BuildBase/clean-install-arch.Dockerfile" -t "${DISTRO}_${VERSION}_dev" "$BuildBase/.." \
-            --build-arg "DISTRO=$DISTRO" --build-arg "VERSION=$VERSION" \
-            --build-arg EXTRA_CFLAGS="-DACLK_SSL_ALLOW_SELF_SIGNED" # --no-cache
-        ;;
-        arch-extras)   # Add valgrind to the container
-            docker build -f "$BuildBase/clean-install-arch-extras.Dockerfile" -t "${DISTRO}_${VERSION}_dev" "$BuildBase/.." \
-            --build-arg "DISTRO=$DISTRO" --build-arg "VERSION=$VERSION" \
-            --build-arg EXTRA_CFLAGS="-DACLK_SSL_ALLOW_SELF_SIGNED" # --no-cache
-        ;;
-        *)
-            echo "Unknown $DISTRO-$VERSION"
-        ;;
-    esac
-fi
diff --git a/build_external/bin/make-install.sh b/build_external/bin/make-install.sh
deleted file mode 100755
index fe4f7c9e8..000000000
--- a/build_external/bin/make-install.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-DISTRO="$1"
-VERSION="$2"
-BuildBase="$(cd "$(dirname "$0")" && cd .. && pwd)"
-
-docker build -f "$BuildBase/make-install.Dockerfile" -t "${DISTRO}_${VERSION}_dev:latest" "$BuildBase/.." \
-       --build-arg "DISTRO=${DISTRO}" --build-arg "VERSION=${VERSION}"