Revert OL modifications

This commit is contained in:
AlmaLinux RelEng Bot 2026-03-23 03:02:42 -04:00
parent b8045d659f
commit c2e22e7a10

View File

@ -23,7 +23,7 @@
Name: bootc
Version: 1.8.0
Release: %autorelease -s 0.1
Release: %{autorelease}
Summary: Bootable container system
# Apache-2.0
@ -38,7 +38,6 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0)
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
Source2: bootc-oraclelinux-configs.tar.gz
# Don't remove, downstream patch only
# Patch for integration test RHEL 9.x and 10.x support
@ -90,19 +89,8 @@ This package provides a utility to simplify reinstalling the current system to a
%global system_reinstall_bootc_install_podman_path %{_prefix}/lib/system-reinstall-bootc/install-podman
%package oraclelinux-configs
Summary: Configuration files and tools to build Oracle Linux baseline bootc containers
Recommends: podman
# The reinstall subpackage intentionally does not require bootc, as it pulls in many unnecessary dependencies
%description oraclelinux-configs
This package provides config files and utilities to simplify building baseline Oracle Linux bootc images from scratch
%prep
%autosetup -p1 -a1
# unpack bootc config files
%setup -q -T -D -a2
# Default -v vendor config doesn't support non-crates.io deps (i.e. git)
cp .cargo/vendor-config.toml .
%cargo_prep -N
@ -150,10 +138,6 @@ exec dnf -y install podman
EOF
chmod +x %{?buildroot}/%{system_reinstall_bootc_install_podman_path}
#create directory for container config files and install configs
mkdir -p %{buildroot}%{_datarootdir}/
%{__cp} -ar bootc-oraclelinux-configs %{buildroot}%{_datarootdir}/
%if %{with check}
%check
%cargo_test
@ -179,20 +163,7 @@ mkdir -p %{buildroot}%{_datarootdir}/
%{_bindir}/system-reinstall-bootc
%{system_reinstall_bootc_install_podman_path}
%files oraclelinux-configs
%{_datarootdir}/bootc-oraclelinux-configs
%attr(0755, root, root) %{_datarootdir}/bootc-oraclelinux-configs/ol9/build_container_image.sh
%attr(0755, root, root) %{_datarootdir}/bootc-oraclelinux-configs/ol10/build_container_image.sh
%attr(0755, root, root) %{_datarootdir}/bootc-oraclelinux-configs/image-builder/ol-image-builder.sh
%attr(0755, root, root) %{_datarootdir}/bootc-oraclelinux-configs/image-builder/qemu-boot-bootc-iso.sh
%attr(0755, root, root) %{_datarootdir}/bootc-oraclelinux-configs/image-builder/qemu-boot-bootc-qcow2.sh
%changelog
* Tue Mar 17 2026 EL Errata <el-errata_ww@oracle.com> - 1.8.0-4.0.1
- Update bootc-oraclelinux-configs and image-builder scripts
- Also add image-builder helper scripts and configs
- Add bootc-oraclelinux-configs
## START: Generated by rpmautospec
* Wed Jan 28 2026 Xiaofeng Wang <xiaofwan@redhat.com> - 1.8.0-4
- Fix gating test issue and ignore rpminpect symbolic link checking