File 1614-gh-Fix-debian-base-image.patch of Package erlang

From bc8d0fba5688de4f501c132273cc3d54c21bffd5 Mon Sep 17 00:00:00 2001
From: Lukas Larsson <lukas@erlang.org>
Date: Tue, 12 Apr 2022 16:59:42 +0200
Subject: [PATCH] gh: Fix debian base image

The wx webview package on debian seems to have been broken
for cross installs, so we disable it for now.
---
 .github/dockerfiles/Dockerfile.debian-base | 11 ++++++-----
 .github/scripts/base-tag                   |  4 ++--
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/dockerfiles/Dockerfile.debian-base b/.github/dockerfiles/Dockerfile.debian-base
index 66a2f4dc22..c199469a73 100644
--- a/.github/dockerfiles/Dockerfile.debian-base
+++ b/.github/dockerfiles/Dockerfile.debian-base
@@ -1,10 +1,10 @@
 ##
 ## This docker file will build a base image for building Erlang/OTP
 ##
-ARG BASE=debian
-FROM $BASE:bullseye
+ARG BASE=debian:bullseye
+FROM $BASE
 ## Need to have a second arg here as the first does not expose the $BASE in the script below
-ARG BASE=debian
+ARG BASE=debian:bullseye
 
 ARG HOST_TRIP=x86_64-linux-gnu
 ENV HOST_TRIP=$HOST_TRIP
@@ -12,11 +12,12 @@ ENV LANG=C.UTF-8
 ENV LC_ALL=C.UTF-8
 
 ENV INSTALL_LIBS="zlib1g-dev libncurses5-dev libssl-dev unixodbc-dev libgmp3-dev libwxgtk3.0-gtk3-dev libwxgtk-webview3.0-gtk3-dev libsctp-dev lksctp-tools"
+ENV CROSS_LIBS="zlib1g-dev libncurses5-dev libssl-dev unixodbc-dev libgmp3-dev libwxgtk3.0-gtk3-dev libsctp-dev lksctp-tools"
 
 ## See https://wiki.debian.org/Multiarch/HOWTO for details on how to install things
 ##
 ## 1. Install build-essential to get access to dpkg-architecture
-## 2. Use dpkg-architecture to figure out what we are runnon on
+## 2. Use dpkg-architecture to figure out what we are running on
 ## 3. If the HOST_TRIP does not equal BUILD_TRIP we should cross compile
 RUN apt-get update && apt-get -y upgrade && apt-get install -y build-essential && \
         BUILD_TRIP=`dpkg-architecture -t${HOST_TRIP} -qDEB_BUILD_MULTIARCH` && \
@@ -32,7 +33,7 @@ RUN apt-get update && apt-get -y upgrade && apt-get install -y build-essential &
         if [ "$HOST_TRIP" != "$BUILD_TRIP" ]; then \
           apt-get install -y -f \
           crossbuild-essential-$HOST_ARCH \
-          $(for LIB in $INSTALL_LIBS; do echo "$LIB:$HOST_ARCH"; done) && \
+          $(for LIB in $CROSS_LIBS; do echo "$LIB:$HOST_ARCH"; done) && \
           for dir in `find / -type d -name $HOST_TRIP`; do \
             echo -n "$dir: /buildroot/sysroot"; \
             echo `dirname $dir`; \
diff --git a/.github/scripts/base-tag b/.github/scripts/base-tag
index 6683793762..608832f04c 100755
--- a/.github/scripts/base-tag
+++ b/.github/scripts/base-tag
@@ -4,11 +4,11 @@ set -x
 
 case "$1" in
     *i386-debian-base)
-        BASE="i386/debian"
+        BASE="i386/debian:bullseye"
         BASE_TYPE=debian-base
         ;;
     *debian-base)
-        BASE="debian"
+        BASE="debian:bullseye"
         BASE_TYPE=debian-base
         ;;
     *ubuntu-base)
-- 
2.34.1