Skip to content

Commit

Permalink
chore: cleanup containerfile (#1398)
Browse files Browse the repository at this point in the history
Co-authored-by: Mark Mihalik <[email protected]>
  • Loading branch information
m2Giles and Mark Mihalik authored Jun 15, 2024
1 parent a9fcc60 commit bf80af4
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 7 deletions.
7 changes: 0 additions & 7 deletions Containerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,6 @@ COPY --from=akmods /rpms /tmp/akmods-rpms

# Build, cleanup, commit.
RUN rpm-ostree cliwrap install-to-root / && \
mkdir -p /tmp/mediatek-firmware && \
curl -Lo /tmp/mediatek-firmware/WIFI_MT7922_patch_mcu_1_1_hdr.bin https://gitlab.com/kernel-firmware/linux-firmware/-/raw/8f08053b2a7474e210b03dbc2b4ba59afbe98802/mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin?inline=false && \
curl -Lo /tmp/mediatek-firmware/WIFI_RAM_CODE_MT7922_1.bin https://gitlab.com/kernel-firmware/linux-firmware/-/raw/8f08053b2a7474e210b03dbc2b4ba59afbe98802/mediatek/WIFI_RAM_CODE_MT7922_1.bin?inline=false && \
xz --check=crc32 /tmp/mediatek-firmware/WIFI_MT7922_patch_mcu_1_1_hdr.bin && \
xz --check=crc32 /tmp/mediatek-firmware/WIFI_RAM_CODE_MT7922_1.bin && \
mv -vf /tmp/mediatek-firmware/* /usr/lib/firmware/mediatek/ && \
rm -rf /tmp/mediatek-firmware && \
bash -c ". /tmp/build/build-base.sh" && \
rm -rf /tmp/* /var/* && \
mkdir -p /var/tmp && \
Expand Down
1 change: 1 addition & 0 deletions build_files/base/build-base.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

set -ouex pipefail

. /tmp/build/firmware.sh
. /tmp/build/copr-repos.sh
. /tmp/build/install-akmods.sh
. /tmp/build/packages.sh
Expand Down
11 changes: 11 additions & 0 deletions build_files/base/firmware.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/bash

set -xeuo pipefail

mkdir -p /tmp/mediatek-firmware
curl -Lo /tmp/mediatek-firmware/WIFI_MT7922_patch_mcu_1_1_hdr.bin https://gitlab.com/kernel-firmware/linux-firmware/-/raw/8f08053b2a7474e210b03dbc2b4ba59afbe98802/mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin?inline=false
curl -Lo /tmp/mediatek-firmware/WIFI_RAM_CODE_MT7922_1.bin https://gitlab.com/kernel-firmware/linux-firmware/-/raw/8f08053b2a7474e210b03dbc2b4ba59afbe98802/mediatek/WIFI_RAM_CODE_MT7922_1.bin?inline=false
xz --check=crc32 /tmp/mediatek-firmware/WIFI_MT7922_patch_mcu_1_1_hdr.bin
xz --check=crc32 /tmp/mediatek-firmware/WIFI_RAM_CODE_MT7922_1.bin
mv -vf /tmp/mediatek-firmware/* /usr/lib/firmware/mediatek/
rm -rf /tmp/mediatek-firmware

0 comments on commit bf80af4

Please sign in to comment.