chore: update the kernel on build + add gsconnect just for aarch64 fo…

…r now + attempt to fix systemd-resolved (#343)
ublue-os · Feb 26, 2025 · 7bba110 · 7bba110
1 parent 8b5e154
commit 7bba110
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/build_scripts/00-workarounds.sh b/build_scripts/00-workarounds.sh
@@ -12,3 +12,4 @@ sed -i \
 	-e "s@- (BaseOS|AppStream)@& - Compose@" \
 	-e "s@\(baseos\|appstream\)@&-compose@" \
 	/etc/yum.repos.d/compose.repo
+cat /etc/yum.repos.d/compose.repo
diff --git a/build_scripts/15-packages-image-base.sh b/build_scripts/15-packages-image-base.sh
@@ -8,9 +8,11 @@ set -xeuo pipefail
 dnf remove -y subscription-manager
 
 # The base images take super long to update, this just updates manually for now
+# FIXME: necessary for aarch64 builds as they dont create that dir for some reason
+mkdir -p /boot/dtb
+dnf -y update
 dnf -y install 'dnf-command(versionlock)'
 dnf versionlock add kernel kernel-devel kernel-devel-matched kernel-core kernel-modules kernel-modules-core kernel-modules-extra kernel-uki-virt
-dnf -y update
 
 dnf -y install epel-release
 dnf config-manager --set-enabled crb

diff --git a/build_scripts/20-packages.sh b/build_scripts/20-packages.sh
@@ -55,7 +55,7 @@ dnf config-manager --add-repo "https://copr.fedorainfracloud.org/coprs/ublue-os/
 dnf config-manager --set-disabled "copr:copr.fedorainfracloud.org:ublue-os:staging"
 dnf -y --enablerepo copr:copr.fedorainfracloud.org:ublue-os:staging install \
 	jetbrains-mono-fonts-all \
-	gnome-shell-extension-{search-light,logo-menu,caffeine}
+	gnome-shell-extension-{search-light,logo-menu,caffeine,gsconnect}
 
 dnf config-manager --add-repo "https://copr.fedorainfracloud.org/coprs/che/nerd-fonts/repo/centos-stream-${MAJOR_VERSION_NUMBER}/che-nerd-fonts-centos-stream-${MAJOR_VERSION_NUMBER}.repo"
 dnf config-manager --set-disabled copr:copr.fedorainfracloud.org:che:nerd-fonts

diff --git a/build_scripts/overrides/gdx/20-nvidia.sh b/build_scripts/overrides/gdx/20-nvidia.sh
@@ -9,12 +9,9 @@ dnf config-manager --add-repo="https://negativo17.org/repos/epel-nvidia.repo"
 dnf config-manager --set-disabled "epel-nvidia"
 
 # These are necessary for building the nvidia drivers
-# DKMS is provided by EPEL
 # Also make sure the kernel is locked before this is run whenever the kernel updates
 # kernel-devel might pull in an entire new kernel if you dont do
-# dnf -y update kernel
 dnf -y install "kernel-devel-$QUALIFIED_KERNEL" "kernel-devel-matched-$QUALIFIED_KERNEL" "kernel-headers-$QUALIFIED_KERNEL"  dkms gcc-c++
-# dnf versionlock add kernel kernel-devel kernel-devel-matched kernel-core kernel-modules kernel-modules-core kernel-modules-extra kernel-uki-virt
 
 dnf install -y --enablerepo="epel-nvidia" \
   cuda nvidia-driver{,-cuda} dkms-nvidia