From bac9125ae09f609360b4287207447419fe892b18 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 25 Jun 2026 12:43:38 -0400 Subject: [PATCH 1/3] packaging: Preserve rpmbuild.env for F45+ RPM compatibility There's a new `rpmbuild.env` file we need to preserve. Assisted-by: opencode (claude-opus-4-6) Signed-off-by: Colin Walters --- contrib/packaging/bootc.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/contrib/packaging/bootc.spec b/contrib/packaging/bootc.spec index 8f8d3a67b..7ce0f7fd2 100644 --- a/contrib/packaging/bootc.spec +++ b/contrib/packaging/bootc.spec @@ -112,8 +112,13 @@ cat vendor-config.toml >> .cargo/config.toml rm vendor-config.toml %else # Container build: source already at _builddir (/src), nothing to extract -# RPM's %mkbuilddir creates a subdirectory; symlink it back to the source +# RPM's %mkbuilddir creates a subdirectory; symlink it back to the source. +# F45+ RPM also creates rpmbuild.env in the subdir that %build will source, +# so preserve it before replacing the directory with a symlink. cd .. +if [ -f %{name}-%{version}-build/rpmbuild.env ]; then + mv %{name}-%{version}-build/rpmbuild.env . +fi rm -rf %{name}-%{version}-build ln -s . %{name}-%{version}-build cd %{name}-%{version}-build From 25a46c249a1f015c7eb48d7160fdc4cb5ee4d946 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 25 Jun 2026 13:29:01 -0400 Subject: [PATCH 2/3] ci: Make fedora-45 (rawhide) package build non-gating We want to test on rawhide, but it can't be gating. Assisted-by: opencode (claude-opus-4-6) Signed-off-by: Colin Walters --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7d3039722..c7ea98d4e 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -184,6 +184,8 @@ jobs: test_os: ${{ fromJson(needs.compute-ci-level.outputs.package_os_matrix) }} runs-on: ubuntu-24.04 + # Rawhide is best-effort; don't let it block merges + continue-on-error: ${{ matrix.test_os == 'fedora-45' }} steps: - uses: actions/checkout@v7 From e095ce609a00297bf8a3b813239b5d9381756cd8 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 26 Jun 2026 08:45:33 -0400 Subject: [PATCH 3/3] repos: Exclude more kernel-debug-* These are getting pulled in now; the real fix will be in the fedora-bootc upstream. Signed-off-by: Colin Walters --- contrib/packaging/enable-compose-repos | 6 ++++++ tmt/tests/booted/test-soft-reboot-selinux-policy.nu | 2 ++ 2 files changed, 8 insertions(+) diff --git a/contrib/packaging/enable-compose-repos b/contrib/packaging/enable-compose-repos index 20b5ba30d..dbabe8fd2 100755 --- a/contrib/packaging/enable-compose-repos +++ b/contrib/packaging/enable-compose-repos @@ -27,6 +27,9 @@ gpgcheck=1 enabled=1 priority=1 gpgkey=${gpgkey} +# Workaround for compose repos pulling in unwanted kernel subpackages +# xref https://github.com/bootc-dev/bootc/pull/2267#issuecomment-4809555535 +exclude=kernel-debug* kernel-uki-virt* [compose-appstream] name=CentOS Stream \$releasever Compose AppStream @@ -35,6 +38,9 @@ gpgcheck=1 enabled=1 priority=1 gpgkey=${gpgkey} +# Workaround for compose repos pulling in unwanted kernel subpackages +# xref https://github.com/bootc-dev/bootc/pull/2267#issuecomment-4809555535 +exclude=kernel-debug* kernel-uki-virt* EOF echo "Enabled CentOS Stream compose repos (gpgkey: ${gpgkey})" ;; diff --git a/tmt/tests/booted/test-soft-reboot-selinux-policy.nu b/tmt/tests/booted/test-soft-reboot-selinux-policy.nu index 4e2706804..1ebb11f17 100644 --- a/tmt/tests/booted/test-soft-reboot-selinux-policy.nu +++ b/tmt/tests/booted/test-soft-reboot-selinux-policy.nu @@ -73,6 +73,7 @@ gpgcheck=1 enabled=1 priority=1 gpgkey=($gpgkey) +exclude=kernel-debug* kernel-uki-virt* [compose-appstream] name=CentOS Stream $releasever Compose AppStream @@ -81,6 +82,7 @@ gpgcheck=1 enabled=1 priority=1 gpgkey=($gpgkey) +exclude=kernel-debug* kernel-uki-virt* " $repo_content | save --force centos-compose.repo