import CS bootc-1.8.0-2.el9_7

.bootc.metadata

@@ -1,2 +1,2 @@
-f845ad2a14b147102fd407cff8c75f46f18485e6 SOURCES/bootc-1.1.5-vendor.tar.zstd
+9ca5bceee40bd840b691c0a8024b2b6a916c36e7 SOURCES/bootc-1.8.0-vendor.tar.zstd
-77fd4b2f65b52577b0f8a3c6679b04ce5eff47ac SOURCES/bootc-1.1.5.tar.zstd
+b97adc7d411b192030dddea89366e2d6ebc5c7c2 SOURCES/bootc-1.8.0.tar.zstd

.gitignore

@@ -1,2 +1,2 @@
-SOURCES/bootc-1.1.5-vendor.tar.zstd
+SOURCES/bootc-1.8.0-vendor.tar.zstd
-SOURCES/bootc-1.1.5.tar.zstd
+SOURCES/bootc-1.8.0.tar.zstd

SOURCES/0000-bootc-inistall-provision.patch

@@ -0,0 +1,65 @@
+diff --git i/tmt/tests/bootc-install-provision.sh w/tmt/tests/bootc-install-provision.sh
+index c4c884b..29df30c 100755
+--- i/tmt/tests/bootc-install-provision.sh
++++ w/tmt/tests/bootc-install-provision.sh
+@@ -4,6 +4,8 @@ set -exuo pipefail
+ BOOTC_TEMPDIR=$(mktemp -d)
+ trap 'rm -rf -- "$BOOTC_TEMPDIR"' EXIT
+ 
++ARCH=$(uname -m)
++
+ # LBI only enabled for test-22-logically-bound-install
+ LBI="${LBI:-disabled}"
+ 
+@@ -16,6 +18,28 @@ case "$ID" in
+     "fedora")
+         TIER1_IMAGE_URL="${TIER1_IMAGE_URL:-quay.io/fedora/fedora-bootc:${VERSION_ID}}"
+         ;;
++    "rhel")
++        TIER1_IMAGE_URL="${TIER1_IMAGE_URL:-images.paas.redhat.com/bootc/rhel-bootc:latest-${VERSION_ID}}"
++
++        CURRENT_COMPOSE_ID=$(skopeo inspect --no-tags --retry-times=5 --tls-verify=false "docker://${TIER1_IMAGE_URL}" | jq -r '.Labels."redhat.compose-id"')
++
++        if [[ -n ${CURRENT_COMPOSE_ID} ]]; then
++            if [[ ${CURRENT_COMPOSE_ID} == *-updates-* ]]; then
++                BATCH_COMPOSE="updates/"
++            else
++                BATCH_COMPOSE=""
++            fi
++        else
++            BATCH_COMPOSE="updates/"
++            CURRENT_COMPOSE_ID=latest-RHEL-$VERSION_ID
++        fi
++
++        # use latest compose if specific compose is not accessible
++        RC=$(curl -skIw '%{http_code}' -o /dev/null "http://download.eng.bos.redhat.com/rhel-${VERSION_ID%%.*}/nightly/${BATCH_COMPOSE}RHEL-${VERSION_ID%%.*}/${CURRENT_COMPOSE_ID}/STATUS")
++        if [[ $RC != "200" ]]; then
++            CURRENT_COMPOSE_ID=latest-RHEL-${VERSION_ID%%}
++        fi
++        ;;
+ esac
+ 
+ if [ "$TMT_REBOOT_COUNT" -eq 0 ]; then
+@@ -93,6 +117,22 @@ COMMONEOF
+         tee "$FEDORA_CI_CONTAINERFILE" > /dev/null << FEDORACIEOF
+ FROM $TIER1_IMAGE_URL
+ 
++RUN <<REPORUN
++tee "/etc/yum.repos.d/rhel.repo" >/dev/null <<RHELREPOEOF
++[rhel-baseos]
++name=baseos
++baseurl=http://download.eng.bos.redhat.com/rhel-${VERSION_ID%%.*}/nightly/${BATCH_COMPOSE}RHEL-${VERSION_ID%%.*}/${CURRENT_COMPOSE_ID}/compose/BaseOS/${ARCH}/os/
++enabled=1
++gpgcheck=0
++
++[rhel-appstream]
++name=appstream
++baseurl=http://download.eng.bos.redhat.com/rhel-${VERSION_ID%%.*}/nightly/${BATCH_COMPOSE}RHEL-${VERSION_ID%%.*}/${CURRENT_COMPOSE_ID}/compose/AppStream/${ARCH}/os/
++enabled=1
++gpgcheck=0
++RHELREPOEOF
++REPORUN
++
+ RUN dnf -y upgrade /rpms/*.rpm
+ FEDORACIEOF
+         cat >"$CONTAINERFILE" <<REALEOF

SOURCES/0001-bootc-inistall-provision.patch

@@ -0,0 +1,14 @@
+diff --git i/tmt/tests/bootc-install-provision.sh w/tmt/tests/bootc-install-provision.sh
+index 6c9968c..c617d5e 100755
+--- i/tmt/tests/bootc-install-provision.sh
++++ w/tmt/tests/bootc-install-provision.sh
+@@ -50,7 +50,8 @@ if [ "$TMT_REBOOT_COUNT" -eq 0 ]; then
+     fi
+ 
+     # Some rhts-*, rstrnt-* and tmt-* commands are in /usr/local/bin
+-    cp -r /usr/local/bin "$BOOTC_TEMPDIR"
++    cp -r /var/lib/tmt/scripts "$BOOTC_TEMPDIR/bin"
++    ls -al "$BOOTC_TEMPDIR/bin"
+ 
+     # Check image building folder content
+     ls -al "$BOOTC_TEMPDIR"

SPECS/bootc.spec

@@ -1,5 +1,5 @@
 %bcond_without check
-%if 0%{?rhel} >= 10 || 0%{?fedora} > 41
+%if 0%{?rhel} >= 9 || 0%{?fedora} > 41
     %bcond_without ostree_ext
 %else
     %bcond_with ostree_ext
@@ -12,8 +12,8 @@
 %endif
 
 Name:           bootc
-Version:        1.1.5
+Version:        1.8.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Bootable container system
 
 # Apache-2.0
@@ -29,6 +29,11 @@ URL:            https://github.com/containers/bootc
 Source0:        %{url}/releases/download/v%{version}/bootc-%{version}.tar.zstd
 Source1:        %{url}/releases/download/v%{version}/bootc-%{version}-vendor.tar.zstd
 
+# Don't remove, downstream patch only
+# Patch for integration test RHEL 9.x and 10.x support
+Patch0: 0000-bootc-inistall-provision.patch
+Patch1: 0001-bootc-inistall-provision.patch
+
 # https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
 ExcludeArch:    %{ix86}
 
@@ -65,12 +70,14 @@ Provides: ostree-cli(ostree-container)
 # (-n because we don't want the subpackage name to start with bootc-)
 %package -n system-reinstall-bootc
 Summary: Utility to reinstall the current system using bootc
-Requires: podman
+Recommends: podman
 # The reinstall subpackage intentionally does not require bootc, as it pulls in many unnecessary dependencies
 
 %description -n system-reinstall-bootc
 This package provides a utility to simplify reinstalling the current system to a given bootc image.
 
+%global system_reinstall_bootc_install_podman_path %{_prefix}/lib/system-reinstall-bootc/install-podman
+
 %prep
 %autosetup -p1 -a1
 # Default -v vendor config doesn't support non-crates.io deps (i.e. git)
@@ -89,7 +96,18 @@ rm vendor-config.toml
 
 # Build the system reinstallation CLI binary
 %global cargo_args -p system-reinstall-bootc
-%cargo_build
+export SYSTEM_REINSTALL_BOOTC_INSTALL_PODMAN_PATH=%{system_reinstall_bootc_install_podman_path}
+%if 0%{?fedora} || 0%{?rhel} >= 10
+    # In cargo-rpm-macros, the cargo_build macro does flag processing,
+    # so we need to pass '--' to signify that cargo_args is not part
+    # of the macro args
+    %cargo_build -- %cargo_args
+%else
+    # Older macros from rust-toolset do *not* do flag processing, so
+    # '--' would be passed through to cargo directly, which is not
+    # what we want.
+    %cargo_build %cargo_args
+%endif
 
 %cargo_vendor_manifest
 # https://pagure.io/fedora-rust/rust-packaging/issue/33
@@ -102,6 +120,12 @@ sed -i -e '/https:\/\//d' cargo-vendor.txt
 %if %{with ostree_ext}
 make install-ostree-hooks DESTDIR=%{?buildroot}
 %endif
+mkdir -p %{buildroot}/%{dirname:%{system_reinstall_bootc_install_podman_path}}
+cat >%{?buildroot}/%{system_reinstall_bootc_install_podman_path} <<EOF
+#!/bin/bash
+exec dnf -y install podman
+EOF
+chmod +x %{?buildroot}/%{system_reinstall_bootc_install_podman_path}
 
 %if %{with check}
 %check
@@ -126,8 +150,45 @@ make install-ostree-hooks DESTDIR=%{?buildroot}
 
 %files -n system-reinstall-bootc
 %{_bindir}/system-reinstall-bootc
+%{system_reinstall_bootc_install_podman_path}
 
 %changelog
+* Fri Sep 05 2025 Colin Walters <walters@verbum.org> - 1.8.0-2
+- Update to 1.8.0
+
+* Tue Aug 26 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 1.7.1-1
+- Update to 1.7.1
+- Resolves: #RHEL-111339
+
+* Thu Aug 21 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 1.7.0-1
+- Update to 1.7.0
+- Resolves: #RHEL-109555
+
+* Fri Jul 22 2025 Gursewak Mangat <gurssing@redhat.com> - 1.5.1-1
+- Update to 1.5.1
+- Resolves: #RHEL-104335
+
+* Fri Jul 11 2025 Gursewak Mangat <gurssing@redhat.com> - 1.4.0-1
+- Update to 1.4.0
+- Resolves: #RHEL-103125
+
+* Fri May 30 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 1.3.0-1
+- Update to 1.3.0
+- Resolves: #RHEL-94597
+
+* Tue Apr 15 2025 John Eckersberg <jeckersb@redhat.com> - 1.1.7-1
+- Update to 1.1.7
+- Resolves: #RHEL-87207
+
+* Thu Mar 06 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 1.1.6-3
+- Backport https://github.com/containers/bootc/pull/1167
+- Resolves: #RHEL-82293
+
+* Wed Feb 19 2025 John Eckersberg <jeckersb@redhat.com> - 1.1.5-2
+- Sync specfile from upstream
+- Resolves: #RHEL-80264
+- Resolves: #RHEL-81981
+
 * Mon Feb 10 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 1.1.5-1
 - Update to 1.1.5
 - Resolves: #RHEL-77733