Skip to content

Commit

Permalink
chore: restore original indents
Browse files Browse the repository at this point in the history
  • Loading branch information
@p5
p5 authored Oct 22, 2024
1 parent 7fea9dd commit 8dc0ece
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 32 deletions.
16 changes: 8 additions & 8 deletions Containerfile.common
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,17 @@ ADD https://negativo17.org/repos/fedora-multimedia.repo \
RUN --mount=type=cache,dst=/var/cache/dnf \
/tmp/build-prep.sh && \
if [[ "${KERNEL_FLAVOR}" =~ "coreos" ]]; then \
/tmp/build-ublue-os-ucore-addons.sh && \
cp /tmp/ublue-os-ucore-addons/rpmbuild/RPMS/noarch/ublue-os-ucore-addons*.rpm \
/var/cache/rpms/ucore/ \
/tmp/build-ublue-os-ucore-addons.sh && \
cp /tmp/ublue-os-ucore-addons/rpmbuild/RPMS/noarch/ublue-os-ucore-addons*.rpm \
/var/cache/rpms/ucore/ \
; fi && \
/tmp/build-ublue-os-akmods-addons.sh && \
cp /tmp/ublue-os-akmods-addons/rpmbuild/RPMS/noarch/ublue-os-akmods-addons*.rpm \
/var/cache/rpms/ublue-os/ && \
/var/cache/rpms/ublue-os/ && \
if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \
export KERNEL_NAME="kernel" \
export KERNEL_NAME="kernel" \
; else \
export KERNEL_NAME="kernel-surface" \
export KERNEL_NAME="kernel-surface" \
; fi && \
/tmp/build-kmod-kvmfr.sh && \
/tmp/build-kmod-openrazer.sh && \
Expand All @@ -54,10 +54,10 @@ RUN --mount=type=cache,dst=/var/cache/dnf \
/tmp/build-kmod-xone.sh && \
/tmp/dual-sign.sh && \
for RPM in $(find /var/cache/akmods/ -type f -name \*.rpm); do \
cp "${RPM}" /var/cache/rpms/kmods/; \
cp "${RPM}" /var/cache/rpms/kmods/; \
done && \
for RPM in $(find /root/rpmbuild/RPMS/"$(uname -m)"/ -type f -name \*.rpm); do \
cp "${RPM}" /var/cache/rpms/kmods/; \
cp "${RPM}" /var/cache/rpms/kmods/; \
done && \
find /var/cache/rpms

Expand Down
12 changes: 6 additions & 6 deletions Containerfile.extra
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,13 @@ ADD https://negativo17.org/repos/fedora-multimedia.repo \
RUN --mount=type=cache,dst=/var/cache/dnf \
/tmp/build-prep.sh && \
if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \
export KERNEL_NAME="kernel" \
export KERNEL_NAME="kernel" \
; else \
export KERNEL_NAME="kernel-surface" \
export KERNEL_NAME="kernel-surface" \
; fi && \
if grep -qv "asus" <<< "${KERNEL_FLAVOR}"; then \
/tmp/build-kmod-zenergy.sh && \
/tmp/build-kmod-evdi.sh \
/tmp/build-kmod-zenergy.sh && \
/tmp/build-kmod-evdi.sh \
; fi && \
/tmp/build-kmod-ayaneo-platform.sh && \
/tmp/build-kmod-ayn-platform.sh && \
Expand All @@ -54,10 +54,10 @@ RUN --mount=type=cache,dst=/var/cache/dnf \
/tmp/build-kmod-VirtualBox.sh && \
/tmp/dual-sign.sh && \
for RPM in $(find /var/cache/akmods/ -type f -name \*.rpm); do \
cp "${RPM}" /var/cache/rpms/kmods/; \
cp "${RPM}" /var/cache/rpms/kmods/; \
done && \
for RPM in $(find /root/rpmbuild/RPMS/"$(uname -m)"/ -type f -name \*.rpm); do \
cp "${RPM}" /var/cache/rpms/kmods/; \
cp "${RPM}" /var/cache/rpms/kmods/; \
done && \
find /var/cache/rpms

