From a013aa8d80f58ce7e3b3a337b71a847d506ddc1f Mon Sep 17 00:00:00 2001
From: Domenico Iezzi <domenico@iezzi.info>
Date: Fri, 29 Nov 2024 10:44:23 +0100
Subject: [PATCH] Test new base image for Action pipeline

---
 .github/workflows/build.yml                            | 2 +-
 Makefile.in                                            | 2 +-
 scripts/install-deps                                   | 7 +++----
 scripts/{install-mingw32-glib => install-mingw32-deps} | 9 ++++++---
 4 files changed, 11 insertions(+), 9 deletions(-)
 rename scripts/{install-mingw32-glib => install-mingw32-deps} (80%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index b47be77..9668b15 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -11,7 +11,7 @@ on:
 jobs:
   build:
     name: Toolchain build
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout
diff --git a/Makefile.in b/Makefile.in
index cc4420f..11a97ab 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -239,7 +239,7 @@ stamps/build-gcc-stage2-only: $(GCC_SRCDIR) stamps/install-deps
 stamps/build-qemu: $(QEMU_SRCDIR)
 	rm -rf $@ $(notdir $@)
 	mkdir $(notdir $@)
-	if test "$(QEMU_CONFIGURE_HOST)" = "--cross-prefix=x86_64-w64-mingw32-"; then cd $(notdir $@) && $(srcdir)/scripts/install-mingw32-glib $(INSTALL_DIR); fi
+	if test "$(QEMU_CONFIGURE_HOST)" = "--cross-prefix=x86_64-w64-mingw32-"; then cd $(notdir $@) && $(srcdir)/scripts/install-mingw32-deps $(INSTALL_DIR); fi
 	cd $(notdir $@) && $(QEMU_ENV_VARS) $</configure \
 		--prefix=$(INSTALL_DIR) \
 		$(QEMU_CONFIGURE_HOST) \
diff --git a/scripts/install-deps b/scripts/install-deps
index 145002a..644a46e 100755
--- a/scripts/install-deps
+++ b/scripts/install-deps
@@ -10,10 +10,9 @@ then
 fi
 
 apt-get update
-apt-get -y install build-essential texinfo \
+DEBIAN_FRONTEND=noninteractive apt-get -y install \
+    build-essential texinfo \
     flex bison libmpfr-dev libgmp-dev libmpc-dev zip libdebuginfod-dev \
     gcc-mingw-w64 g++-mingw-w64 mingw-w64-tools \
     git libglib2.0-dev libfdt-dev libpixman-1-dev zlib1g-dev ninja-build \
-    python3-dev python3-pip
-
-pip install meson
+    python3-dev python3-pip wget meson
diff --git a/scripts/install-mingw32-glib b/scripts/install-mingw32-deps
similarity index 80%
rename from scripts/install-mingw32-glib
rename to scripts/install-mingw32-deps
index 1ad8d22..a838fc1 100755
--- a/scripts/install-mingw32-glib
+++ b/scripts/install-mingw32-deps
@@ -2,7 +2,8 @@
 
 set -e
 
-GLIB_SRC_URL="https://download.gnome.org/sources/glib/2.83/glib-2.83.0.tar.xz"
+GLIB_TARBALL="glib-2.83.0.tar.xz"
+GLIB_SRC_URL="https://download.gnome.org/sources/glib/2.83/$GLIB_TARBALL"
 
 if [ $# -ne 1 ]; then
     echo "Script require install prefix path as parameters"
@@ -11,8 +12,10 @@ fi
 
 INSTALL_PREFIX=$1
 
-wget "$GLIB_SRC_URL"
-tar xJf glib-2.83.0.tar.xz
+if [ ! -f $GLIB_TARBALL ]; then
+    wget "$GLIB_SRC_URL"
+fi
+tar xJf $GLIB_TARBALL
 cd glib-2.83.0
 
 cat > x86_64-w64-mingw32.txt <<HereDoc