From 8e082bedec41131b69c4834e4c2eea2034e37bf4 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 9 Jan 2026 15:36:08 -0500 Subject: [PATCH] Release 1.12.0 Drop 0000-test-soft-reboot-selinux-policy.patch as it was merged upstream in commit 3a7dd85f. Resolves: #RHEL-135687 Assisted-by: OpenCode (Opus 4.5) Signed-off-by: Colin Walters --- .gitignore | 2 ++ 0000-test-soft-reboot-selinux-policy.patch | 36 ---------------------- bootc.spec | 5 +-- sources | 4 +-- 4 files changed, 5 insertions(+), 42 deletions(-) delete mode 100644 0000-test-soft-reboot-selinux-policy.patch diff --git a/.gitignore b/.gitignore index 2344bea..32e9aad 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,5 @@ /bootc-1.10.0-vendor.tar.zstd /bootc-1.11.0.tar.zstd /bootc-1.11.0-vendor.tar.zstd +/bootc-1.12.0-vendor.tar.zstd +/bootc-1.12.0.tar.zstd diff --git a/0000-test-soft-reboot-selinux-policy.patch b/0000-test-soft-reboot-selinux-policy.patch deleted file mode 100644 index 9017511..0000000 --- a/0000-test-soft-reboot-selinux-policy.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git i/tmt/tests/booted/test-soft-reboot-selinux-policy.nu w/tmt/tests/booted/test-soft-reboot-selinux-policy.nu -index ca06efea..d5a057e7 100644 ---- i/tmt/tests/booted/test-soft-reboot-selinux-policy.nu -+++ w/tmt/tests/booted/test-soft-reboot-selinux-policy.nu -@@ -32,11 +32,30 @@ def initial_build [] { - - bootc image copy-to-storage - -+ # copy-to-storage does not copy repo file -+ # but OSCI gating test needs repo to install package -+ let os = open /usr/lib/os-release -+ | lines -+ | filter {|l| $l != "" and not ($l | str starts-with "#") } -+ | parse "{key}={value}" -+ | reduce {|it, acc| -+ $acc | upsert $it.key ($it.value | str trim -c '"') -+ } -+ mut repo_copy = "" -+ -+ if $os.ID == "rhel" { -+ cp /etc/yum.repos.d/rhel.repo . -+ $repo_copy = "COPY rhel.repo /etc/yum.repos.d/" -+ } -+ - # Create a derived container that installs a custom SELinux policy module - # Installing a policy module will change the compiled policy checksum - # Following Colin's suggestion and the composefs-rs example - # We create a minimal policy module and install it -- "FROM localhost/bootc -+ $" -+FROM localhost/bootc -+($repo_copy) -+ - # Install tools needed to build and install SELinux policy modules - RUN dnf install -y selinux-policy-devel checkpolicy policycoreutils - diff --git a/bootc.spec b/bootc.spec index 8f8d920..a18fbf0 100644 --- a/bootc.spec +++ b/bootc.spec @@ -22,7 +22,7 @@ %endif Name: bootc -Version: 1.11.0 +Version: 1.12.0 Release: %{autorelease} Summary: Bootable container system @@ -39,9 +39,6 @@ URL: https://github.com/bootc-dev/bootc Source0: %{url}/releases/download/v%{version}/bootc-%{version}.tar.zstd Source1: %{url}/releases/download/v%{version}/bootc-%{version}-vendor.tar.zstd -# Patch for test-soft-reboot-selinux-policy -Patch0: 0000-test-soft-reboot-selinux-policy.patch - # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval ExcludeArch: %{ix86} diff --git a/sources b/sources index d52f683..1b93947 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (bootc-1.11.0.tar.zstd) = f3bc4ca8d99abe5154fbccf84694bd5aebdb819d90a83ad119aee7ae4469b2e4f5313e6ce65831c007d88ddabe144bc9757793d16963a9d52ff66912057049f0 -SHA512 (bootc-1.11.0-vendor.tar.zstd) = 2198d4cf9e9e44e30f1f3e998e8d640afa5fa7d2b0904a6d1ea972ff637e2a55e37fbf2b2e18454736208cec6541b98c0bd685bc8fd959346aa2be1b4aaa1729 +SHA512 (bootc-1.12.0-vendor.tar.zstd) = 2d26d305cde33949a17a5b78b37e451c6f1511f8b64841fe8731b0ba47a9a6246acbe4b9054ee863692b9d2b1b439ffb234dfac3e746e4490ffe2830bbc60c8c +SHA512 (bootc-1.12.0.tar.zstd) = e604cb347be6d109909deafd69068528dbc032eee55f2b1f414f03aeac7549e6b9d7756b537e9a48b711f32198a9c3bfd41db238c64c6618eab87bbb1167decc