spec: new upstream version 2.22.0

resolves: #https://issues.redhat.com/browse/RHEL-102878
Signed-off-by: Tiago Bueno <tbueno@redhat.com>
This commit is contained in:
Tiago Bueno 2025-07-16 18:24:41 -03:00
parent 9d11b51517
commit f7946e0007
No known key found for this signature in database
GPG Key ID: E05B66AA4A5AFC8C
4 changed files with 9 additions and 55 deletions

3
.gitignore vendored
View File

@ -66,3 +66,6 @@
/ignition-edge-b8d1b7a.tar.gz
/ignition-2.20.0.tar.gz
/ignition-2.21.0.tar.gz
/ignition-2.22.0.tar.gz
/ignition-*.src.rpm
/results_ignition/

View File

@ -1,49 +0,0 @@
From 8db6a73a353aee31ac07a60c09c1d8a749f3234e Mon Sep 17 00:00:00 2001
From: Etienne Champetier <e.champetier@ateme.com>
Date: Mon, 17 Mar 2025 14:52:48 -0400
Subject: [PATCH] Rename ignition.cfg -> 05_ignition.cfg
When bootupd/grub2-static/configs.d was introduced,
blscfg was after every config. Some config need to be after blscfg,
so rename to 05_ignition.cfg so we can align bootupd numbering with
legacy grub (blscfg is in 10_linux).
---
Makefile | 2 +-
docs/release-notes.md | 2 ++
grub2/{ignition.cfg => 05_ignition.cfg} | 0
3 files changed, 3 insertions(+), 1 deletion(-)
rename grub2/{ignition.cfg => 05_ignition.cfg} (100%)
diff --git a/Makefile b/Makefile
index 635b809f..2f3ed33c 100644
--- a/Makefile
+++ b/Makefile
@@ -33,7 +33,7 @@ install: all
ln -sf ../lib/dracut/modules.d/30ignition/ignition $(DESTDIR)/usr/libexec/ignition-rmcfg
install-grub-for-bootupd:
- install -m 0644 -D -t $(DESTDIR)/usr/lib/bootupd/grub2-static/configs.d grub2/ignition.cfg
+ install -m 0644 -D -t $(DESTDIR)/usr/lib/bootupd/grub2-static/configs.d grub2/05_ignition.cfg
.PHONY: vendor
vendor:
diff --git a/docs/release-notes.md b/docs/release-notes.md
index 6829e671..ec3c1aa7 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -12,6 +12,8 @@ nav_order: 9
### Changes
+- Rename ignition.cfg -> 05_ignition.cfg
+
### Bug fixes
diff --git a/grub2/ignition.cfg b/grub2/05_ignition.cfg
similarity index 100%
rename from grub2/ignition.cfg
rename to grub2/05_ignition.cfg
--
2.48.1

View File

@ -13,7 +13,7 @@
# https://github.com/coreos/ignition
%global goipath github.com/coreos/ignition
%global gomodulesmode GO111MODULE=on
Version: 2.21.0
Version: 2.22.0
%gometa
@ -31,8 +31,6 @@ URL: %{gourl}
Source0: %{gosource}
Source1: https://github.com/fedora-iot/ignition-edge/archive/%{ignedgecommit}/ignition-edge-%{ignedgeshortcommit}.tar.gz
Patch0: 0001-Rename-ignition.cfg-05_ignition.cfg.patch
BuildRequires: libblkid-devel
BuildRequires: systemd-rpm-macros
@ -380,12 +378,14 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition
%endif
%changelog
* Thu Mar 24 2025 Yasmin Valim <ydesouza@redhat.com> - 2.21.0-1
* Wed Jul 16 2025 Tiago Bueno <tbueno@redhat.com> - 2.22.0-1
- New release
* Mon Mar 24 2025 Yasmin Valim <ydesouza@redhat.com> - 2.21.0-1
- Re-sync with upstream changes adding ignition-grub subpackage
and a few minor changes
- New release
* Mon Nov 04 2024 Steven Presti <spresti@redhat.com> - 2.20.0-1
- New release

View File

@ -1,2 +1,2 @@
SHA512 (ignition-2.21.0.tar.gz) = f388dff9f0bf0bbe54ec2e6c88f35fab886b2ca7de6828c10456c0bfa44412d41e624682df1271c153ac9f721b4ace1e70104ee48760e19e13c257b99f8ab453
SHA512 (ignition-2.22.0.tar.gz) = fd9fbe28b77c0593c4ca3f7d08fcb46c56c29d8fd4365c37856b8ccfd178d3cbb44dbe15effcfada3da851bece893edfe2b4de2c4873a90c909322a8c806143a
SHA512 (ignition-edge-b8d1b7a.tar.gz) = 4ad167d89a4efeca8a24f24fe5a0bd2e5a1acfa86eb21653d84ad136236c727c328e7da890f3294a2e81b32e7b52435713e71fdbdd9d93d815f1c202b4f49f36