chore(extra): fold ublue-os#178 into this PR

mulderje · Apr 27, 2024 · 0e05913 · 0e05913
1 parent 5854f49
commit 0e05913
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 3 deletions.
diff --git a/Containerfile.common b/Containerfile.common
@@ -46,7 +46,7 @@ RUN cp /tmp/build/ublue-os-akmods-addons/rpmbuild/RPMS/noarch/ublue-os-akmods-ad
       /var/cache/rpms/ublue-os/
 
 # Copy all RPMs from /var/cache/akmods/ to /var/cache/rpms/kmods/
-RUN /tmp/build-post.sh
+RUN /tmp/build/build-post.sh
 
 FROM scratch
 

diff --git a/Containerfile.extra b/Containerfile.extra
@@ -50,7 +50,7 @@ RUN if grep -qv "surface" <<< "${KERNEL_FLAVOR}"; then \
     /tmp/build/build-kmod-zenergy.sh
 
 # Copy all RPMs from /var/cache/akmods/ to /var/cache/rpms/kmods/
-RUN /tmp/build-post.sh
+RUN /tmp/build/build-post.sh
 
 FROM scratch
 

diff --git a/Containerfile.nvidia b/Containerfile.nvidia
@@ -44,7 +44,7 @@ RUN cp /tmp/build/ublue-os-nvidia-addons/rpmbuild/RPMS/noarch/ublue-os-nvidia-ad
       /var/cache/rpms/ublue-os/
 
 # Copy all RPMs from /var/cache/akmods/ to /var/cache/rpms/kmods/
-RUN /tmp/build-post.sh
+RUN /tmp/build/build-post.sh
 
 FROM scratch
 

diff --git a/build-post.sh → build_files/shared/build-post.sh b/build-post.sh → build_files/shared/build-post.sh