Compare commits
No commits in common. "c9-beta" and "a10s" have entirely different histories.
@ -1,2 +0,0 @@
|
||||
9ca5bceee40bd840b691c0a8024b2b6a916c36e7 SOURCES/bootc-1.8.0-vendor.tar.zstd
|
||||
b97adc7d411b192030dddea89366e2d6ebc5c7c2 SOURCES/bootc-1.8.0.tar.zstd
|
||||
1
.fmf/version
Normal file
1
.fmf/version
Normal file
@ -0,0 +1 @@
|
||||
1
|
||||
56
.gitignore
vendored
56
.gitignore
vendored
@ -1,2 +1,54 @@
|
||||
SOURCES/bootc-1.8.0-vendor.tar.zstd
|
||||
SOURCES/bootc-1.8.0.tar.zstd
|
||||
/bootc-0.1.2.tar.zst
|
||||
/bootc-0.1.2-vendor.tar.zst
|
||||
/bootc-0.1.3-vendor.tar.zstd
|
||||
/bootc-0.1.3.tar.zst
|
||||
/bootc-0.1.4-vendor.tar.zstd
|
||||
/bootc-0.1.4.tar.zstd
|
||||
/bootc-0.1.5-vendor.tar.zstd
|
||||
/bootc-0.1.5.tar.zstd
|
||||
/bootc-0.1.6-vendor.tar.zstd
|
||||
/bootc-0.1.6.tar.zstd
|
||||
/bootc-0.1.12.tar.zstd
|
||||
/bootc-0.1.12-vendor.tar.zstd
|
||||
/bootc-0.1.13.tar.zstd
|
||||
/bootc-0.1.13-vendor.tar.zstd
|
||||
/bootc-0.1.14-vendor.tar.zstd
|
||||
/bootc-0.1.14.tar.zstd
|
||||
/bootc-0.1.15.tar.zstd
|
||||
/bootc-0.1.15-vendor.tar.zstd
|
||||
/bootc-0.1.16.tar.zstd
|
||||
/bootc-0.1.16-vendor.tar.zstd
|
||||
/bootc-1.1.0.tar.zstd
|
||||
/bootc-1.1.0-vendor.tar.zstd
|
||||
/bootc-1.1.2.tar.zstd
|
||||
/bootc-1.1.2-vendor.tar.zstd
|
||||
/bootc-1.1.3-vendor.tar.zstd
|
||||
/bootc-1.1.3.tar.zstd
|
||||
/bootc-1.1.4.tar.zstd
|
||||
/bootc-1.1.4-vendor.tar.zstd
|
||||
/bootc-1.1.5.tar.zstd
|
||||
/bootc-1.1.5-vendor.tar.zstd
|
||||
/bootc-1.1.6-vendor.tar.zstd
|
||||
/bootc-1.1.6.tar.zstd
|
||||
/bootc-1.1.7.tar.zstd
|
||||
/bootc-1.1.7-vendor.tar.zstd
|
||||
/bootc-1.3.0.tar.zstd
|
||||
/bootc-1.3.0-vendor.tar.zstd
|
||||
/bootc-1.4.0.tar.zstd
|
||||
/bootc-1.4.0-vendor.tar.zstd
|
||||
/bootc-1.5.1.tar.zstd
|
||||
/bootc-1.5.1-vendor.tar.zstd
|
||||
/bootc-1.7.0-vendor.tar.zstd
|
||||
/bootc-1.7.0.tar.zstd
|
||||
/bootc-1.7.1-vendor.tar.zstd
|
||||
/bootc-1.7.1.tar.zstd
|
||||
/bootc-1.8.0-vendor.tar.zstd
|
||||
/bootc-1.8.0.tar.zstd
|
||||
/bootc-1.10.0.tar.zstd
|
||||
/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
|
||||
/bootc-1.12.1-vendor.tar.zstd
|
||||
/bootc-1.12.1.tar.zstd
|
||||
|
||||
62
0001-Add-riscv64-architecture-support.patch
Normal file
62
0001-Add-riscv64-architecture-support.patch
Normal file
@ -0,0 +1,62 @@
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
Date: Thu, 20 Feb 2026 00:00:00 +0000
|
||||
Subject: [PATCH] Add riscv64 architecture support
|
||||
|
||||
Add RISC-V 64-bit (riscv64) to the set of supported architectures.
|
||||
RISC-V uses UEFI boot like aarch64, so no special bootloader partition
|
||||
is needed.
|
||||
|
||||
Changes:
|
||||
- discoverable_partition_specification: add riscv64 to this_arch_root()
|
||||
- install: add riscv64 to ARCH_USES_EFI
|
||||
- install/baseline: add riscv64 to partitioning arch checks
|
||||
|
||||
Signed-off-by: Andrew Lukoshko <alukoshko@almalinux.org>
|
||||
---
|
||||
crates/lib/src/discoverable_partition_specification.rs | 2 ++
|
||||
crates/lib/src/install.rs | 2 +-
|
||||
crates/lib/src/install/baseline.rs | 2 +-
|
||||
3 files changed, 4 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/crates/lib/src/discoverable_partition_specification.rs b/crates/lib/src/discoverable_partition_specification.rs
|
||||
index d5432e7..344b232 100644
|
||||
--- a/crates/lib/src/discoverable_partition_specification.rs
|
||||
+++ b/crates/lib/src/discoverable_partition_specification.rs
|
||||
@@ -457,6 +457,8 @@ pub const fn this_arch_root() -> &'static str {
|
||||
ROOT_PPC64
|
||||
} else if #[cfg(all(target_arch = "powerpc64", target_endian = "little"))] {
|
||||
ROOT_PPC64_LE
|
||||
+ } else if #[cfg(target_arch = "riscv64")] {
|
||||
+ ROOT_RISCV64
|
||||
} else {
|
||||
compile_error!("Unsupported architecture")
|
||||
}
|
||||
diff --git a/crates/lib/src/install.rs b/crates/lib/src/install.rs
|
||||
index 105e2b3..052b208 100644
|
||||
--- a/crates/lib/src/install.rs
|
||||
+++ b/crates/lib/src/install.rs
|
||||
@@ -87,7 +87,7 @@ const OSTREE_COMPOSEFS_SUPER: &str = ".ostree.cfs";
|
||||
const SELINUXFS: &str = "/sys/fs/selinux";
|
||||
/// The mount path for uefi
|
||||
pub(crate) const EFIVARFS: &str = "/sys/firmware/efi/efivars";
|
||||
-pub(crate) const ARCH_USES_EFI: bool = cfg!(any(target_arch = "x86_64", target_arch = "aarch64"));
|
||||
+pub(crate) const ARCH_USES_EFI: bool = cfg!(any(target_arch = "x86_64", target_arch = "aarch64", target_arch = "riscv64"));
|
||||
|
||||
pub(crate) const EFI_LOADER_INFO: &str = "LoaderInfo-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f";
|
||||
|
||||
diff --git a/crates/lib/src/install/baseline.rs b/crates/lib/src/install/baseline.rs
|
||||
index d05604e..34d3187 100644
|
||||
--- a/crates/lib/src/install/baseline.rs
|
||||
+++ b/crates/lib/src/install/baseline.rs
|
||||
@@ -272,7 +272,7 @@ pub(crate) fn install_create_rootfs(
|
||||
&mut partitioning_buf,
|
||||
r#"size=4MiB, bootable, type={uuid}, name="{label}""#
|
||||
)?;
|
||||
- } else if cfg!(any(target_arch = "aarch64", target_arch = "s390x")) {
|
||||
+ } else if cfg!(any(target_arch = "aarch64", target_arch = "s390x", target_arch = "riscv64")) {
|
||||
// No bootloader partition is necessary
|
||||
} else {
|
||||
anyhow::bail!("Unsupported architecture: {}", std::env::consts::ARCH);
|
||||
--
|
||||
2.43.0
|
||||
@ -1,65 +0,0 @@
|
||||
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
|
||||
@ -1,14 +0,0 @@
|
||||
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"
|
||||
261
SPECS/bootc.spec
261
SPECS/bootc.spec
@ -1,261 +0,0 @@
|
||||
%bcond_without check
|
||||
%if 0%{?rhel} >= 9 || 0%{?fedora} > 41
|
||||
%bcond_without ostree_ext
|
||||
%else
|
||||
%bcond_with ostree_ext
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel}
|
||||
%bcond_without rhsm
|
||||
%else
|
||||
%bcond_with rhsm
|
||||
%endif
|
||||
|
||||
Name: bootc
|
||||
Version: 1.8.0
|
||||
Release: 2%{?dist}
|
||||
Summary: Bootable container system
|
||||
|
||||
# Apache-2.0
|
||||
# Apache-2.0 OR BSL-1.0
|
||||
# Apache-2.0 OR MIT
|
||||
# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
|
||||
# BSD-3-Clause
|
||||
# MIT
|
||||
# MIT OR Apache-2.0
|
||||
# Unlicense OR MIT
|
||||
License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Unlicense OR MIT)
|
||||
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}
|
||||
|
||||
BuildRequires: libzstd-devel
|
||||
BuildRequires: make
|
||||
BuildRequires: ostree-devel
|
||||
BuildRequires: openssl-devel
|
||||
%if 0%{?rhel}
|
||||
BuildRequires: rust-toolset
|
||||
%else
|
||||
BuildRequires: cargo-rpm-macros >= 25
|
||||
%endif
|
||||
BuildRequires: systemd
|
||||
# For tests
|
||||
BuildRequires: skopeo ostree
|
||||
|
||||
# Backing storage tooling https://github.com/containers/composefs/issues/125
|
||||
Requires: composefs
|
||||
# For OS updates
|
||||
Requires: ostree
|
||||
Requires: skopeo
|
||||
Requires: podman
|
||||
# For bootloader updates
|
||||
Recommends: bootupd
|
||||
|
||||
# A made up provides so that rpm-ostree can depend on it
|
||||
%if %{with ostree_ext}
|
||||
Provides: ostree-cli(ostree-container)
|
||||
%endif
|
||||
|
||||
%description
|
||||
%{summary}
|
||||
|
||||
# (-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
|
||||
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)
|
||||
cp .cargo/vendor-config.toml .
|
||||
%cargo_prep -N
|
||||
cat vendor-config.toml >> .cargo/config.toml
|
||||
rm vendor-config.toml
|
||||
|
||||
%build
|
||||
# Build the main bootc binary
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 10
|
||||
%cargo_build %{?with_rhsm:-f rhsm}
|
||||
%else
|
||||
%cargo_build %{?with_rhsm:--features rhsm}
|
||||
%endif
|
||||
|
||||
# Build the system reinstallation CLI binary
|
||||
%global cargo_args -p system-reinstall-bootc
|
||||
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
|
||||
sed -i -e '/https:\/\//d' cargo-vendor.txt
|
||||
%cargo_license_summary
|
||||
%{cargo_license} > LICENSE.dependencies
|
||||
|
||||
%install
|
||||
%make_install INSTALL="install -p -c"
|
||||
%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
|
||||
%cargo_test
|
||||
%endif
|
||||
|
||||
%files
|
||||
%license LICENSE-MIT
|
||||
%license LICENSE-APACHE
|
||||
%license LICENSE.dependencies
|
||||
%license cargo-vendor.txt
|
||||
%doc README.md
|
||||
%{_bindir}/bootc
|
||||
%{_prefix}/lib/bootc/
|
||||
%{_prefix}/lib/systemd/system-generators/*
|
||||
%if %{with ostree_ext}
|
||||
%{_prefix}/libexec/libostree/ext/*
|
||||
%endif
|
||||
%{_unitdir}/*
|
||||
%{_docdir}/bootc/*
|
||||
%{_mandir}/man*/bootc*
|
||||
|
||||
%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
|
||||
|
||||
* Thu Jan 23 2025 John Eckersberg <jeckersb@redhat.com> - 1.1.4-2
|
||||
- Cherry pick patches for bootc-status-updated
|
||||
- Resolves: #RHEL-72862
|
||||
|
||||
* Tue Jan 14 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 1.1.4-1
|
||||
- Update to 1.1.4
|
||||
Resolves: #RHEL-72862
|
||||
|
||||
* Thu Nov 07 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 1.1.2-1
|
||||
- Update to 1.1.2
|
||||
Resolves: #RHEL-66258
|
||||
|
||||
* Thu Oct 17 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 1.1.0-1
|
||||
- Update to 1.1.0
|
||||
Resolves: #RHEL-63018
|
||||
|
||||
* Fri Aug 16 2024 Colin Walters <walters@verbum.org> - 0.1.15-1
|
||||
- Update to 0.1.15
|
||||
Resolves: #RHEL-50625
|
||||
|
||||
* Thu Jul 25 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 0.1.14-1
|
||||
- Update to 0.1.14
|
||||
Resolves: #RHEL-50625, #RHEL-45325, #RHEL-36003
|
||||
|
||||
* Fri Jun 28 2024 Colin Walters <walters@verbum.org> - 0.1.13-2
|
||||
- Update to 0.1.13
|
||||
|
||||
* Tue Jun 25 2024 Colin Walters <walters@verbum.org> - 0.1.12-3
|
||||
- Update to 0.1.12
|
||||
|
||||
* Wed May 15 2024 Colin Walters <walters@verbum.org> - 0.1.11-2
|
||||
- Update to 0.1.11
|
||||
|
||||
* Fri Apr 26 2024 Colin Walters <walters@verbum.org> - 0.1.10-2
|
||||
- Release 0.1.10
|
||||
|
||||
* Mon Apr 08 2024 Colin Walters <walters@verbum.org> - 0.1.9-4
|
||||
- Correct JIRA link
|
||||
Resolves: #RHEL-30878
|
||||
|
||||
* Thu Mar 28 2024 Colin Walters <walters@verbum.org> - 0.1.9-3
|
||||
- Backport rollback
|
||||
Related: #RHEL-30466
|
||||
|
||||
* Wed Mar 27 2024 Colin Walters <walters@verbum.org> - 0.1.9-2
|
||||
- https://github.com/containers/bootc/releases/tag/v0.1.9
|
||||
Resolves: #RHEL-30466
|
||||
|
||||
* Tue Mar 19 2024 Colin Walters <walters@verbum.org> - 0.1.8-2
|
||||
- https://github.com/containers/bootc/releases/tag/v0.1.8
|
||||
|
||||
* Wed Feb 14 2024 Colin Walters <walters@verbum.org> - 0.1.7-4
|
||||
- https://github.com/containers/bootc/releases/tag/v0.1.7
|
||||
|
||||
* Tue Jan 23 2024 Colin Walters <walters@verbum.org> - 0.1.6-2
|
||||
- https://github.com/containers/bootc/releases/tag/v0.1.6
|
||||
|
||||
* Fri Jan 12 2024 Joseph Marrero <jmarrero@redhat.com> - 0.1.5-1
|
||||
- Update to https://github.com/containers/bootc/releases/tag/v0.1.5
|
||||
|
||||
* Thu Jan 11 2024 Colin Walters <walters@verbum.org> - 0.1.4-3
|
||||
- Loosen composefs requirement until it makes it into c9s
|
||||
|
||||
* Mon Dec 11 2023 Colin Walters <walters@verbum.org> - 0.1.4-2
|
||||
- Initial import from fedora
|
||||
|
||||
219
bootc.spec
Normal file
219
bootc.spec
Normal file
@ -0,0 +1,219 @@
|
||||
%bcond_without check
|
||||
%bcond_with tests
|
||||
%if 0%{?rhel} >= 9 || 0%{?fedora} > 41
|
||||
%bcond_without ostree_ext
|
||||
%else
|
||||
%bcond_with ostree_ext
|
||||
%endif
|
||||
|
||||
%if 0%{?rhel}
|
||||
%bcond_without rhsm
|
||||
%else
|
||||
%bcond_with rhsm
|
||||
%endif
|
||||
|
||||
%global rust_minor %(rustc --version | cut -f2 -d" " | cut -f2 -d".")
|
||||
|
||||
# https://github.com/bootc-dev/bootc/issues/1640
|
||||
%if 0%{?fedora} || 0%{?rhel} >= 10 || 0%{?rust_minor} >= 89
|
||||
%global new_cargo_macros 1
|
||||
%else
|
||||
%global new_cargo_macros 0
|
||||
%endif
|
||||
|
||||
Name: bootc
|
||||
Version: 1.13.0
|
||||
Release: %{autorelease}
|
||||
Summary: Bootable container system
|
||||
|
||||
# Apache-2.0
|
||||
# Apache-2.0 OR BSL-1.0
|
||||
# Apache-2.0 OR MIT
|
||||
# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
|
||||
# BSD-3-Clause
|
||||
# MIT
|
||||
# MIT OR Apache-2.0
|
||||
# Unlicense OR MIT
|
||||
License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (Unlicense OR MIT)
|
||||
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
|
||||
|
||||
# AlmaLinux Patch
|
||||
Patch1001: 0001-Add-riscv64-architecture-support.patch
|
||||
|
||||
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
|
||||
ExcludeArch: %{ix86}
|
||||
|
||||
BuildRequires: libzstd-devel
|
||||
BuildRequires: make
|
||||
BuildRequires: ostree-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: go-md2man
|
||||
%if 0%{?rhel}
|
||||
BuildRequires: rust-toolset
|
||||
%else
|
||||
BuildRequires: cargo-rpm-macros >= 25
|
||||
%endif
|
||||
BuildRequires: systemd
|
||||
# For tests
|
||||
BuildRequires: skopeo ostree
|
||||
|
||||
# Backing storage tooling https://github.com/containers/composefs/issues/125
|
||||
Requires: composefs
|
||||
# Keep this list in sync with workspace.metadata.binary-dependencies until we sync
|
||||
# it automatically
|
||||
Requires: ostree
|
||||
Requires: skopeo
|
||||
Requires: podman
|
||||
Requires: util-linux-core
|
||||
Requires: /usr/bin/chcon
|
||||
# For bootloader updates
|
||||
Recommends: bootupd
|
||||
|
||||
# A made up provides so that rpm-ostree can depend on it
|
||||
%if %{with ostree_ext}
|
||||
Provides: ostree-cli(ostree-container)
|
||||
%endif
|
||||
|
||||
%description
|
||||
%{summary}
|
||||
|
||||
# (-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
|
||||
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.
|
||||
|
||||
%if %{with tests}
|
||||
%package tests
|
||||
Summary: Integration tests for bootc
|
||||
Requires: %{name} = %{version}-%{release}
|
||||
|
||||
%description tests
|
||||
This package contains the integration test suite for bootc.
|
||||
%endif
|
||||
|
||||
%global system_reinstall_bootc_install_podman_path %{_prefix}/lib/system-reinstall-bootc/install-podman
|
||||
|
||||
%if 0%{?container_build}
|
||||
# Source is already at /src, no subdirectory
|
||||
%global _buildsubdir .
|
||||
%endif
|
||||
|
||||
%prep
|
||||
%if ! 0%{?container_build}
|
||||
%autosetup -p1 -a1
|
||||
# Default -v vendor config doesn't support non-crates.io deps (i.e. git)
|
||||
cp .cargo/vendor-config.toml .
|
||||
%cargo_prep -N
|
||||
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
|
||||
cd ..
|
||||
rm -rf %{name}-%{version}-build
|
||||
ln -s . %{name}-%{version}-build
|
||||
cd %{name}-%{version}-build
|
||||
%endif
|
||||
|
||||
%build
|
||||
export SYSTEM_REINSTALL_BOOTC_INSTALL_PODMAN_PATH=%{system_reinstall_bootc_install_podman_path}
|
||||
# Build this first to avoid feature skew
|
||||
make manpages
|
||||
|
||||
# Build all binaries
|
||||
%if 0%{?container_build}
|
||||
# Container build: use cargo directly with cached dependencies to avoid RPM macro overhead
|
||||
cargo build -j%{_smp_build_ncpus} --release %{?with_rhsm:--features rhsm} --bins
|
||||
%else
|
||||
# Non-container build: use RPM macros for proper dependency tracking
|
||||
%if %new_cargo_macros
|
||||
%cargo_build %{?with_rhsm:-f rhsm} -- --bins
|
||||
%else
|
||||
%cargo_build %{?with_rhsm:--features rhsm} -- --bins
|
||||
%endif
|
||||
%endif
|
||||
|
||||
%if ! 0%{?container_build}
|
||||
%cargo_vendor_manifest
|
||||
# https://pagure.io/fedora-rust/rust-packaging/issue/33
|
||||
sed -i -e '/https:\/\//d' cargo-vendor.txt
|
||||
%cargo_license_summary
|
||||
%{cargo_license} > LICENSE.dependencies
|
||||
%endif
|
||||
|
||||
%install
|
||||
# Pass CARGO_FEATURES explicitly to prevent auto-detection rebuild in install environment
|
||||
%make_install INSTALL="install -p -c" CARGO_FEATURES="%{?with_rhsm:rhsm}"
|
||||
%if %{with ostree_ext}
|
||||
make install-ostree-hooks DESTDIR=%{?buildroot}
|
||||
%endif
|
||||
%if %{with tests}
|
||||
install -D -m 0755 target/release/tests-integration %{buildroot}%{_bindir}/bootc-integration-tests
|
||||
%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}
|
||||
# generate doc file list excluding directories; workaround for
|
||||
# https://github.com/coreos/rpm-ostree/issues/5420
|
||||
touch %{?buildroot}/%{_docdir}/bootc/baseimage/base/sysroot/.keepdir
|
||||
find %{?buildroot}/%{_docdir} ! -type d -printf '%{_docdir}/%%P\n' | sort > bootcdoclist.txt
|
||||
|
||||
rm -f %{buildroot}/%{_datadir}/elvish/lib/bootc.elv
|
||||
rm -f %{buildroot}/%{_datadir}/powershell/Modules/Bootc/Bootc.psm1
|
||||
|
||||
%if %{with check}
|
||||
%check
|
||||
if grep -qEe 'Seccomp:.*0$' /proc/self/status; then
|
||||
%cargo_test
|
||||
else
|
||||
echo "skipping unit tests due to https://github.com/rpm-software-management/mock/pull/1613#issuecomment-3421908652"
|
||||
fi
|
||||
%endif
|
||||
|
||||
%files -f bootcdoclist.txt
|
||||
%license LICENSE-MIT
|
||||
%license LICENSE-APACHE
|
||||
%if ! 0%{?container_build}
|
||||
%license LICENSE.dependencies
|
||||
%license cargo-vendor.txt
|
||||
%endif
|
||||
%doc README.md
|
||||
%{_bindir}/bootc
|
||||
%{_prefix}/lib/bootc/
|
||||
%{_prefix}/lib/systemd/system-generators/*
|
||||
%{_prefix}/lib/dracut/modules.d/51bootc/
|
||||
%if %{with ostree_ext}
|
||||
%{_prefix}/libexec/libostree/ext/*
|
||||
%endif
|
||||
%{_unitdir}/*
|
||||
%{_mandir}/man*/*bootc*
|
||||
%if 0%{?rhel} && 0%{?rhel} <= 9
|
||||
%{_datadir}/bash-completion/completions/bootc
|
||||
%{_datadir}/zsh/site-functions/_bootc
|
||||
%{_datadir}/fish/vendor_completions.d/bootc.fish
|
||||
%else
|
||||
%{bash_completions_dir}/bootc
|
||||
%{zsh_completions_dir}/_bootc
|
||||
%{fish_completions_dir}/bootc.fish
|
||||
%endif
|
||||
|
||||
%files -n system-reinstall-bootc
|
||||
%{_bindir}/system-reinstall-bootc
|
||||
%{system_reinstall_bootc_install_podman_path}
|
||||
|
||||
%if %{with tests}
|
||||
%files tests
|
||||
%{_bindir}/bootc-integration-tests
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
17
gating.yaml
Normal file
17
gating.yaml
Normal file
@ -0,0 +1,17 @@
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- fedora-*
|
||||
decision_contexts:
|
||||
- bodhi_update_push_stable
|
||||
- bodhi_update_push_testing
|
||||
subject_type: koji_build
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: fedora-ci.koji-build.tier0.functional}
|
||||
|
||||
--- !Policy
|
||||
product_versions:
|
||||
- rhel-9
|
||||
- rhel-10
|
||||
decision_context: osci_compose_gate
|
||||
rules:
|
||||
- !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}
|
||||
18
os-image-map.json
Normal file
18
os-image-map.json
Normal file
@ -0,0 +1,18 @@
|
||||
{
|
||||
"base": {
|
||||
"rhel-10.2": "images.paas.redhat.com/bootc/rhel-bootc:latest-10.2",
|
||||
"rhel-9.8": "images.paas.redhat.com/bootc/rhel-bootc:latest-9.8",
|
||||
"centos-9": "quay.io/centos-bootc/centos-bootc:stream9",
|
||||
"centos-10": "quay.io/centos-bootc/centos-bootc:stream10",
|
||||
"fedora-42": "quay.io/fedora/fedora-bootc:42",
|
||||
"fedora-43": "quay.io/fedora/fedora-bootc:43",
|
||||
"fedora-44": "quay.io/fedora/fedora-bootc:rawhide"
|
||||
},
|
||||
"buildroot-base": {
|
||||
"centos-9": "quay.io/centos/centos:stream9",
|
||||
"centos-10": "quay.io/centos/centos:stream10",
|
||||
"fedora-42": "quay.io/fedora/fedora:42",
|
||||
"fedora-43": "quay.io/fedora/fedora:43",
|
||||
"fedora-44": "quay.io/fedora/fedora:rawhide"
|
||||
}
|
||||
}
|
||||
100
plans/all.fmf
Normal file
100
plans/all.fmf
Normal file
@ -0,0 +1,100 @@
|
||||
discover:
|
||||
how: fmf
|
||||
dist-git-source: true
|
||||
dist-git-install-builddeps: true
|
||||
execute:
|
||||
how: tmt
|
||||
environment:
|
||||
NIGHTLY_COMPOSE_SITE: download.devel.redhat.com
|
||||
prepare:
|
||||
# Install image mode system on package mode system
|
||||
- how: install
|
||||
order: 97
|
||||
package:
|
||||
- podman
|
||||
- skopeo
|
||||
- jq
|
||||
- bootc
|
||||
- system-reinstall-bootc
|
||||
- expect
|
||||
- ansible-core
|
||||
- zstd
|
||||
- how: shell
|
||||
order: 98
|
||||
script:
|
||||
- pwd && ls -al && ls -al /var/share/test-artifacts && mkdir -p bootc && cp /var/share/test-artifacts/*.src.rpm bootc
|
||||
- cd bootc && ls -al && rpm2cpio *.src.rpm | cpio -idmv && rm -f *-vendor.tar.zstd && zstd -d *.tar.zstd && tar -xvf *.tar -C . --strip-components=1 && ls -al
|
||||
# Remove the "cp" line in next release, the fix already added in bootc upstream
|
||||
- cp os-image-map.json bootc/hack
|
||||
- cd bootc/hack && ./provision-packit.sh
|
||||
# tmt-reboot and reboot do not work in this case
|
||||
# reboot in ansible is the only way to reboot in tmt prepare
|
||||
- how: ansible
|
||||
order: 99
|
||||
playbook:
|
||||
- https://github.com/bootc-dev/bootc/raw/refs/heads/main/hack/packit-reboot.yml
|
||||
|
||||
/plan-01-readonly:
|
||||
summary: Execute booted readonly/nondestructive tests
|
||||
discover+:
|
||||
how: fmf
|
||||
test:
|
||||
- /tmt/tests/tests/test-01-readonly
|
||||
extra-try_bind_storage: true
|
||||
|
||||
/plan-20-image-pushpull-upgrade:
|
||||
summary: Execute local upgrade tests
|
||||
discover+:
|
||||
how: fmf
|
||||
test:
|
||||
- /tmt/tests/tests/test-20-image-pushpull-upgrade
|
||||
|
||||
/plan-21-logically-bound-switch:
|
||||
summary: Execute logically bound images tests for switching images
|
||||
discover+:
|
||||
how: fmf
|
||||
test:
|
||||
- /tmt/tests/tests/test-21-logically-bound-switch
|
||||
|
||||
/plan-22-logically-bound-install:
|
||||
summary: Execute logically bound images tests for installing image
|
||||
discover+:
|
||||
how: fmf
|
||||
test:
|
||||
- /tmt/tests/tests/test-22-logically-bound-install
|
||||
|
||||
/plan-23-install-outside-container:
|
||||
summary: Execute tests for installing outside of a container
|
||||
discover+:
|
||||
how: fmf
|
||||
test:
|
||||
- /tmt/tests/tests/test-23-install-outside-container
|
||||
|
||||
/plan-23-usroverlay:
|
||||
summary: Execute tests for bootc usrover
|
||||
discover+:
|
||||
how: fmf
|
||||
test:
|
||||
- /tmt/tests/tests/test-23-usroverlay
|
||||
|
||||
/plan-24-image-upgrade-reboot:
|
||||
summary: Execute local upgrade tests
|
||||
discover+:
|
||||
how: fmf
|
||||
test:
|
||||
- /tmt/tests/tests/test-24-image-upgrade-reboot
|
||||
extra-try_bind_storage: true
|
||||
|
||||
/plan-25-soft-reboot:
|
||||
summary: Execute soft reboot test
|
||||
discover+:
|
||||
how: fmf
|
||||
test:
|
||||
- /tmt/tests/tests/test-25-soft-reboot
|
||||
|
||||
/plan-29-soft-reboot-selinux-policy:
|
||||
summary: Test soft reboot with SELinux policy changes
|
||||
discover+:
|
||||
how: fmf
|
||||
test:
|
||||
- /tmt/tests/tests/test-29-soft-reboot-selinux-policy
|
||||
4
rpminspect.yaml
Normal file
4
rpminspect.yaml
Normal file
@ -0,0 +1,4 @@
|
||||
# Disable the symlink check for the problematic path
|
||||
symlinks:
|
||||
ignore:
|
||||
- /usr/lib/bootc/storage
|
||||
2
sources
Normal file
2
sources
Normal file
@ -0,0 +1,2 @@
|
||||
SHA512 (bootc-1.13.0-vendor.tar.zstd) = 32c7aa4f66f14a4147d1ce9894d776b3abf31fcfc64227ee32cb14953b52691cdc3d50a4ff8e3651b36a36330e023bdb835ddbaa3fd443227b3be4be292c99fe
|
||||
SHA512 (bootc-1.13.0.tar.zstd) = 8e58cf1ca10b6e57901ca930016ad7cdabc4e357370ba63ee4e48f3b727563244f17e93e604050ef808358e41dbf3741250121f3022b311906764ae0717409a0
|
||||
Loading…
Reference in New Issue
Block a user