Compare commits

..

8 Commits
c9-beta ... a10

Author SHA1 Message Date
6defda2569 Add RISC-V support 2026-05-21 05:52:45 +00:00
9181fa854f Add RISC-V support 2026-05-20 13:33:12 +00:00
AlmaLinux RelEng Bot
e710a53c02 import CS bootc-1.15.2-1.el10 2026-05-20 09:32:58 -04:00
ccc8305f03 Add RISC-V support 2026-05-19 19:06:28 +00:00
AlmaLinux RelEng Bot
16b0382f1f import CS bootc-1.15.1-1.el10 2026-05-19 15:06:18 -04:00
AlmaLinux RelEng Bot
c2e22e7a10 Revert OL modifications 2026-03-23 03:02:42 -04:00
AlmaLinux RelEng Bot
b8045d659f import Oracle_OSS bootc-1.8.0-4.0.1.el10_1 2026-03-23 03:02:40 -04:00
2fce2565b1 import OL bootc-1.8.0-2.el10_1 2025-12-04 09:10:49 +00:00
5 changed files with 218 additions and 91 deletions

View File

@ -1,2 +0,0 @@
41a56ab6bb51f99445735cf567ace0e9297fe8bc SOURCES/bootc-1.13.0-vendor.tar.zstd
46a80d31f9b5e715e75a5ff7d09a5663d48b0ab0 SOURCES/bootc-1.13.0.tar.zstd

4
.gitignore vendored
View File

@ -1,2 +1,2 @@
SOURCES/bootc-1.13.0-vendor.tar.zstd
SOURCES/bootc-1.13.0.tar.zstd
bootc-1.15.2-vendor.tar.zstd
bootc-1.15.2.tar.zstd

View File

@ -0,0 +1,53 @@
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:
- install: add riscv64 to ARCH_USES_EFI
- install/baseline: add riscv64 to partitioning arch checks
Note: the riscv64 branch in this_arch_root() (in
crates/lib/src/discoverable_partition_specification.rs) was accepted
upstream in bootc commit 47c3620 ("fix: add riscv64 to this_arch_root")
and is already present in v1.15.2, so it is no longer carried here.
Signed-off-by: Andrew Lukoshko <alukoshko@almalinux.org>
---
crates/lib/src/install.rs | 2 +-
crates/lib/src/install/baseline.rs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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

View File

