Follow Alpine 3.18 raspberrypi package updates (#105486)

Alpine 3.18 renamed the packages raspberrypi and raspberrypi-libs to raspberrypi-userland and raspberrypi-userland-libs respectively. Follow that rename. With this moderniziation raspistill and friends now gets deployed to /usr/bin, which makes any symlinks obsolete. Note that there is and was never a 64-bit variant of raspistill. So these symlinks were essentially useless all along. This effectively doesn't change anything for users: Alpine automatically installed the renamed package already and Home Assistant Core picked up the raspistill binary from /usr/bin already.
home-assistant · Dec 11, 2023 · 44e54e1 · 44e54e1
1 parent 1242456
commit 44e54e1
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 63 deletions.
diff --git a/machine/raspberrypi b/machine/raspberrypi
@@ -4,12 +4,5 @@ ARG \
 FROM $BUILD_FROM
 
 RUN apk --no-cache add \
-        raspberrypi \
-        raspberrypi-libs
-
-##
-# Set symlinks for raspberry pi camera binaries.
-RUN ln -sv /opt/vc/bin/raspistill /usr/local/bin/raspistill \
-    && ln -sv /opt/vc/bin/raspivid /usr/local/bin/raspivid \
-    && ln -sv /opt/vc/bin/raspividyuv /usr/local/bin/raspividyuv \
-    && ln -sv /opt/vc/bin/raspiyuv /usr/local/bin/raspiyuv
+        raspberrypi-userland \
+        raspberrypi-userland-libs
diff --git a/machine/raspberrypi2 b/machine/raspberrypi2
@@ -4,12 +4,5 @@ ARG \
 FROM $BUILD_FROM
 
 RUN apk --no-cache add \
-        raspberrypi \
-        raspberrypi-libs
-
-##
-# Set symlinks for raspberry pi binaries.
-RUN ln -sv /opt/vc/bin/raspistill /usr/local/bin/raspistill \
-    && ln -sv /opt/vc/bin/raspivid /usr/local/bin/raspivid \
-    && ln -sv /opt/vc/bin/raspividyuv /usr/local/bin/raspividyuv \
-    && ln -sv /opt/vc/bin/raspiyuv /usr/local/bin/raspiyuv
+        raspberrypi-userland \
+        raspberrypi-userland-libs
diff --git a/machine/raspberrypi3 b/machine/raspberrypi3
@@ -4,12 +4,5 @@ ARG \
 FROM $BUILD_FROM
 
 RUN apk --no-cache add \
-        raspberrypi \
-        raspberrypi-libs
-
-##
-# Set symlinks for raspberry pi binaries.
-RUN ln -sv /opt/vc/bin/raspistill /usr/local/bin/raspistill \
-    && ln -sv /opt/vc/bin/raspivid /usr/local/bin/raspivid \
-    && ln -sv /opt/vc/bin/raspividyuv /usr/local/bin/raspividyuv \
-    && ln -sv /opt/vc/bin/raspiyuv /usr/local/bin/raspiyuv
+        raspberrypi-userland \
+        raspberrypi-userland-libs
diff --git a/machine/raspberrypi3-64 b/machine/raspberrypi3-64
@@ -4,12 +4,5 @@ ARG \
 FROM $BUILD_FROM
 
 RUN apk --no-cache add \
-        raspberrypi \
-        raspberrypi-libs
-
-##
-# Set symlinks for raspberry pi binaries.
-RUN ln -sv /opt/vc/bin/raspistill /usr/local/bin/raspistill \
-    && ln -sv /opt/vc/bin/raspivid /usr/local/bin/raspivid \
-    && ln -sv /opt/vc/bin/raspividyuv /usr/local/bin/raspividyuv \
-    && ln -sv /opt/vc/bin/raspiyuv /usr/local/bin/raspiyuv
+        raspberrypi-userland \
+        raspberrypi-userland-libs
diff --git a/machine/raspberrypi4 b/machine/raspberrypi4
@@ -4,12 +4,5 @@ ARG \
 FROM $BUILD_FROM
 
 RUN apk --no-cache add \
-        raspberrypi \
-        raspberrypi-libs
-
-##
-# Set symlinks for raspberry pi binaries.
-RUN ln -sv /opt/vc/bin/raspistill /usr/local/bin/raspistill \
-    && ln -sv /opt/vc/bin/raspivid /usr/local/bin/raspivid \
-    && ln -sv /opt/vc/bin/raspividyuv /usr/local/bin/raspividyuv \
-    && ln -sv /opt/vc/bin/raspiyuv /usr/local/bin/raspiyuv
+        raspberrypi-userland \
+        raspberrypi-userland-libs
diff --git a/machine/raspberrypi4-64 b/machine/raspberrypi4-64
@@ -4,12 +4,5 @@ ARG \
 FROM $BUILD_FROM
 
 RUN apk --no-cache add \
-        raspberrypi \
-        raspberrypi-libs
-
-##
-# Set symlinks for raspberry pi binaries.
-RUN ln -sv /opt/vc/bin/raspistill /usr/local/bin/raspistill \
-    && ln -sv /opt/vc/bin/raspivid /usr/local/bin/raspivid \
-    && ln -sv /opt/vc/bin/raspividyuv /usr/local/bin/raspividyuv \
-    && ln -sv /opt/vc/bin/raspiyuv /usr/local/bin/raspiyuv
+        raspberrypi-userland \
+        raspberrypi-userland-libs
diff --git a/machine/yellow b/machine/yellow
@@ -4,12 +4,5 @@ ARG \
 FROM $BUILD_FROM
 
 RUN apk --no-cache add \
-        raspberrypi \
-        raspberrypi-libs
-
-##
-# Set symlinks for raspberry pi binaries.
-RUN ln -sv /opt/vc/bin/raspistill /usr/local/bin/raspistill \
-    && ln -sv /opt/vc/bin/raspivid /usr/local/bin/raspivid \
-    && ln -sv /opt/vc/bin/raspividyuv /usr/local/bin/raspividyuv \
-    && ln -sv /opt/vc/bin/raspiyuv /usr/local/bin/raspiyuv
+        raspberrypi-userland \
+        raspberrypi-userland-libs