From e3832fea8141aa041a58945a1bf6bbc6f088b669 Mon Sep 17 00:00:00 2001 From: Kyle Gospodnetich Date: Sun, 27 Oct 2024 17:40:14 -0700 Subject: [PATCH] chore: Move to symlinks for aw87559 firmware --- Containerfile | 12 +++++------- system_files/deck/shared/usr/bin/steamos-update | 5 +---- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/Containerfile b/Containerfile index d638f447..48ee8058 100644 --- a/Containerfile +++ b/Containerfile @@ -270,13 +270,11 @@ RUN --mount=type=cache,dst=/var/cache/rpm-ostree \ mv -vf /tmp/linux-firmware-galileo/* /usr/lib/firmware/qca/ && \ rm -rf /tmp/linux-firmware-galileo && \ rm -rf /usr/share/alsa/ucm2/conf.d/acp5x/Valve-Jupiter-1.conf && \ - mkdir -p /tmp/aw87559 && \ - mkdir -p /usr/lib/firmware/aw87559 && \ - curl -Lo /tmp/aw87559/aw87xxx_acf.bin https://github.com/orangepi-xunlong/firmware/raw/refs/heads/master/aw87xxx_acf.bin && \ - xz --check=crc32 /tmp/aw87559/aw87xxx_acf.bin && \ - mv -vf /tmp/aw87559/aw87xxx_acf.bin.xz /usr/lib/firmware/aw87559/aw87xxx_acf.bin.xz && \ - ln -s aw87559/aw87xxx_acf.bin.xz /usr/lib/firmware/aw87xxx_acf.bin.xz && \ - rm -rf /tmp/aw87559 && \ + ln -s /usr/local/lib/firmware/aw87xxx_acf.bin /usr/lib/firmware/aw87xxx_acf.bin && \ + ln -s /usr/local/lib/firmware/aw87xxx_acf_air1s.bin /usr/lib/firmware/aw87xxx_acf_air1s.bin && \ + ln -s /usr/local/lib/firmware/aw87xxx_acf_kun.bin /usr/lib/firmware/aw87xxx_acf_kun.bin && \ + ln -s /usr/local/lib/firmware/aw87xxx_acf_minipro.bin /usr/lib/firmware/aw87xxx_acf_minipro.bin && \ + ln -s /usr/local/lib/firmware/aw87xxx_acf_orangepi.bin /usr/lib/firmware/aw87xxx_acf_orangepi.bin && \ if [[ "${IMAGE_FLAVOR}" =~ "asus" ]]; then \ curl -Lo /etc/yum.repos.d/_copr_lukenukem-asus-linux.repo https://copr.fedorainfracloud.org/coprs/lukenukem/asus-linux/repo/fedora-$(rpm -E %fedora)/lukenukem-asus-linux-fedora-$(rpm -E %fedora).repo && \ rpm-ostree install \ diff --git a/system_files/deck/shared/usr/bin/steamos-update b/system_files/deck/shared/usr/bin/steamos-update index fc4bec08..a2facdda 100755 --- a/system_files/deck/shared/usr/bin/steamos-update +++ b/system_files/deck/shared/usr/bin/steamos-update @@ -26,10 +26,7 @@ done if command -v ublue-update > /dev/null; then - if [ ! -f '/etc/gamemode-update-check' ]; then - touch /etc/gamemode-update-check - exit 7 # Skip the first update to simplify new installs. - elif [ -n "${CHECK}" ]; then + if [ -n "${CHECK}" ]; then if [ -f '/tmp/upgrade-installed' ]; then exit 7 # Upgrade already installed else