From 07e16ab0731b8447785f88c5c88ba99aa3602acc Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan@agner.ch>
Date: Tue, 13 Feb 2024 15:07:37 +0100
Subject: [PATCH] Fix Raspberry Pi utilities installation on Alpine 3.19
 (#110463)

---
 machine/raspberrypi     | 3 +--
 machine/raspberrypi2    | 3 +--
 machine/raspberrypi3    | 3 +--
 machine/raspberrypi3-64 | 3 +--
 machine/raspberrypi4    | 3 +--
 machine/raspberrypi4-64 | 3 +--
 machine/raspberrypi5-64 | 3 +--
 machine/yellow          | 3 +--
 8 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/machine/raspberrypi b/machine/raspberrypi
index 2ed3b3c8e44..8232d3398a7 100644
--- a/machine/raspberrypi
+++ b/machine/raspberrypi
@@ -4,5 +4,4 @@ ARG \
 FROM $BUILD_FROM
 
 RUN apk --no-cache add \
-        raspberrypi-userland \
-        raspberrypi-userland-libs
+        raspberrypi-utils
diff --git a/machine/raspberrypi2 b/machine/raspberrypi2
index 2ed3b3c8e44..8232d3398a7 100644
--- a/machine/raspberrypi2
+++ b/machine/raspberrypi2
@@ -4,5 +4,4 @@ ARG \
 FROM $BUILD_FROM
 
 RUN apk --no-cache add \
-        raspberrypi-userland \
-        raspberrypi-userland-libs
+        raspberrypi-utils
diff --git a/machine/raspberrypi3 b/machine/raspberrypi3
index 2ed3b3c8e44..8232d3398a7 100644
--- a/machine/raspberrypi3
+++ b/machine/raspberrypi3
@@ -4,5 +4,4 @@ ARG \
 FROM $BUILD_FROM
 
 RUN apk --no-cache add \
-        raspberrypi-userland \
-        raspberrypi-userland-libs
+        raspberrypi-utils
diff --git a/machine/raspberrypi3-64 b/machine/raspberrypi3-64
index 2ed3b3c8e44..8232d3398a7 100644
--- a/machine/raspberrypi3-64
+++ b/machine/raspberrypi3-64
@@ -4,5 +4,4 @@ ARG \
 FROM $BUILD_FROM
 
 RUN apk --no-cache add \
-        raspberrypi-userland \
-        raspberrypi-userland-libs
+        raspberrypi-utils
diff --git a/machine/raspberrypi4 b/machine/raspberrypi4
index 2ed3b3c8e44..8232d3398a7 100644
--- a/machine/raspberrypi4
+++ b/machine/raspberrypi4
@@ -4,5 +4,4 @@ ARG \
 FROM $BUILD_FROM
 
 RUN apk --no-cache add \
-        raspberrypi-userland \
-        raspberrypi-userland-libs
+        raspberrypi-utils
diff --git a/machine/raspberrypi4-64 b/machine/raspberrypi4-64
index 2ed3b3c8e44..8232d3398a7 100644
--- a/machine/raspberrypi4-64
+++ b/machine/raspberrypi4-64
@@ -4,5 +4,4 @@ ARG \
 FROM $BUILD_FROM
 
 RUN apk --no-cache add \
-        raspberrypi-userland \
-        raspberrypi-userland-libs
+        raspberrypi-utils
diff --git a/machine/raspberrypi5-64 b/machine/raspberrypi5-64
index 2ed3b3c8e44..8232d3398a7 100644
--- a/machine/raspberrypi5-64
+++ b/machine/raspberrypi5-64
@@ -4,5 +4,4 @@ ARG \
 FROM $BUILD_FROM
 
 RUN apk --no-cache add \
-        raspberrypi-userland \
-        raspberrypi-userland-libs
+        raspberrypi-utils
diff --git a/machine/yellow b/machine/yellow
index 2ed3b3c8e44..8232d3398a7 100644
--- a/machine/yellow
+++ b/machine/yellow
@@ -4,5 +4,4 @@ ARG \
 FROM $BUILD_FROM
 
 RUN apk --no-cache add \
-        raspberrypi-userland \
-        raspberrypi-userland-libs
+        raspberrypi-utils
-- 
GitLab