Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: pull all build scripts under build_files directory #177

Open
wants to merge 28 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
2d16892
chore: pull all build scripts under build_files directory
mulderje Apr 17, 2024
8a4d3e9
chore: pull common post-build actions into a 'build-post.sh' file
mulderje Apr 17, 2024
c1a6973
fix: mark build-post.sh as executable
mulderje Apr 17, 2024
57f468a
Merge remote-tracking branch 'upstream/main' into extra-refactor-buil…
mulderje Apr 19, 2024
70cc13c
Merge remote-tracking branch 'upstream/main' into extra-refactor-buil…
mulderje Apr 19, 2024
f1b280f
Merge branch 'main' into extra-refactor-build-post
mulderje Apr 27, 2024
bf4f7bf
chore: switch extra file to build-post.sh
mulderje Apr 27, 2024
2297bab
Merge branch 'main' into extra-refactor-build_files-dir
mulderje Apr 27, 2024
1c7acf2
chore: move additional build scripts since initial PR
mulderje Apr 27, 2024
8c8a0e0
chore: leverage new build_files directory and copy to /tmp/build
mulderje Apr 27, 2024
816590a
fixup: remove '/tmp/build/build/' copy/paste that didn't save
mulderje Apr 27, 2024
774cb26
fix(extra): remove framework-laptop duplicate from common
mulderje Apr 27, 2024
d0173fe
chore(extra): remove unnecessary ublue addon spec file
mulderje Apr 27, 2024
6269b6e
fixup(extra): s/common/extra in a copy line
mulderje Apr 27, 2024
5854f49
Merge branch 'extra-refactor-build-post' into extra-refactor-build_fi…
mulderje Apr 27, 2024
0e05913
chore(extra): fold #178 into this PR
mulderje Apr 27, 2024
6673f62
fixup: s/build// from /tmp path change to reduce churn
mulderje May 2, 2024
4079916
Merge branch 'main' into extra-refactor-build_files-dir
mulderje May 15, 2024
be484e0
chore: move kvmf build file to common directory
mulderje May 15, 2024
d4528ad
Merge remote-tracking branch 'upstream/main' into extra-refactor-buil…
mulderje May 16, 2024
59c60a6
Merge branch 'main' into extra-refactor-build_files-dir
mulderje May 22, 2024
4edcade
fix(framework-laptop): ensure only in one kmod stream
mulderje May 22, 2024
f6d84f3
Merge branch 'main' into extra-refactor-build_files-dir
mulderje May 22, 2024
d096674
Merge branch 'main' into extra-refactor-build_files-dir
mulderje May 24, 2024
80e12cb
chore: Update module checks for xone
KyleGospo May 28, 2024
850f990
chore(ci): switch back to 22.04 builders (#202)
castrojo May 29, 2024
49463ec
Merge remote-tracking branch 'upstream/main' into extra-refactor-buil…
mulderje Jun 5, 2024
3fc17df
Merge remote-tracking branch 'upstream/main' into extra-refactor-buil…
mulderje Jun 6, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 15 additions & 19 deletions Containerfile.common
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,18 @@ ARG KERNEL_FLAVOR="{KERNEL_FLAVOR:-main}"
ARG KERNEL_VERSION=""
ARG RPMFUSION_MIRROR=""

COPY build*.sh /tmp
COPY build_files/common build_files/shared /tmp/build/
COPY certs /tmp/certs

# files for akmods
COPY ublue-os-akmods-addons.spec /tmp/ublue-os-akmods-addons/ublue-os-akmods-addons.spec
ADD https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/repo/fedora-${FEDORA_MAJOR_VERSION}/ublue-os-akmods-fedora-${FEDORA_MAJOR_VERSION}.repo \
/tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo
/tmp/build/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo
ADD https://negativo17.org/repos/fedora-multimedia.repo \
/tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/negativo17-fedora-multimedia.repo
/tmp/build/ublue-os-akmods-addons/rpmbuild/SOURCES/negativo17-fedora-multimedia.repo

RUN /tmp/build-prep.sh
RUN /tmp/build/build-prep.sh

RUN /tmp/build-ublue-os-akmods-addons.sh
RUN /tmp/build/build-ublue-os-akmods-addons.sh

# Set kernel name
RUN if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \
Expand All @@ -35,22 +34,19 @@ RUN if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \
export KERNEL_NAME="kernel-surface" \
; fi && \
if grep -qv "asus" <<< "${KERNEL_FLAVOR}"; then \
/tmp/build-kmod-evdi.sh \
/tmp/build/build-kmod-evdi.sh \
; fi && \
/tmp/build-kmod-openrazer.sh && \
/tmp/build-kmod-v4l2loopback.sh && \
/tmp/build-kmod-framework-laptop.sh && \
/tmp/build-kmod-wl.sh && \
/tmp/build-kmod-xpadneo.sh && \
/tmp/build-kmod-xone.sh

RUN cp /tmp/ublue-os-akmods-addons/rpmbuild/RPMS/noarch/ublue-os-akmods-addons*.rpm \
/tmp/build/build-kmod-openrazer.sh && \
/tmp/build/build-kmod-v4l2loopback.sh && \
/tmp/build/build-kmod-wl.sh && \
/tmp/build/build-kmod-xpadneo.sh && \
/tmp/build/build-kmod-xone.sh

RUN cp /tmp/build/ublue-os-akmods-addons/rpmbuild/RPMS/noarch/ublue-os-akmods-addons*.rpm \
/var/cache/rpms/ublue-os/
RUN for RPM in $(find /var/cache/akmods/ -type f -name \*.rpm); do \
cp "${RPM}" /var/cache/rpms/kmods/; \
done

RUN find /var/cache/rpms
# Copy all RPMs from /var/cache/akmods/ to /var/cache/rpms/kmods/
RUN /tmp/build/build-post.sh

FROM scratch

Expand Down
48 changes: 22 additions & 26 deletions Containerfile.extra
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,16 @@ ARG KERNEL_FLAVOR="{KERNEL_FLAVOR:-main}"
ARG KERNEL_VERSION=""
ARG RPMFUSION_MIRROR=""

COPY build*.sh /tmp
COPY build_files/extra build_files/shared /tmp/build/
COPY certs /tmp/certs

# files for akmods
COPY ublue-os-akmods-addons.spec /tmp/ublue-os-akmods-addons/ublue-os-akmods-addons.spec
ADD https://copr.fedorainfracloud.org/coprs/ublue-os/akmods/repo/fedora-${FEDORA_MAJOR_VERSION}/ublue-os-akmods-fedora-${FEDORA_MAJOR_VERSION}.repo \
/tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo
/tmp/build/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo
ADD https://negativo17.org/repos/fedora-multimedia.repo \
/tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/negativo17-fedora-multimedia.repo
/tmp/build/ublue-os-akmods-addons/rpmbuild/SOURCES/negativo17-fedora-multimedia.repo

RUN /tmp/build-prep.sh
RUN /tmp/build/build-prep.sh

# Set kernel name
RUN if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \
Expand All @@ -33,28 +32,25 @@ RUN if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \
export KERNEL_NAME="kernel-surface" \
; fi && \
if grep -qv "fsync" <<< "${KERNEL_FLAVOR}"; then \
/tmp/build-kmod-openrgb.sh \
/tmp/build/build-kmod-openrgb.sh \
; fi && \
/tmp/build-kmod-ayaneo-platform.sh && \
/tmp/build-kmod-ayn-platform.sh && \
/tmp/build-kmod-bmi260.sh && \
/tmp/build-kmod-facetimehd.sh \
/tmp/build-kmod-framework-laptop.sh && \
/tmp/build-kmod-gcadapter_oc.sh && \
/tmp/build-kmod-kvmfr.sh && \
/tmp/build-kmod-nct6687d.sh && \
/tmp/build-kmod-rtl8814au.sh && \
/tmp/build-kmod-rtl88xxau.sh && \
/tmp/build-kmod-ryzen-smu.sh && \
/tmp/build-kmod-vhba.sh && \
/tmp/build-kmod-VirtualBox.sh && \
/tmp/build-kmod-zenergy.sh

RUN for RPM in $(find /var/cache/akmods/ -type f -name \*.rpm); do \
cp "${RPM}" /var/cache/rpms/kmods/; \
done

RUN find /var/cache/rpms
/tmp/build/build-kmod-ayaneo-platform.sh && \
/tmp/build/build-kmod-ayn-platform.sh && \
/tmp/build/build-kmod-bmi260.sh && \
/tmp/build/build-kmod-facetimehd.sh \
/tmp/build/build-kmod-framework-laptop.sh && \
/tmp/build/build-kmod-gcadapter_oc.sh && \
/tmp/build/build-kmod-kvmfr.sh && \
/tmp/build/build-kmod-nct6687d.sh && \
/tmp/build/build-kmod-rtl8814au.sh && \
/tmp/build/build-kmod-rtl88xxau.sh && \
/tmp/build/build-kmod-ryzen-smu.sh && \
/tmp/build/build-kmod-vhba.sh && \
/tmp/build/build-kmod-VirtualBox.sh && \
/tmp/build/build-kmod-zenergy.sh

# Copy all RPMs from /var/cache/akmods/ to /var/cache/rpms/kmods/
RUN /tmp/build/build-post.sh

FROM scratch

Expand Down
29 changes: 13 additions & 16 deletions Containerfile.nvidia
Original file line number Diff line number Diff line change
Expand Up @@ -14,40 +14,37 @@ ARG KERNEL_FLAVOR="{KERNEL_FLAVOR:-main}"
ARG KERNEL_VERSION=""
ARG RPMFUSION_MIRROR=""

COPY build*.sh /tmp
COPY build_files/nvidia build_files/shared /tmp/build/
COPY certs /tmp/certs

# files for nvidia
COPY ublue-os-nvidia-addons.spec /tmp/ublue-os-nvidia-addons/ublue-os-nvidia-addons.spec
ADD https://nvidia.github.io/libnvidia-container/stable/rpm/nvidia-container-toolkit.repo \
/tmp/ublue-os-nvidia-addons/rpmbuild/SOURCES/nvidia-container-toolkit.repo
/tmp/build/ublue-os-nvidia-addons/rpmbuild/SOURCES/nvidia-container-toolkit.repo
ADD https://copr.fedorainfracloud.org/coprs/eyecantcu/supergfxctl/repo/fedora-${FEDORA_MAJOR_VERSION}/eyecantcu-supergfxctl-fedora-${FEDORA_MAJOR_VERSION}.repo \
/tmp/ublue-os-nvidia-addons/rpmbuild/SOURCES/eyecantcu-supergfxctl.repo
/tmp/build/ublue-os-nvidia-addons/rpmbuild/SOURCES/eyecantcu-supergfxctl.repo
ADD https://raw.githubusercontent.com/NVIDIA/dgx-selinux/master/bin/RHEL9/nvidia-container.pp \
/tmp/ublue-os-nvidia-addons/rpmbuild/SOURCES/nvidia-container.pp
ADD files/etc/sway/environment /tmp/ublue-os-nvidia-addons/rpmbuild/SOURCES/environment
ADD files/usr/lib/systemd/system/ublue-nvctk-cdi.service /tmp/ublue-os-nvidia-addons/rpmbuild/SOURCES/ublue-nvctk-cdi.service
ADD files/usr/lib/systemd/system-preset/70-ublue-nvctk-cdi.preset /tmp/ublue-os-nvidia-addons/rpmbuild/SOURCES/70-ublue-nvctk-cdi.preset
/tmp/build/ublue-os-nvidia-addons/rpmbuild/SOURCES/nvidia-container.pp
ADD files/etc/sway/environment /tmp/build/ublue-os-nvidia-addons/rpmbuild/SOURCES/environment
ADD files/usr/lib/systemd/system/ublue-nvctk-cdi.service /tmp/build/ublue-os-nvidia-addons/rpmbuild/SOURCES/ublue-nvctk-cdi.service
ADD files/usr/lib/systemd/system-preset/70-ublue-nvctk-cdi.preset /tmp/build/ublue-os-nvidia-addons/rpmbuild/SOURCES/70-ublue-nvctk-cdi.preset


RUN /tmp/build-prep.sh
RUN /tmp/build/build-prep.sh

RUN /tmp/build-ublue-os-nvidia-addons.sh
RUN /tmp/build/build-ublue-os-nvidia-addons.sh

RUN if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \
export KERNEL_NAME="kernel" \
; else \
export KERNEL_NAME="kernel-surface" \
; fi && \
/tmp/build-kmod-nvidia.sh 550
/tmp/build/build-kmod-nvidia.sh 550

RUN cp /tmp/ublue-os-nvidia-addons/rpmbuild/RPMS/noarch/ublue-os-nvidia-addons*.rpm \
RUN cp /tmp/build/ublue-os-nvidia-addons/rpmbuild/RPMS/noarch/ublue-os-nvidia-addons*.rpm \
/var/cache/rpms/ublue-os/
RUN for RPM in $(find /var/cache/akmods/ -type f -name \*.rpm); do \
cp "${RPM}" /var/cache/rpms/kmods/; \
done

RUN find /var/cache/rpms
# Copy all RPMs from /var/cache/akmods/ to /var/cache/rpms/kmods/
RUN /tmp/build/build-post.sh

FROM scratch

Expand Down
14 changes: 0 additions & 14 deletions build-ublue-os-akmods-addons.sh

This file was deleted.

11 changes: 0 additions & 11 deletions build-ublue-os-nvidia-addons.sh

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARCH="$(rpm -E '%_arch')"
KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
RELEASE="$(rpm -E '%fedora')"

cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/negativo17-fedora-multimedia.repo /etc/yum.repos.d/
cp /tmp/build/ublue-os-akmods-addons/rpmbuild/SOURCES/negativo17-fedora-multimedia.repo /etc/yum.repos.d/

### BUILD evdi (succeed or fail-fast with debug output)
export CFLAGS="-fno-pie -no-pie"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARCH="$(rpm -E '%_arch')"
KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
RELEASE="$(rpm -E '%fedora')"

cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/
cp /tmp/build/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/

### BUILD openrazer (succeed or fail-fast with debug output)
rpm-ostree install \
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARCH="$(rpm -E '%_arch')"
KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
RELEASE="$(rpm -E '%fedora')"

cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/
cp /tmp/build/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/

### BUILD xone (succeed or fail-fast with debug output)
rpm-ostree install \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ARCH="$(rpm -E '%_arch')"
KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
RELEASE="$(rpm -E '%fedora')"

cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/negativo17-fedora-multimedia.repo /etc/yum.repos.d/
cp /tmp/build/ublue-os-akmods-addons/rpmbuild/SOURCES/negativo17-fedora-multimedia.repo /etc/yum.repos.d/

### BUILD xpadneo (succeed or fail-fast with debug output)
rpm-ostree install \
Expand Down
14 changes: 14 additions & 0 deletions build_files/common/build-ublue-os-akmods-addons.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
#!/bin/sh

set -oeux pipefail


### BUILD UBLUE AKMODS-ADDONS RPM
# ensure a higher priority is set for our ublue akmods COPR to pull deps from it over other sources (99 is default)
echo "priority=90" >> /tmp/build/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo

install -D /etc/pki/akmods/certs/public_key.der /tmp/build/ublue-os-akmods-addons/rpmbuild/SOURCES/public_key.der
rpmbuild -ba \
--define '_topdir /tmp/build/ublue-os-akmods-addons/rpmbuild' \
--define '%_tmppath %{_topdir}/tmp' \
/tmp/build/ublue-os-akmods-addons/ublue-os-akmods-addons.spec
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARCH="$(rpm -E '%_arch')"
KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
RELEASE="$(rpm -E '%fedora')"

cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/
cp /tmp/build/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/

rpm-ostree install \
akmod-ayaneo-platform-*.fc${RELEASE}.${ARCH}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARCH="$(rpm -E '%_arch')"
KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
RELEASE="$(rpm -E '%fedora')"

cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/
cp /tmp/build/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/

rpm-ostree install \
akmod-ayn-platform-*.fc${RELEASE}.${ARCH}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARCH="$(rpm -E '%_arch')"
KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
RELEASE="$(rpm -E '%fedora')"

cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/
cp /tmp/build/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/

rpm-ostree install \
akmod-bmi260-*.fc${RELEASE}.${ARCH}
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARCH="$(rpm -E '%_arch')"
KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
RELEASE="$(rpm -E '%fedora')"

cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/
cp /tmp/build/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/

### BUILD framework-laptop (succeed or fail-fast with debug output)
rpm-ostree install \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARCH="$(rpm -E '%_arch')"
KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
RELEASE="$(rpm -E '%fedora')"

cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/
cp /tmp/build/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/

rpm-ostree install \
akmod-gcadapter_oc-*.fc${RELEASE}.${ARCH}
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARCH="$(rpm -E '%_arch')"
KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
RELEASE="$(rpm -E '%fedora')"

cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/
cp /tmp/build/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/

### BUILD nct6687d (succeed or fail-fast with debug output)
rpm-ostree install \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARCH="$(rpm -E '%_arch')"
KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
RELEASE="$(rpm -E '%fedora')"

cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/
cp /tmp/build/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/

rpm-ostree install \
akmod-openrgb-*.fc${RELEASE}.${ARCH}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if [[ "${KERNEL}" =~ "6.8" ]]; then
exit 0
fi

cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/
cp /tmp/build/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/

rpm-ostree install \
akmod-rtl8814au-*.fc${RELEASE}.${ARCH}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ if [[ "${KERNEL}" =~ "6.8" ]]; then
exit 0
fi

cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/
cp /tmp/build/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/

rpm-ostree install \
akmod-rtl88xxau-*.fc${RELEASE}.${ARCH}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARCH="$(rpm -E '%_arch')"
KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
RELEASE="$(rpm -E '%fedora')"

cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/
cp /tmp/build/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/

### BUILD ryzen-smu (succeed or fail-fast with debug output)
rpm-ostree install \
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARCH="$(rpm -E '%_arch')"
KERNEL="$(rpm -q "${KERNEL_NAME}" --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')"
RELEASE="$(rpm -E '%fedora')"

cp /tmp/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/
cp /tmp/build/ublue-os-akmods-addons/rpmbuild/SOURCES/_copr_ublue-os-akmods.repo /etc/yum.repos.d/

rpm-ostree install \
akmod-zenergy-*.fc${RELEASE}.${ARCH}
Expand Down
File renamed without changes.
11 changes: 11 additions & 0 deletions build_files/nvidia/build-ublue-os-nvidia-addons.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/sh

set -oeux pipefail


sed -i "s@gpgcheck=0@gpgcheck=1@" /tmp/build/ublue-os-nvidia-addons/rpmbuild/SOURCES/nvidia-container-toolkit.repo

rpmbuild -ba \
--define '_topdir /tmp/build/ublue-os-nvidia-addons/rpmbuild' \
--define '%_tmppath %{_topdir}/tmp' \
/tmp/build/ublue-os-nvidia-addons/ublue-os-nvidia-addons.spec
9 changes: 9 additions & 0 deletions build_files/shared/build-post.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/sh

set -oeux pipefail

for RPM in $(find /var/cache/akmods/ -type f -name \*.rpm); do \
cp "${RPM}" /var/cache/rpms/kmods/; \
done

find /var/cache/rpms
File renamed without changes.