asd

.github/workflows/main.yml

@@ -32,7 +32,7 @@ jobs:
           make IMAGE_BUILD_OPTS="--pull" "build-${{ matrix.arch }}-image" "save-${{ matrix.arch }}-image"
       - name: "Upload artifacts"
         if: "startsWith(github.ref, 'refs/tags/v') && matrix.arch != 'native'"
-        uses: "actions/upload-artifact@v4"
+        uses: "christopherhx/gitea-upload-artifact@v4"
         with:
           name: "dist-${{ matrix.arch }}"
           path: "./dist/"
@@ -52,14 +52,14 @@ jobs:
       - name: "Checkout project"
         uses: "actions/checkout@v4"
       - name: "Download artifacts"
-        uses: "actions/download-artifact@v4"
+        uses: "christopherhx/gitea-download-artifact@v4"
         with:
           name: "dist-${{ matrix.arch }}"
           path: "./dist/"
-      - name: "Login to Docker Hub"
+#      - name: "Login to Docker Hub"
-        uses: "docker/login-action@v3"
+#        uses: "docker/login-action@v3"
-        with:
+#        with:
-          registry: "d.lilpenguins.com"
+#          registry: "d.lilpenguins.com"
       - name: "Load and push image"
         run: |
           make "load-${{ matrix.arch }}-image" "push-${{ matrix.arch }}-image"
@@ -74,10 +74,10 @@ jobs:
     steps:
       - name: "Checkout project"
         uses: "actions/checkout@v4"
-      - name: "Login to Docker Hub"
+#      - name: "Login to Docker Hub"
-        uses: "docker/login-action@v3"
+#        uses: "docker/login-action@v3"
-        with:
+#        with:
-          registry: "d.lilpenguins.com"
+#          registry: "d.lilpenguins.com"
       - name: "Push manifest"
         run: |
           make push-cross-manifest

Dockerfile.m4

@@ -237,7 +237,7 @@ EOF
 ## "main" stage
 ##################################################
 
-m4_ifdef([[CROSS_ARCH]], [[FROM docker.io/CROSS_ARCH/ubuntu:24.04]], [[FROM docker.io/ubuntu:24.04]]) AS main
+m4_ifdef([[CROSS_ARCH]], [[FROM dtcooper/raspberrypi-os:latest]], [[FROM dtcooper/raspberrypi-os:latest]]) AS main
 
 SHELL ["/bin/sh", "-euc"]
 
@@ -248,6 +248,11 @@ RUN <<-EOF
 	find /etc/apt/preferences.d/ -type f -not -perm 0644 -exec chmod 0644 '{}' ';'
 EOF
 
+RUN <<-EOF
+	sed -i '/^Types: deb$/s/$/ deb-src/' /etc/apt/sources.list.d/debian.sources
+	sed -i '/^Components: main$/s/$/ contrib non-free non-free-firmware/' /etc/apt/sources.list.d/debian.sources
+EOF
+
 # Install base packages
 RUN <<-EOF
 	export DEBIAN_FRONTEND=noninteractive
@@ -270,6 +275,8 @@ RUN <<-EOF
 		libgl1 \
 		libgl1-mesa-dri \
 		libgles2 \
+		libgles2-mesa \
+		libgles2-mesa-dev \
 		libglu1 \
 		libglvnd0 \
 		libglx-mesa0 \
@@ -279,7 +286,7 @@ RUN <<-EOF
 		libpam0g \
 		libpixman-1-0 \
 		libpulse0 \
-		libssl3t64 \
+		libssl3 \
 		libsystemd0 \
 		libx11-6 \
 		libx11-xcb1 \
@@ -292,7 +299,7 @@ RUN <<-EOF
 		libxml2 \
 		libxrandr2 \
 		libxshmfence1 \
-		libxt6t64 \
+		libxt6 \
 		libxtst6 \
 		libxv1 \
 		locales \
@@ -319,6 +326,7 @@ RUN <<-EOF
 		xserver-xorg-video-dummy \
 		xserver-xorg-video-fbdev \
 		xserver-xorg-video-vesa \
+		xorg-dev \
 		zlib1g
 m4_ifelse(ENABLE_AMD_SUPPORT, 1, [[m4_dnl
 	apt-get install -y --no-install-recommends -o APT::Immediate-Configure=0 \
@@ -382,8 +390,7 @@ RUN <<-EOF
 		gnome-keyring \
 		gtk2-engines-pixbuf \
 		htop \
-		indicator-application \
+		ayatana-indicator-messages \
-		indicator-messages \
 		iproute2 \
 		iputils-ping \
 		libavcodec-extra \
@@ -438,7 +445,7 @@ RUN <<-EOF
 		xfonts-base \
 		xinput \
 		xterm \
-		xubuntu-default-settings \
+		debian-mate-default-settings \
 		xutils \
 		xz-utils \
 		zenity \