From e07f867a12ce074812209c621ee4170345731302 Mon Sep 17 00:00:00 2001
From: Paulchen-Panther <16664240+Paulchen-Panther@users.noreply.github.com>
Date: Mon, 10 Feb 2025 18:09:15 +0100
Subject: [PATCH] update

---
 .github/workflows/qt5_6.yml | 2 +-
 debian-armv6                | 7 ++-----
 fedora                      | 9 ++++++---
 ubuntu_debian               | 4 ++--
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/qt5_6.yml b/.github/workflows/qt5_6.yml
index 94caa01..4d7117f 100644
--- a/.github/workflows/qt5_6.yml
+++ b/.github/workflows/qt5_6.yml
@@ -106,7 +106,7 @@ jobs:
   merge:
     name: 👷 Merge and 🚀 Push
     needs: build_and_push
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-22.04
     env:
       TAG: ${{ inputs.qt_version == '6' && format('{0}-qt6', inputs.codename) || inputs.codename }}
 
diff --git a/debian-armv6 b/debian-armv6
index 593772f..9380f3b 100644
--- a/debian-armv6
+++ b/debian-armv6
@@ -23,7 +23,7 @@ LABEL maintainer="Hyperion Project <admin@hyperion-project.org>" \
 ARG DEBIAN_FRONTEND=noninteractive
 
 # update
-RUN apt-get update && apt-get -y upgrade
+RUN apt-get update
 
 # install qt5 or qt6 (qt6 is not available on debian buster/bullseye)
 RUN if [ "$SUITE" = "bookworm" ] && [ "$QT_VERSION" = "6" ]; then \
@@ -79,8 +79,5 @@ RUN curl -kL https://github.com/balena-io/qemu/releases/download/v7.0.0%2Bbalena
 # set qemu exec flag
 RUN chmod +x /usr/bin/qemu-static
 
-# cleanup
-RUN apt-get clean -q -y && apt-get autoremove -y && rm -rf /var/lib/apt/lists/*
-
 # set entrypoint
-ENTRYPOINT [ "/usr/bin/qemu-static" ]
+ENTRYPOINT [ "/usr/bin/qemu-static", "/usr/bin/env", "QEMU_EXECVE=1" ]
diff --git a/fedora b/fedora
index 624704d..04222ca 100644
--- a/fedora
+++ b/fedora
@@ -82,10 +82,13 @@ RUN rpmdev-setuptree
 
 # download qemu and set exec flag
 RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
-    curl -kL https://github.com/balena-io/qemu/releases/download/v7.0.0%2Bbalena1/qemu-7.0.0.balena1-aarch64.tar.gz | tar zxvf - -C . --strip-components 1 && mv qemu-aarch64-static /usr/bin/qemu-static && chmod +x /usr/bin/qemu-static; \
+    curl -kL https://github.com/balena-io/qemu/releases/download/v7.0.0%2Bbalena1/qemu-7.0.0.balena1-aarch64.tar.gz | tar zxvf - -C . --strip-components 1 && mv qemu-aarch64-static /usr/bin/qemu-static; \
 else \
-    printf '#!/bin/bash\nexec "$@"' > /usr/bin/qemu-static && chmod +x /usr/bin/qemu-static; \
+    printf '#!/bin/bash\nexec "$@"' > /usr/bin/qemu-static; \
 fi
 
+# set qemu exec flag
+RUN chmod +x /usr/bin/qemu-static
+
 # set entrypoint
-ENTRYPOINT [ "/usr/bin/qemu-static" ]
+ENTRYPOINT [ "/usr/bin/qemu-static", "/usr/bin/env", "QEMU_EXECVE=1" ]
diff --git a/ubuntu_debian b/ubuntu_debian
index e5efef7..1f0511a 100644
--- a/ubuntu_debian
+++ b/ubuntu_debian
@@ -29,7 +29,7 @@ ENV DEBEMAIL="admin@hyperion-project.org"
 ARG DEBIAN_FRONTEND=noninteractive
 
 # update
-RUN apt-get update && apt-get -y upgrade
+RUN apt-get update
 
 # install qt5 or qt6 (qt6 is not available on ubuntu focal and debian buster)
 # on debian bullseye add backports to install qt6
@@ -128,4 +128,4 @@ RUN chmod +x /usr/bin/qemu-static
 RUN apt-get clean -q -y && apt-get autoremove -y && rm -rf /var/lib/apt/lists/*
 
 # set entrypoint
-ENTRYPOINT [ "/usr/bin/qemu-static" ]
+ENTRYPOINT [ "/usr/bin/qemu-static", "/usr/bin/env", "QEMU_EXECVE=1" ]