From baf6b9669a6e8c526479968cd73ecdd755f1aef3 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 24 Jun 2025 08:11:11 +0000 Subject: [PATCH] import CS ignition-2.21.0-1.el9_6 --- .gitignore | 2 +- .ignition.metadata | 2 +- ...-Rename-ignition.cfg-05_ignition.cfg.patch | 49 +++++++++++++++++++ SPECS/ignition.spec | 43 ++++++++++++++-- 4 files changed, 91 insertions(+), 5 deletions(-) create mode 100644 SOURCES/0001-Rename-ignition.cfg-05_ignition.cfg.patch diff --git a/.gitignore b/.gitignore index a0781fd..3cd0f23 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ -SOURCES/ignition-2.19.0.tar.gz +SOURCES/ignition-2.21.0.tar.gz SOURCES/ignition-edge-b8d1b7a.tar.gz diff --git a/.ignition.metadata b/.ignition.metadata index 5206ef1..708222a 100644 --- a/.ignition.metadata +++ b/.ignition.metadata @@ -1,2 +1,2 @@ -f10ca64b7df40a3497cb224f29189051521471fb SOURCES/ignition-2.19.0.tar.gz +08432de43e1b83a7870a69042886fb00a6368766 SOURCES/ignition-2.21.0.tar.gz 0069b62bce8673f82ac6a4b9959ec8db4ffed8ad SOURCES/ignition-edge-b8d1b7a.tar.gz diff --git a/SOURCES/0001-Rename-ignition.cfg-05_ignition.cfg.patch b/SOURCES/0001-Rename-ignition.cfg-05_ignition.cfg.patch new file mode 100644 index 0000000..e3fe17f --- /dev/null +++ b/SOURCES/0001-Rename-ignition.cfg-05_ignition.cfg.patch @@ -0,0 +1,49 @@ +From 8db6a73a353aee31ac07a60c09c1d8a749f3234e Mon Sep 17 00:00:00 2001 +From: Etienne Champetier +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 + diff --git a/SPECS/ignition.spec b/SPECS/ignition.spec index 6714582..46a0c2a 100644 --- a/SPECS/ignition.spec +++ b/SPECS/ignition.spec @@ -13,7 +13,7 @@ # https://github.com/coreos/ignition %global goipath github.com/coreos/ignition %global gomodulesmode GO111MODULE=on -Version: 2.19.0 +Version: 2.21.0 %gometa @@ -22,7 +22,7 @@ Version: 2.19.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 3%{?dist} +Release: 1%{?dist} Summary: First boot installer and configuration tool (RHEL CoreOS only) # Upstream license specification: Apache-2.0 @@ -31,6 +31,8 @@ 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 @@ -218,6 +220,18 @@ It is only used for building release binaries to be signed by Fedora release engineering and uploaded to the Ignition GitHub releases page. %endif +############## grub subpackage ############## + +%package grub +Summary: Enablement glue for bootupd's grub2 config +License: Apache-2.0 + +# `ignition-grub` is a rename `ignition-ignition-grub` so let's obsolete `ignition-ignition-grub` +Obsoletes: ignition-ignition-grub + +%description grub +This package contains the grub2 config which is compatable with bootupd. + ############## ignition-edge subpackage ############## %if 0%{?rhel} && !0%{?eln} @@ -258,7 +272,8 @@ echo "Building ignition..." echo "Building ignition-validate..." %gobuild -o ./ignition-validate validate/main.go -%global gocrossbuild go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x + +%global gocrossbuild go build -ldflags "${LDFLAGS:-} -B 0x$(cat /dev/urandom | tr -d -c '0-9a-f' | head -c16)" -a -v -x %if 0%{?fedora} echo "Building statically-linked Linux ignition-validate..." @@ -269,6 +284,7 @@ CGO_ENABLED=0 GOARCH=amd64 GOOS=linux %gocrossbuild -o ./ignition-validate-x86_6 echo "Building macOS ignition-validate..." GOARCH=amd64 GOOS=darwin %gocrossbuild -o ./ignition-validate-x86_64-apple-darwin validate/main.go +GOARCH=arm64 GOOS=darwin %gocrossbuild -o ./ignition-validate-aarch64-apple-darwin validate/main.go echo "Building Windows ignition-validate..." GOARCH=amd64 GOOS=windows %gocrossbuild -o ./ignition-validate-x86_64-pc-windows-gnu.exe validate/main.go @@ -283,12 +299,18 @@ install -m 0755 -d %{buildroot}/%{_libexecdir} ln -sf ../lib/dracut/modules.d/30ignition/ignition %{buildroot}/%{_libexecdir}/ignition-apply ln -sf ../lib/dracut/modules.d/30ignition/ignition %{buildroot}/%{_libexecdir}/ignition-rmcfg + +# grub +install -d -p %{buildroot}%{_prefix}/lib/bootupd/grub2-static/configs.d +install -p -m 0644 grub2/05_ignition.cfg %{buildroot}%{_prefix}/lib/bootupd/grub2-static/configs.d/ + # ignition install -d -p %{buildroot}%{_bindir} install -p -m 0755 ./ignition-validate %{buildroot}%{_bindir} %if 0%{?fedora} install -d -p %{buildroot}%{_datadir}/ignition +install -p -m 0644 ./ignition-validate-aarch64-apple-darwin %{buildroot}%{_datadir}/ignition install -p -m 0644 ./ignition-validate-aarch64-unknown-linux-gnu-static %{buildroot}%{_datadir}/ignition install -p -m 0644 ./ignition-validate-ppc64le-unknown-linux-gnu-static %{buildroot}%{_datadir}/ignition install -p -m 0644 ./ignition-validate-s390x-unknown-linux-gnu-static %{buildroot}%{_datadir}/ignition @@ -328,6 +350,7 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %files validate-redistributable %license %{golicenses} %dir %{_datadir}/ignition +%{_datadir}/ignition/ignition-validate-aarch64-apple-darwin %{_datadir}/ignition/ignition-validate-aarch64-unknown-linux-gnu-static %{_datadir}/ignition/ignition-validate-ppc64le-unknown-linux-gnu-static %{_datadir}/ignition/ignition-validate-s390x-unknown-linux-gnu-static @@ -336,6 +359,11 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_datadir}/ignition/ignition-validate-x86_64-unknown-linux-gnu-static %endif +%files grub +%doc README.md +%license %{golicenses} +%{_prefix}/lib/bootupd/grub2-static/configs.d/05_ignition.cfg + %if 0%{?rhel} && !0%{?eln} %files edge %license %{golicenses} @@ -352,6 +380,15 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %endif %changelog +* Thu Mar 24 2025 Yasmin Valim - 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 - 2.20.0-1 +- New release + * Mon Sep 09 2024 Miguel Martín - 2.19.0-3 - Update ignition-edge commit to support FIPS - https://github.com/fedora-iot/ignition-edge/pull/2