The package rpms/rust-bootupd.git has added or updated architecture specific content in its spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s): https://src.fedoraproject.org/cgit/rpms/rust-bootupd.git/commit/?id=76f2dcba....
Change: -ExclusiveArch: x86_64 aarch64 ppc64le
Thanks.
Full change: ============
commit aa13ad95d468b9464241a5297b556586e8399716 Author: Colin Walters walters@verbum.org Date: Tue Nov 28 13:53:08 2023 -0500
https://github.com/coreos/bootupd/releases/tag/v0.2.15
diff --git a/.gitignore b/.gitignore index e326958..4db1064 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,5 @@ /bootupd-0.2.13-vendor.tar.zstd /bootupd-0.2.14.crate /bootupd-0.2.14-vendor.tar.zstd +/bootupd-0.2.15.crate +/bootupd-0.2.15-vendor.tar.zstd diff --git a/rust-bootupd.spec b/rust-bootupd.spec index ed5c194..a7b5363 100644 --- a/rust-bootupd.spec +++ b/rust-bootupd.spec @@ -3,7 +3,7 @@ %global crate bootupd
Name: rust-%{crate} -Version: 0.2.14 +Version: 0.2.15 Release: 2%{?dist} Summary: Bootloader updater
@@ -83,6 +83,9 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0) %systemd_postun bootupd.service bootupd.socket
%changelog +* Tue Nov 28 2023 Colin Walters walters@verbum.org - 0.2.15-2 +- https://github.com/coreos/bootupd/releases/tag/v0.2.15 + * Mon Nov 20 2023 Colin Walters walters@verbum.org - 0.2.14-2 - https://github.com/coreos/bootupd/releases/tag/v0.2.14
diff --git a/sources b/sources index ec72d8d..9e508e6 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (bootupd-0.2.14.crate) = bb4051a53368d18b6a1428c5d617306520a0f222dd75f6f41762fb8187ded68b850ca7d1e9e6811f4544beba3ad3157aba6b402ca500ed56b3f54e4225f68f9d -SHA512 (bootupd-0.2.14-vendor.tar.zstd) = 8b7f0c5894667e44a4975fd33a914d183b173e2682cb9e24e902ee7094be6cbffc3a6e29c74f7f0e5873f1ebce3330b93e0ac2fa186f1b26c7324ccb2a9f80f1 +SHA512 (bootupd-0.2.15.crate) = 8b76f74aa08eb3da6156f9b9ee73e2c06e57040eccf3a6bdc88769cc0cc1c4cad5f00f55cc7192c5cd910809c9964d91b9c024ce825d880f0c378fba2e5da4de +SHA512 (bootupd-0.2.15-vendor.tar.zstd) = 252bcbbba2883607f7e5ecbae030c74b7eaa52be38cf047d094c815ae62d5b422080e05f7c31fff33b60541cba824505dbc83d5390ed79fe504fa66d6fa2fec6
commit a9fae378a3b9ef5843be6b7978e6fb6a37b06158 Author: Colin Walters walters@verbum.org Date: Mon Nov 20 10:03:29 2023 -0500
https://github.com/coreos/bootupd/releases/tag/v0.2.14
diff --git a/.gitignore b/.gitignore index 2b57418..e326958 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,5 @@ /bootupd-0.2.12-vendor.tar.zstd /bootupd-0.2.13.crate /bootupd-0.2.13-vendor.tar.zstd +/bootupd-0.2.14.crate +/bootupd-0.2.14-vendor.tar.zstd diff --git a/0001-grubconfigs-Ensure-grub2-dir-exists.patch b/0001-grubconfigs-Ensure-grub2-dir-exists.patch deleted file mode 100644 index 22dd36e..0000000 --- a/0001-grubconfigs-Ensure-grub2-dir-exists.patch +++ /dev/null @@ -1,30 +0,0 @@ -From ece9120cb43b1834ff4b7268308886cd89a47e54 Mon Sep 17 00:00:00 2001 -From: Colin Walters walters@verbum.org -Date: Thu, 9 Nov 2023 19:17:57 -0500 -Subject: [PATCH] grubconfigs: Ensure grub2 dir exists - -I hit this when testing `bootc install` in a loop, it seems like -we could be implicitly depending on this directory already -having been created. ---- - src/grubconfigs.rs | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/grubconfigs.rs b/src/grubconfigs.rs -index 01f6b3e..dcdf986 100644 ---- a/src/grubconfigs.rs -+++ b/src/grubconfigs.rs -@@ -62,6 +62,10 @@ pub(crate) fn install(target_root: &openat::Dir, efi: bool) -> Result<()> { - config.push_str(post.as_str()); - } - -+ if !bootdir.exists(GRUB2DIR)? { -+ bootdir.create_dir(GRUB2DIR, 0o700)?; -+ } -+ - bootdir - .write_file_contents(format!("{GRUB2DIR}/grub.cfg"), 0o644, config.as_bytes()) - .context("Copying grub-static.cfg")?; --- -2.41.0 - diff --git a/rust-bootupd.spec b/rust-bootupd.spec index e953eb0..ed5c194 100644 --- a/rust-bootupd.spec +++ b/rust-bootupd.spec @@ -3,8 +3,8 @@ %global crate bootupd
Name: rust-%{crate} -Version: 0.2.13 -Release: 4%{?dist} +Version: 0.2.14 +Release: 2%{?dist} Summary: Bootloader updater
License: Apache-2.0 @@ -12,8 +12,6 @@ URL: https://github.com/coreos/bootupd Source0: %{url}/releases/download/v%{version}/bootupd-%{version}.crate Source1: %{url}/releases/download/v%{version}/bootupd-%{version}-vendor.tar.zstd
-Patch0: 0001-grubconfigs-Ensure-grub2-dir-exists.patch - # For now, see upstream BuildRequires: make BuildRequires: openssl-devel @@ -85,6 +83,9 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0) %systemd_postun bootupd.service bootupd.socket
%changelog +* Mon Nov 20 2023 Colin Walters walters@verbum.org - 0.2.14-2 +- https://github.com/coreos/bootupd/releases/tag/v0.2.14 + * Tue Nov 14 2023 Yaakov Selkowitz yselkowi@redhat.com - 0.2.13-4 - Fix RHEL build
diff --git a/sources b/sources index 77d2f4c..ec72d8d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (bootupd-0.2.13.crate) = 90986c102b9e0977e8d2d6141063e3f33b7b1ef732971703e01a03cf9a7cc20b295f969f84495e74e2594c501c95fb5b85d6cbc76c568871dfa765f1ed7fce0d -SHA512 (bootupd-0.2.13-vendor.tar.zstd) = 76a6ee84374b68ca53fe44b6df2c07870045311d1ae6a01301c97e92753d407d2dc3b085ebdb502bafcc2206162262bb0268b1c8a48cc8582d666d031acc53da +SHA512 (bootupd-0.2.14.crate) = bb4051a53368d18b6a1428c5d617306520a0f222dd75f6f41762fb8187ded68b850ca7d1e9e6811f4544beba3ad3157aba6b402ca500ed56b3f54e4225f68f9d +SHA512 (bootupd-0.2.14-vendor.tar.zstd) = 8b7f0c5894667e44a4975fd33a914d183b173e2682cb9e24e902ee7094be6cbffc3a6e29c74f7f0e5873f1ebce3330b93e0ac2fa186f1b26c7324ccb2a9f80f1
commit 1d5cf86bfa9168e006ca0d338fce3d148f7ab225 Author: Yaakov Selkowitz yselkowi@redhat.com Date: Tue Nov 14 11:23:25 2023 -0500
Fix RHEL build
The RHEL rust-toolset macros are currently way behind Fedora rust-packaging. While work is underway to get them in sync, this package still needs to be buildable in the meantime.
diff --git a/rust-bootupd.spec b/rust-bootupd.spec index e0ae6dc..e953eb0 100644 --- a/rust-bootupd.spec +++ b/rust-bootupd.spec @@ -4,7 +4,7 @@
Name: rust-%{crate} Version: 0.2.13 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Bootloader updater
License: Apache-2.0 @@ -17,7 +17,7 @@ Patch0: 0001-grubconfigs-Ensure-grub2-dir-exists.patch # For now, see upstream BuildRequires: make BuildRequires: openssl-devel -%if 0%{?rhel} && !0%{?eln} +%if 0%{?rhel} BuildRequires: rust-toolset %else BuildRequires: cargo-rpm-macros >= 25 @@ -45,8 +45,10 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0)
%files -n %{crate} %license LICENSE +%if !0%{?rhel} %license LICENSE.dependencies %license cargo-vendor.txt +%endif %doc README.md %{_bindir}/bootupctl %{_libexecdir}/bootupd @@ -54,14 +56,20 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0) %{_prefix}/lib/bootupd/grub2-static/
%prep -%autosetup -n %{crate}-%{version} -p1 -a1 +%autosetup -n %{crate}-%{version} -p1 %{!?rhel:-a1} +%if 0%{?rhel} +%cargo_prep -V 1 +%else %cargo_prep -v vendor +%endif
%build %cargo_build +%if !0%{?rhel} %cargo_vendor_manifest %cargo_license_summary %{cargo_license} > LICENSE.dependencies +%endif
%install %make_install INSTALL="install -p -c" @@ -77,6 +85,9 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0) %systemd_postun bootupd.service bootupd.socket
%changelog +* Tue Nov 14 2023 Yaakov Selkowitz yselkowi@redhat.com - 0.2.13-4 +- Fix RHEL build + * Fri Nov 10 2023 Colin Walters walters@verbum.org - 0.2.13-3 - Backport patch for not having separate /boot
commit 32e71044803a0b6826098bcfda80150843300720 Author: Colin Walters walters@verbum.org Date: Fri Nov 10 08:18:35 2023 -0500
Backport patch for not having separate /boot
diff --git a/0001-grubconfigs-Ensure-grub2-dir-exists.patch b/0001-grubconfigs-Ensure-grub2-dir-exists.patch new file mode 100644 index 0000000..22dd36e --- /dev/null +++ b/0001-grubconfigs-Ensure-grub2-dir-exists.patch @@ -0,0 +1,30 @@ +From ece9120cb43b1834ff4b7268308886cd89a47e54 Mon Sep 17 00:00:00 2001 +From: Colin Walters walters@verbum.org +Date: Thu, 9 Nov 2023 19:17:57 -0500 +Subject: [PATCH] grubconfigs: Ensure grub2 dir exists + +I hit this when testing `bootc install` in a loop, it seems like +we could be implicitly depending on this directory already +having been created. +--- + src/grubconfigs.rs | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/grubconfigs.rs b/src/grubconfigs.rs +index 01f6b3e..dcdf986 100644 +--- a/src/grubconfigs.rs ++++ b/src/grubconfigs.rs +@@ -62,6 +62,10 @@ pub(crate) fn install(target_root: &openat::Dir, efi: bool) -> Result<()> { + config.push_str(post.as_str()); + } + ++ if !bootdir.exists(GRUB2DIR)? { ++ bootdir.create_dir(GRUB2DIR, 0o700)?; ++ } ++ + bootdir + .write_file_contents(format!("{GRUB2DIR}/grub.cfg"), 0o644, config.as_bytes()) + .context("Copying grub-static.cfg")?; +-- +2.41.0 + diff --git a/rust-bootupd.spec b/rust-bootupd.spec index 67b7059..e0ae6dc 100644 --- a/rust-bootupd.spec +++ b/rust-bootupd.spec @@ -4,7 +4,7 @@
Name: rust-%{crate} Version: 0.2.13 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Bootloader updater
License: Apache-2.0 @@ -12,6 +12,8 @@ URL: https://github.com/coreos/bootupd Source0: %{url}/releases/download/v%{version}/bootupd-%{version}.crate Source1: %{url}/releases/download/v%{version}/bootupd-%{version}-vendor.tar.zstd
+Patch0: 0001-grubconfigs-Ensure-grub2-dir-exists.patch + # For now, see upstream BuildRequires: make BuildRequires: openssl-devel @@ -75,6 +77,9 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0) %systemd_postun bootupd.service bootupd.socket
%changelog +* Fri Nov 10 2023 Colin Walters walters@verbum.org - 0.2.13-3 +- Backport patch for not having separate /boot + * Thu Nov 02 2023 Colin Walters walters@verbum.org - 0.2.13-2 - Rebase to 0.2.13
commit 76f2dcba68b30db29ac34dd3f9179cd572937728 Author: Colin Walters walters@verbum.org Date: Thu Nov 2 15:51:26 2023 -0400
Rebase to 0.2.13
diff --git a/.gitignore b/.gitignore index 0847a28..2b57418 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ /bootupd-0.2.11-vendor.tar.gz /bootupd-0.2.12.crate /bootupd-0.2.12-vendor.tar.zstd +/bootupd-0.2.13.crate +/bootupd-0.2.13-vendor.tar.zstd diff --git a/rust-bootupd.spec b/rust-bootupd.spec index 26d743b..67b7059 100644 --- a/rust-bootupd.spec +++ b/rust-bootupd.spec @@ -3,8 +3,8 @@ %global crate bootupd
Name: rust-%{crate} -Version: 0.2.12 -Release: 4%{?dist} +Version: 0.2.13 +Release: 2%{?dist} Summary: Bootloader updater
License: Apache-2.0 @@ -13,7 +13,6 @@ Source0: %{url}/releases/download/v%{version}/bootupd-%{version}.crate Source1: %{url}/releases/download/v%{version}/bootupd-%{version}-vendor.tar.zstd
# For now, see upstream -ExclusiveArch: x86_64 aarch64 ppc64le BuildRequires: make BuildRequires: openssl-devel %if 0%{?rhel} && !0%{?eln} @@ -76,6 +75,9 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0) %systemd_postun bootupd.service bootupd.socket
%changelog +* Thu Nov 02 2023 Colin Walters walters@verbum.org - 0.2.13-2 +- Rebase to 0.2.13 + * Mon Oct 23 2023 Colin Walters walters@verbum.org - 0.2.12-4 - Install static configs
diff --git a/sources b/sources index ae50171..77d2f4c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (bootupd-0.2.12.crate) = d84ec9f5ca1c0a1186f76fc9632dd854d49fd220e7b14fe8c4f10188133a63d9d655f967a3f3aa50dce15e0772628938a7f99c88099ddee63606763b5c276baf -SHA512 (bootupd-0.2.12-vendor.tar.zstd) = 90c909a4563b4f180cf450aac4fa5fddaeb4a57492fdbe50e7b2c8646474aefd588f082ec2788ee2868a007cfaeab33a6a77795ead5bbe4dc503b910ba212350 +SHA512 (bootupd-0.2.13.crate) = 90986c102b9e0977e8d2d6141063e3f33b7b1ef732971703e01a03cf9a7cc20b295f969f84495e74e2594c501c95fb5b85d6cbc76c568871dfa765f1ed7fce0d +SHA512 (bootupd-0.2.13-vendor.tar.zstd) = 76a6ee84374b68ca53fe44b6df2c07870045311d1ae6a01301c97e92753d407d2dc3b085ebdb502bafcc2206162262bb0268b1c8a48cc8582d666d031acc53da
commit 4bde19fb9636f5bc62fcf38d4a6f59fa054d50b1 Author: Colin Walters walters@verbum.org Date: Mon Oct 23 15:31:42 2023 -0400
Install static configs
diff --git a/rust-bootupd.spec b/rust-bootupd.spec index cab6404..26d743b 100644 --- a/rust-bootupd.spec +++ b/rust-bootupd.spec @@ -4,7 +4,7 @@
Name: rust-%{crate} Version: 0.2.12 -Release: 2%{?dist} +Release: 4%{?dist} Summary: Bootloader updater
License: Apache-2.0 @@ -50,6 +50,7 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0) %{_bindir}/bootupctl %{_libexecdir}/bootupd %{_unitdir}/* +%{_prefix}/lib/bootupd/grub2-static/
%prep %autosetup -n %{crate}-%{version} -p1 -a1 @@ -63,6 +64,7 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0)
%install %make_install INSTALL="install -p -c" +%{__make} install-grub-static DESTDIR=%{?buildroot} INSTALL="%{__install} -p"
%post -n %{crate} %systemd_post bootupd.service bootupd.socket @@ -74,6 +76,9 @@ License: Apache-2.0 AND BSD-3-Clause AND MIT AND (Apache-2.0 OR BSL-1.0) %systemd_postun bootupd.service bootupd.socket
%changelog +* Mon Oct 23 2023 Colin Walters walters@verbum.org - 0.2.12-4 +- Install static configs + * Fri Oct 20 2023 Colin Walters walters@verbum.org - 0.2.12-2 - https://github.com/coreos/bootupd/releases/tag/v0.2.12
arch-excludes@lists.fedoraproject.org