From 44e54e11d8e390e68849e758b2e599ad7a860bba Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Mon, 11 Dec 2023 15:58:51 +0100 Subject: [PATCH] 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. --- machine/raspberrypi | 11 ++--------- machine/raspberrypi2 | 11 ++--------- machine/raspberrypi3 | 11 ++--------- machine/raspberrypi3-64 | 11 ++--------- machine/raspberrypi4 | 11 ++--------- machine/raspberrypi4-64 | 11 ++--------- machine/yellow | 11 ++--------- 7 files changed, 14 insertions(+), 63 deletions(-) diff --git a/machine/raspberrypi b/machine/raspberrypi index 3cce504661e..2ed3b3c8e44 100644 --- 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 index c49db40b408..2ed3b3c8e44 100644 --- 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 index c49db40b408..2ed3b3c8e44 100644 --- 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 index c49db40b408..2ed3b3c8e44 100644 --- 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 index c49db40b408..2ed3b3c8e44 100644 --- 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 index c49db40b408..2ed3b3c8e44 100644 --- 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 index c49db40b408..2ed3b3c8e44 100644 --- 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