@ -1,3 +1,13 @@
## START: Set by rpmautospec
## (rpmautospec version 0.6.5)
## RPMAUTOSPEC: autorelease, autochangelog
%define autorelease(e:s:pb:n) %{?-p:0.}%{lua:
release_number = 1;
base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}"));
print(release_number + base_release_number - 1);
}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}}.alma.1
## END: Set by rpmautospec
%bcond_without check
%bcond_with tests
%if 0%{?rhel} >= 9 || 0%{?fedora} > 41
@ -22,8 +32,8 @@
%endif
Name: bootc
Version: 1.13.0
Release: 1%{?dist}
Version: 1.15.2
Release: %{autorelease}
Summary: Bootable container system
# Apache-2.0
@ -39,6 +49,9 @@ 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}
@ -213,127 +226,188 @@ fi
%endif
%changelog
* Mon Feb 24 2026 Colin Walters <walters@verbum.org> - 1.13.0-1
- Update to 1.13.0
- https://github.com/bootc-dev/bootc/releases/tag/v1.13.0
- Resolves: RHEL-151443
* Thu May 21 2026 Andrew Lukoshko <alukoshko@almalinux.org> - 1.15.2-1.alma.1
- Add RISC-V support
* Fri Jan 17 2026 Colin Walters <walters@verbum.org> - 1.12.1-1
- Update to 1.12.1
- Fix mount point check regression breaking bootc-image-builder
- Resolves: RHEL-142112
## START: Generated by rpmautospec
* Fri May 01 2026 Joseph Marrero Corchado <jmarrero@redhat.com> - 1.15.2-1
- Release 1.15.2
* Thu Jan 09 2026 Colin Walters <walters@verbum.org> - 1.12.0-1
- Update to 1.12.0
- Resolves: RHEL-140335
* Thu Apr 23 2026 Joseph Marrero Corchado <jmarrero@redhat.com> - 1.15.1-2
- Backport: https://github.com/bootc-dev/bootc/pull/2114
* Thu Oct 30 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 1.10.0-1
- Update to 1.10.0
- Resolves: #RHEL-125340
* Tue Apr 14 2026 Joseph Marrero Corchado <jmarrero@redhat.com> - 1.15.1-1
- Release 1.15.1
* Fri Sep 05 2025 Colin Walters <walters@verbum.org> - 1.8.0-2
- Update to 1.8.0
* Fri Mar 20 2026 Colin Walters <walters@verbum.org> - 1.14.1-1
- Update to 1.14.1
* Tue Aug 26 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 1.7.1-1
- Update to 1.7.1
- Resolves: #RHEL-111339
* Tue Feb 24 2026 Colin Walters <walters@verbum.org> - 1.13.0-1
- Release 1.13.0
- Update to bootc 1.13.0
- Pass CARGO_FEATURES explicitly to make install to prevent auto-detection
rebuild in install environment (workaround for upstream Makefile issue)
- Package shell completions (bash, zsh, fish)
* Thu Aug 21 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 1.7.0-1
- Update to 1.7.0
- Resolves: #RHEL-109555
* Mon Jan 19 2026 Xiaofeng Wang <xiaofwan@redhat.com> - 1.12.1-2
- Skip rpminspect checking for symbolic link /usr/lib/bootc/storage
* Fri Jul 22 2025 Gursewak Mangat <gurssing@redhat.com> - 1.5.1-1
- Update to 1.5.1
- Resolves: #RHEL-104335
* Fri Jan 16 2026 Colin Walters <walters@verbum.org> - 1.12.1-1
- Release 1.12.1
* Fri Jul 11 2025 Gursewak Mangat <gurssing@redhat.com> - 1.4.0-1
- Update to 1.4.0
- Resolves: #RHEL-103125
* Fri Jan 09 2026 Colin Walters <walters@verbum.org> - 1.12.0-1
- Release 1.12.0
* Fri May 30 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 1.3.0-1
- Update to 1.3.0
- Resolves: #RHEL-94597
* Tue Dec 09 2025 Joseph Marrero Corchado <jmarrero@redhat.com> - 1.11.0-1
- Release 1.11.0
* Wed Nov 05 2025 Xiaofeng Wang <xiaofwan@redhat.com> - 1.10.0-2
- Fix gating test
* Fri Oct 31 2025 Joseph Marrero Corchado <jmarrero@redhat.com> - 1.10.0-1
- Release 1.10.0
* Fri Sep 05 2025 Colin Walters <walters@verbum.org> - 1.8.0-1
- Rebase to 1.8.0
* Tue Aug 26 2025 Joseph Marrero Corchado <jmarrero@redhat.com> - 1.7.1-1
- Release 1.7.1
* Fri Aug 22 2025 Joseph Marrero Corchado <jmarrero@redhat.com> - 1.7.0-1
- Release 1.7.0
* Fri Aug 08 2025 Xiaofeng Wang <xiaofwan@redhat.com> - 1.5.1-2
- Add 0001-bootc-inistall-provision.patch for TF 2025-06.1 change
* Tue Jul 22 2025 gursewak1997 <gursmangat@gmail.com> - 1.5.1-1
- Release 1.5.1
* Tue Jul 15 2025 gursewak1997 <gursmangat@gmail.com> - 1.4.0-2
- Add integration test patch back for RHEL support
* Fri Jul 11 2025 gursewak1997 <gursmangat@gmail.com> - 1.4.0-1
- Release 1.4.0
* Fri May 30 2025 Xiaofeng Wang <xiaofwan@redhat.com> - 1.3.0-2
- Enable gating test
* Fri May 30 2025 Joseph Marrero Corchado <jmarrero@redhat.com> - 1.3.0-1
- Release 1.3.0
* Tue Apr 15 2025 John Eckersberg <jeckersb@redhat.com> - 1.1.7-1
- Update to 1.1.7
- Resolves: #RHEL-87207
- Release 1.1.7
* Thu Mar 06 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 1.1.6-3
* Thu Mar 06 2025 Joseph Marrero Corchado <jmarrero@redhat.com> - 1.1.6-2
- Backport https://github.com/containers/bootc/pull/1167
- Resolves: #RHEL-82293
* Mon Mar 03 2025 Colin Walters <walters@verbum.org> - 1.1.6-1
- Update to 1.1.6
* Wed Feb 19 2025 John Eckersberg <jeckersb@redhat.com> - 1.1.5-2
- Sync specfile from upstream
- Resolves: #RHEL-80264
- Resolves: #RHEL-81981
- resync specfile from upstream
* Mon Feb 10 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 1.1.5-1
- Update to 1.1.5
- Resolves: #RHEL-77733
* Mon Feb 10 2025 Joseph Marrero Corchado <jmarrero@redhat.com> - 1.1.5-1
- Rebase to bootc 1.1.5
* Thu Jan 23 2025 John Eckersberg <jeckersb@redhat.com> - 1.1.4-2
- Cherry pick patches for bootc-status-updated
- Resolves: #RHEL-72862
* Thu Jan 23 2025 John Eckersberg <jeckersb@redhat.com> - 1.1.4-3
- Cherry pick patch for bootc-status-updated-onboot
* Tue Jan 14 2025 Joseph Marrero <jmarrero@fedoraproject.org> - 1.1.4-1
- Update to 1.1.4
Resolves: #RHEL-72862
* Tue Jan 21 2025 Colin Walters <walters@verbum.org> - 1.1.4-2
- Cherry pick patch for bootc-status-updated
* Thu Nov 07 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 1.1.2-1
- Update to 1.1.2
Resolves: #RHEL-66258
* Wed Jan 15 2025 Joseph Marrero Corchado <jmarrero@redhat.com> - 1.1.4-1
- Release bootc 1.1.4
* Thu Oct 17 2024 Joseph Marrero <jmarrero@fedoraproject.org> - 1.1.0-1
- Update to 1.1.0
Resolves: #RHEL-63018
* Fri Jan 03 2025 Colin Walters <walters@verbum.org> - 1.1.3-4
- Reapply "Flip bcond ostree_ext on"
* Fri Jan 03 2025 Colin Walters <walters@verbum.org> - 1.1.3-3
- Revert "Flip bcond ostree_ext on"
* Thu Jan 02 2025 Colin Walters <walters@verbum.org> - 1.1.3-2
- Flip bcond ostree_ext on
* Thu Jan 02 2025 Colin Walters <walters@verbum.org> - 1.1.3-1
- Update to 1.1.3
* Thu Jan 02 2025 Colin Walters <walters@verbum.org> - 1.1.2-2
- Add a bcond with ostree_ext
* Thu Nov 07 2024 Joseph Marrero Corchado <jmarrero@redhat.com> - 1.1.2-1
- Upgrade to 1.1.2
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.1.0-2
- Bump release for October 2024 mass rebuild:
* Thu Oct 17 2024 Joseph Marrero Corchado <jmarrero@redhat.com> - 1.1.0-1
- Upgrade to 1.1.0
* Fri Sep 20 2024 Joseph Marrero Corchado <jmarrero@redhat.com> - 0.1.16-2
- rebuild
* Thu Sep 12 2024 Colin Walters <walters@verbum.org> - 0.1.16-1
- https://github.com/containers/bootc/releases/tag/v0.1.16
* 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
* Thu Jul 25 2024 Joseph Marrero <jmarrero@redhat.com> - 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
* Fri Jun 28 2024 Colin Walters <walters@verbum.org> - 0.1.13-1
- Update to 0.1.13
* Tue Jun 25 2024 Colin Walters <walters@verbum.org> - 0.1.12-3
- Update to 0.1.12
* Wed Jun 26 2024 Wei Shi <wshi@redhat.com> - 0.1.12-2
- Add gating test for c10s
* Wed May 15 2024 Colin Walters <walters@verbum.org> - 0.1.11-2
- Update to 0.1.11
* Tue Jun 25 2024 Colin Walters <walters@verbum.org> - 0.1.12-1
- Release 0.1.12
* Fri Apr 26 2024 Colin Walters <walters@verbum.org> - 0.1.10-2
- Release 0.1.10
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.1.11-2
- Bump release for June 2024 mass rebuild
* Mon Apr 08 2024 Colin Walters <walters@verbum.org> - 0.1.9-4
- Correct JIRA link
Resolves: #RHEL-30878
* Sat Jun 08 2024 Colin Walters <walters@verbum.org> - 0.1.11-1
- bootc: Update to 0.1.11
* 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
* Thu Feb 01 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 0.1.6-3
- Update Rust macro usage
* Tue Jan 23 2024 Colin Walters <walters@verbum.org> - 0.1.6-2
- Update %%files section
* Tue Jan 23 2024 Colin Walters <walters@verbum.org> - 0.1.6-1
- 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
* Tue Jan 23 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.5-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Thu Jan 11 2024 Colin Walters <walters@verbum.org> - 0.1.4-3
- Loosen composefs requirement until it makes it into c9s
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.1.5-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Mon Dec 11 2023 Colin Walters <walters@verbum.org> - 0.1.4-2
- Initial import from fedora
* Tue Dec 19 2023 Colin Walters <walters@verbum.org> - 0.1.5-1
- https://github.com/containers/bootc/releases/tag/v0.1.5
* Mon Dec 11 2023 Colin Walters <walters@verbum.org> - 0.1.4-3
- ExcludeArch: %%{ix86}
* Tue Dec 05 2023 Colin Walters <walters@verbum.org> - 0.1.4-2
- Requires: composefs
* Fri Nov 10 2023 Colin Walters <walters@verbum.org> - 0.1.4-1
- Update to 0.1.4
* Wed Nov 08 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 0.1.3-2
- Fix build with rust-toolset
* Mon Nov 06 2023 Colin Walters <walters@verbum.org> - 0.1.3-1
- local build
* Tue Oct 24 2023 Colin Walters <walters@verbum.org> - 0.1.2-3
- Add Recommends: bootupd
* Sat Oct 21 2023 Colin Walters <walters@verbum.org> - 0.1.2-2
- Add a requirement on skopeo
* Sat Oct 21 2023 Colin Walters <walters@verbum.org> - 0.1.2-1
- Initial import
## END: Generated by rpmautospec

2
sources Normal file
View File

@ -0,0 +1,2 @@
SHA512 (bootc-1.15.2-vendor.tar.zstd) = 0be448c56d7a7311d8186e5478f2a322d8c20bc9e98c7398dd9116964210958a6033cf05fb41541a6a32a5b365f62ca0a7055a8c71871e6f2cea0620f0c99fba
SHA512 (bootc-1.15.2.tar.zstd) = 9ca23fcde1ba8440b91794178b8e56764a3ab8a799618c86f3ecbc32dd09b7f06ee048a8e473c9c62aeae74719e82515933bb4c2fffd608741f6d92e1060b5e2