-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: split container build into distinct build script stages (#59)
- Loading branch information
1 parent
301b353
commit ca99377
Showing
4 changed files
with
106 additions
and
86 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,64 @@ | ||
| #!/bin/sh | ||
|
|
||
| set -oeux pipefail | ||
|
|
||
| RELEASE="$(rpm -E '%fedora.%_arch')" | ||
|
|
||
| sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-{cisco-openh264,modular,updates-modular}.repo | ||
|
|
||
| # nvidia 520.xxx and newer currently don't have a -$VERSIONxx suffix in their | ||
| # package names | ||
| if [[ "${NVIDIA_MAJOR_VERSION}" -ge 520 ]]; then | ||
| NVIDIA_PACKAGE_NAME="nvidia" | ||
| else | ||
| NVIDIA_PACKAGE_NAME="nvidia-${NVIDIA_MAJOR_VERSION}xx" | ||
| fi | ||
|
|
||
| rpm-ostree install \ | ||
| akmod-${NVIDIA_PACKAGE_NAME}*:${NVIDIA_MAJOR_VERSION}.*.fc${RELEASE} \ | ||
| xorg-x11-drv-${NVIDIA_PACKAGE_NAME}-{,cuda,devel,kmodsrc,power}*:${NVIDIA_MAJOR_VERSION}.*.fc${RELEASE} \ | ||
| mock | ||
|
|
||
| /tmp/build/ublue-os-just/build.sh | ||
|
|
||
| # alternatives cannot create symlinks on its own during a container build | ||
| ln -s /usr/bin/ld.bfd /etc/alternatives/ld && ln -s /etc/alternatives/ld /usr/bin/ld | ||
|
|
||
| if [[ ! -s "/tmp/certs/private_key.priv" ]]; then | ||
| echo "WARNING: Using test signing key. Run './generate-akmods-key' for production builds." | ||
| cp /tmp/certs/private_key.priv{.test,} | ||
| cp /tmp/certs/public_key.der{.test,} | ||
| fi | ||
|
|
||
| install -Dm644 /tmp/certs/public_key.der /etc/pki/akmods/certs/public_key.der | ||
| install -Dm644 /tmp/certs/private_key.priv /etc/pki/akmods/private/private_key.priv | ||
|
|
||
| # Either successfully build and install the kernel modules, or fail early with debug output | ||
| KERNEL_VERSION="$(rpm -q kernel --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')" | ||
| NVIDIA_AKMOD_VERSION="$(basename "$(rpm -q "akmod-${NVIDIA_PACKAGE_NAME}" --queryformat '%{VERSION}-%{RELEASE}')" ".fc${RELEASE%%.*}")" | ||
| NVIDIA_LIB_VERSION="$(basename "$(rpm -q "xorg-x11-drv-${NVIDIA_PACKAGE_NAME}" --queryformat '%{VERSION}-%{RELEASE}')" ".fc${RELEASE%%.*}")" | ||
| NVIDIA_FULL_VERSION="$(rpm -q "xorg-x11-drv-${NVIDIA_PACKAGE_NAME}" --queryformat '%{EPOCH}:%{VERSION}-%{RELEASE}.%{ARCH}')" | ||
|
|
||
| akmods --force --kernels "${KERNEL_VERSION}" --kmod "${NVIDIA_PACKAGE_NAME}" | ||
|
|
||
| modinfo /usr/lib/modules/${KERNEL_VERSION}/extra/${NVIDIA_PACKAGE_NAME}/nvidia{,-drm,-modeset,-peermem,-uvm}.ko.xz > /dev/null || \ | ||
| (cat /var/cache/akmods/${NVIDIA_PACKAGE_NAME}/${NVIDIA_AKMOD_VERSION}-for-${KERNEL_VERSION}.failed.log && exit 1) | ||
|
|
||
| sed -i "s@gpgcheck=0@gpgcheck=1@" /tmp/ublue-os-nvidia-addons/rpmbuild/SOURCES/nvidia-container-runtime.repo | ||
|
|
||
| install -D /etc/pki/akmods/certs/public_key.der /tmp/ublue-os-nvidia-addons/rpmbuild/SOURCES/public_key.der | ||
|
|
||
| rpmbuild -ba \ | ||
| --define '_topdir /tmp/ublue-os-nvidia-addons/rpmbuild' \ | ||
| --define '%_tmppath %{_topdir}/tmp' \ | ||
| /tmp/ublue-os-nvidia-addons/ublue-os-nvidia-addons.spec | ||
|
|
||
| cat <<EOF > /var/cache/akmods/nvidia-vars | ||
| KERNEL_VERSION=${KERNEL_VERSION} | ||
| RELEASE=${RELEASE} | ||
| NVIDIA_PACKAGE_NAME=${NVIDIA_PACKAGE_NAME} | ||
| NVIDIA_MAJOR_VERSION=${NVIDIA_MAJOR_VERSION} | ||
| NVIDIA_FULL_VERSION=${NVIDIA_FULL_VERSION} | ||
| NVIDIA_AKMOD_VERSION=${NVIDIA_AKMOD_VERSION} | ||
| NVIDIA_LIB_VERSION=${NVIDIA_LIB_VERSION} | ||
| EOF |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| #!/bin/sh | ||
|
|
||
| set -ouex pipefail | ||
|
|
||
| sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/fedora-{cisco-openh264,modular,updates-modular}.repo | ||
|
|
||
| install -D /tmp/ublue-os-nvidia-addons/rpmbuild/SOURCES/nvidia-container-runtime.repo \ | ||
| /etc/yum.repos.d/nvidia-container-runtime.repo | ||
|
|
||
| source /tmp/akmods/nvidia-vars | ||
|
|
||
| rpm-ostree install \ | ||
| xorg-x11-drv-${NVIDIA_PACKAGE_NAME}-{,cuda-,devel-,kmodsrc-,power-}${NVIDIA_FULL_VERSION} \ | ||
| nvidia-container-toolkit nvidia-vaapi-driver \ | ||
| /tmp/akmods/${NVIDIA_PACKAGE_NAME}/kmod-${NVIDIA_PACKAGE_NAME}-${KERNEL_VERSION}-${NVIDIA_AKMOD_VERSION}.fc${RELEASE}.rpm \ | ||
| /tmp/ublue-os-nvidia-addons/rpmbuild/RPMS/noarch/ublue-os-nvidia-addons-*.rpm \ | ||
| /tmp/ublue-os/rpmbuild/RPMS/noarch/ublue-os-just-*.noarch.rpm |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| #!/bin/sh | ||
|
|
||
| set -ouex pipefail | ||
|
|
||
| mv /etc/nvidia-container-runtime/config.toml{,.orig} | ||
| cp /etc/nvidia-container-runtime/config{-rootless,}.toml | ||
|
|
||
| semodule --verbose --install /usr/share/selinux/packages/nvidia-container.pp | ||
| sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/rpmfusion-{,non}free{,-updates}.repo | ||
| ln -s /usr/bin/ld.bfd /etc/alternatives/ld | ||
| ln -s /etc/alternatives/ld /usr/bin/ld | ||
|
|
||
| if [[ "${IMAGE_NAME}" == "sericea" ]]; then | ||
| mv /etc/sway/environment{,.orig} | ||
| install -Dm644 /usr/share/ublue-os/etc/sway/environment /etc/sway/environment | ||
| fi |