fix: tons of little things and workarounds

Containerfile

@@ -16,6 +16,6 @@ COPY system_files /
 COPY system_files_overrides /var/tmp/system_files_overrides
 COPY build_scripts /var/tmp/build_scripts
 # FIXME: install UV from EPEL whenever it gets released there, its currently on epel-testing but its broken (07-02-2025)
-COPY --from=uv-bin /uv* /var/tmp/system_files_overrides/dx/usr/bin
+COPY --from=uv-bin /uv* /var/tmp/system_files_overrides/gdx/usr/bin
 
 RUN --mount=type=tmpfs,dst=/tmp --mount=type=bind,from=config,src=/rpms,dst=/tmp/rpms /var/tmp/build_scripts/build.sh

build_scripts/00-workarounds.sh

@@ -8,9 +8,7 @@ set -xeuo pipefail
 # uses during its build.  This avoids downgrading packages in the image that
 # have strict NVR requirements.
 curl --retry 3 -Lo "/etc/yum.repos.d/compose.repo" "https://gitlab.com/redhat/centos-stream/containers/bootc/-/raw/c${MAJOR_VERSION_NUMBER}s/cs.repo"
-sed -r \
-	-e 's@\[rhel-10-for-\$basearch-@[@' \
-	-e 's@-rpms\]@-compose]@' \
-	-e 's@- (BaseOS|AppStream)@& - Compose@' \
-	-e 's@/usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-Official@/etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial-SHA256@' \
-	-i /etc/yum.repos.d/compose.repo
+sed -i -f - /etc/yum.repos.d/compose.repo <<EOF
+s@- (BaseOS|AppStream)@& - Compose@
+s@\(baseos\|appstream\)@&-compose@
+EOF

build_scripts/10-image-info.sh

@@ -46,6 +46,6 @@ EOF
 tee -a /usr/lib/os-release <<EOF
 DOCUMENTATION_URL="${DOCUMENTATION_URL}"
 SUPPORT_URL="${SUPPORT_URL}"
-DEFAULT_HOSTNAME="${IMAGE_PRETTY_NAME,,}"
+DEFAULT_HOSTNAME="bluefin"
 BUILD_ID="${SHA_HEAD_SHORT:-testing}"
 EOF

build_scripts/15-packages-image-base.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -euox pipefail
+set -xeuo pipefail
 
 # This is the base for a minimal GNOME system on CentOS Stream.
 

build_scripts/26-packages-post.sh

@@ -22,8 +22,7 @@ sed -i "/.*io.github.dvlv.boxbuddyrs.*/d" /etc/ublue-os/system-flatpaks.list
 
 # The compose repos we used during the build are point in time repos that are
 # not updated, so we don't want to leave them enabled.
-# FIXME: figure out why this is not working
-# dnf config-manager --set-disabled baseos-compose,appstream-compose
+dnf config-manager --set-disabled baseos-compose,appstream-compose
 
 # Add Flathub by default
 mkdir -p /etc/flatpak/remotes.d

build_scripts/build.sh

@@ -48,6 +48,7 @@ fi
 
 if [ "$ENABLE_GDX" == "1" ] ; then
 	# We explicitly only support x86 on nvidia (unless they update it?)
+	copy_systemfiles_for "gdx"
 	copy_systemfiles_for "x86_64-gdx"
 	run_buildscripts_for "x86_64/gdx"
 fi

build_scripts/cleanup.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -euo pipefail
+set -xeuo pipefail
 
 # Image cleanup
 # Specifically called by build.sh
@@ -21,8 +21,10 @@ shopt -s extglob
 # shellcheck disable=SC2115
 rm -rf /var/!(cache)
 rm -rf /var/cache/!(rpm-ostree)
-rm -rf /var/tmp
+# Ensure /var/tmp exists, FIXME: remove this once this is fixed upstream
+mkdir -p /var/tmp
 dnf clean all
 
-ostree container commit # FIXME: Maybe will not be necessary in the future. Reassess in a few years.
+# FIXME: bootc container lint --fix will replace this
+ostree container commit
 bootc container lint

build_scripts/overrides/aarch64/05-pixi.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -euo pipefail
+set -xeuo pipefail
 
 curl -fsSL https://pixi.sh/install.sh | sh
 install -Dm0755 -t /usr/bin /root/.pixi/bin/pixi

build_scripts/overrides/hwe/10-hyperscale-kernel.sh

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 
-set -euox pipefail
+set -xeuo pipefail
 
 # The hyperscale SIG's kernel straight from their official builds
+
 dnf -y install centos-release-hyperscale-kernel
-dnf config-manager --set-disabled "centos-hyperscale"
-dnf config-manager --set-disabled "centos-hyperscale-kernel"
-dnf versionlock remove kernel kernel-devel kernel-devel-matched kernel-core kernel-modules kernel-modules-core kernel-modules-extra kernel-uki-virt
+dnf config-manager --set-disabled "centos-hyperscale,centos-hyperscale-kernel"
+dnf versionlock delete kernel kernel-devel kernel-devel-matched kernel-core kernel-modules kernel-modules-core kernel-modules-extra kernel-uki-virt
 dnf --enablerepo="centos-hyperscale" --enablerepo="centos-hyperscale-kernel" -y update kernel
 dnf versionlock add kernel kernel-devel kernel-devel-matched kernel-core kernel-modules kernel-modules-core kernel-modules-extra kernel-uki-virt