Expand Down
16 changes: 8 additions & 8 deletions Containerfile.nvidia
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,25 +36,25 @@ COPY files/usr/lib/systemd/system-preset/70-ublue-nvctk-cdi.preset /tmp/ublue-os
RUN --mount=type=cache,dst=/var/cache/dnf \
/tmp/build-prep.sh && \
if [[ "${KERNEL_FLAVOR}" =~ "coreos" ]]; then \
/tmp/build-ublue-os-ucore-nvidia.sh && \
cp /tmp/ublue-os-ucore-nvidia/rpmbuild/RPMS/noarch/ublue-os-ucore-nvidia*.rpm \
/var/cache/rpms/ucore/ \
/tmp/build-ublue-os-ucore-nvidia.sh && \
cp /tmp/ublue-os-ucore-nvidia/rpmbuild/RPMS/noarch/ublue-os-ucore-nvidia*.rpm \
/var/cache/rpms/ucore/ \
; fi && \
/tmp/build-ublue-os-nvidia-addons.sh && \
cp /tmp/ublue-os-nvidia-addons/rpmbuild/RPMS/noarch/ublue-os-nvidia-addons*.rpm \
/var/cache/rpms/ublue-os/ && \
/var/cache/rpms/ublue-os/ && \
if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \
export KERNEL_NAME="kernel" \
export KERNEL_NAME="kernel" \
; else \
export KERNEL_NAME="kernel-surface" \
export KERNEL_NAME="kernel-surface" \
; fi && \
/tmp/build-kmod-nvidia.sh kernel && \
/tmp/dual-sign.sh && \
for RPM in $(find /var/cache/akmods/ -type f -name \*.rpm); do \
cp "${RPM}" /var/cache/rpms/kmods/; \
cp "${RPM}" /var/cache/rpms/kmods/; \
done && \
for RPM in $(find /root/rpmbuild/RPMS/"$(uname -m)"/ -type f -name \*.rpm); do \
cp "${RPM}" /var/cache/rpms/kmods/; \
cp "${RPM}" /var/cache/rpms/kmods/; \
done && \
find /var/cache/rpms

Expand Down
16 changes: 8 additions & 8 deletions Containerfile.nvidia-open
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,25 +36,25 @@ COPY files/usr/lib/systemd/system-preset/70-ublue-nvctk-cdi.preset /tmp/ublue-os
RUN --mount=type=cache,dst=/var/cache/dnf \
/tmp/build-prep.sh && \
if [[ "${KERNEL_FLAVOR}" =~ "coreos" ]]; then \
/tmp/build-ublue-os-ucore-nvidia.sh && \
cp /tmp/ublue-os-ucore-nvidia/rpmbuild/RPMS/noarch/ublue-os-ucore-nvidia*.rpm \
/var/cache/rpms/ucore/ \
/tmp/build-ublue-os-ucore-nvidia.sh && \
cp /tmp/ublue-os-ucore-nvidia/rpmbuild/RPMS/noarch/ublue-os-ucore-nvidia*.rpm \
/var/cache/rpms/ucore/ \
; fi && \
/tmp/build-ublue-os-nvidia-addons.sh && \
cp /tmp/ublue-os-nvidia-addons/rpmbuild/RPMS/noarch/ublue-os-nvidia-addons*.rpm \
/var/cache/rpms/ublue-os/ && \
/var/cache/rpms/ublue-os/ && \
if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \
export KERNEL_NAME="kernel" \
export KERNEL_NAME="kernel" \
; else \
export KERNEL_NAME="kernel-surface" \
export KERNEL_NAME="kernel-surface" \
; fi && \
/tmp/build-kmod-nvidia.sh kernel-open && \
/tmp/dual-sign.sh && \
for RPM in $(find /var/cache/akmods/ -type f -name \*.rpm); do \
cp "${RPM}" /var/cache/rpms/kmods/; \
cp "${RPM}" /var/cache/rpms/kmods/; \
done && \
for RPM in $(find /root/rpmbuild/RPMS/"$(uname -m)"/ -type f -name \*.rpm); do \
cp "${RPM}" /var/cache/rpms/kmods/; \
cp "${RPM}" /var/cache/rpms/kmods/; \
done && \
find /var/cache/rpms

Expand Down
4 changes: 2 additions & 2 deletions Containerfile.zfs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,9 @@ COPY --from=kernel_cache /tmp/rpms /tmp/kernel_cache
RUN --mount=type=cache,dst=/var/cache/dnf \
/tmp/build-prep.sh && \
if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \
export KERNEL_NAME="kernel" \
export KERNEL_NAME="kernel" \
; else \
export KERNEL_NAME="kernel-surface" \
export KERNEL_NAME="kernel-surface" \
; fi && \
/tmp/build-kmod-zfs.sh && \
/tmp/dual-sign-zfs.sh
Expand Down

0 comments on commit 8dc0ece

Please sign in to comment.