From f51af6e36e4955170087814a22ea7ec7b9715fc7 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Tue, 24 Jun 2025 09:54:07 +0000 Subject: [PATCH] import CS ignition-2.21.0-2.el10 --- .gitignore | 5 +- .ignition.metadata | 2 - ...-Rename-ignition.cfg-05_ignition.cfg.patch | 49 +++ SPECS/ignition.spec => ignition.spec | 356 ++++++++++++------ sources | 3 + 5 files changed, 292 insertions(+), 123 deletions(-) delete mode 100644 .ignition.metadata create mode 100644 0001-Rename-ignition.cfg-05_ignition.cfg.patch rename SPECS/ignition.spec => ignition.spec (78%) create mode 100644 sources diff --git a/.gitignore b/.gitignore index c53d95d..5ebb4dd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ -SOURCES/ignition-2.20.0.tar.gz -SOURCES/ignition-edge-b8d1b7a.tar.gz +gptfdisk-1.0.10.tar.gz +ignition-2.21.0.tar.gz +ignition-edge-b8d1b7a.tar.gz diff --git a/.ignition.metadata b/.ignition.metadata deleted file mode 100644 index a4382a6..0000000 --- a/.ignition.metadata +++ /dev/null @@ -1,2 +0,0 @@ -869ef34676237447050898b7b9f549c43f64fe03 SOURCES/ignition-2.20.0.tar.gz -0069b62bce8673f82ac6a4b9959ec8db4ffed8ad SOURCES/ignition-edge-b8d1b7a.tar.gz diff --git a/0001-Rename-ignition.cfg-05_ignition.cfg.patch b/0001-Rename-ignition.cfg-05_ignition.cfg.patch new file mode 100644 index 0000000..e3fe17f --- /dev/null +++ b/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/ignition.spec similarity index 78% rename from SPECS/ignition.spec rename to ignition.spec index ea57a9e..a78b681 100644 --- a/SPECS/ignition.spec +++ b/ignition.spec @@ -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 = 2; + base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); + print(release_number + base_release_number - 1); +}%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} +## END: Set by rpmautospec + # Generated by go2rpm 1.3 %if 0%{?fedora} %bcond_without check @@ -10,10 +20,13 @@ %global ignedgecommit b8d1b7a52c28fd5c33d15a0628d4b69f242f5c57 %global ignedgeshortcommit %(c=%{ignedgecommit}; echo ${c:0:7}) +# For vendored gdisk +%global gdiskversion 1.0.10 + # https://github.com/coreos/ignition %global goipath github.com/coreos/ignition %global gomodulesmode GO111MODULE=on -Version: 2.20.0 +Version: 2.21.0 %gometa @@ -22,14 +35,19 @@ Version: 2.20.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 1%{?dist} -Summary: First boot installer and configuration tool (RHEL CoreOS only) +Release: %autorelease +Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 -License: ASL 2.0 +# gdisk: GPL-2.0-or-later +License: Apache-2.0 AND GPL-2.0-or-later URL: %{gourl} Source0: %{gosource} Source1: https://github.com/fedora-iot/ignition-edge/archive/%{ignedgecommit}/ignition-edge-%{ignedgeshortcommit}.tar.gz +# For vendored gdisk +Source2: http://downloads.sourceforge.net/gptfdisk/gptfdisk-%{gdiskversion}.tar.gz + +Patch0: 0001-Rename-ignition.cfg-05_ignition.cfg.patch BuildRequires: libblkid-devel BuildRequires: systemd-rpm-macros @@ -39,11 +57,17 @@ BuildRequires: systemd-rpm-macros Recommends: btrfs-progs %endif Requires: dosfstools -Requires: gdisk Requires: dracut Requires: dracut-network -Obsoletes: ignition-dracut < 0.31.0-3 +%if 0%{?rhel} && 0%{?rhel} == 10 +# For vendored gdisk +BuildRequires: gcc-c++ +BuildRequires: libuuid-devel +BuildRequires: make +BuildRequires: ncurses-devel +BuildRequires: popt-devel +%endif # Generated by `go-mods-to-bundled-provides.py | sort` Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.2.3 @@ -51,61 +75,61 @@ Provides: bundled(golang(cloud.google.com/go/storage)) = 1.35.1 Provides: bundled(golang(cloud.google.com/go/storage/internal)) = 1.35.1 Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2)) = 1.35.1 Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2/storagepb)) = 1.35.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/arn)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/auth/bearer)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/processcreds)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ssocreds)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/csm)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/context)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/arn)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/s3err)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkmath)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/strings)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sync/singleflight)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/checksum)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/json/jsonutil)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/jsonrpc)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restjson)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/ssooidc)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso/ssoiface)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.48.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts/stsiface)) = 1.48.0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/arn)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/auth/bearer)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/processcreds)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ssocreds)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/csm)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/context)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/arn)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/s3err)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkmath)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/strings)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sync/singleflight)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/checksum)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/json/jsonutil)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/jsonrpc)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restjson)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/ssooidc)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso/ssoiface)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.47.9 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts/stsiface)) = 1.47.9 Provides: bundled(golang(github.com/beevik/etree)) = 1.2.0 -Provides: bundled(golang(github.com/containers/libhvee/pkg/kvp)) = 0.5.0 +Provides: bundled(golang(github.com/containers/libhvee/pkg/kvp)) = 0.4.0 Provides: bundled(golang(github.com/coreos/go-semver/semver)) = 0.3.1 Provides: bundled(golang(github.com/coreos/go-systemd/v22/dbus)) = 22.5.0 Provides: bundled(golang(github.com/coreos/go-systemd/v22/journal)) = 22.5.0 @@ -168,8 +192,6 @@ Provides: bundled(golang(google.golang.org/api/transport/http/internal/propagati Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1 %description -This software is currently only supported on RHEL CoreOS. - Ignition is a utility used to manipulate systems during the initramfs. This includes partitioning disks, formatting partitions, writing files (regular files, systemd units, etc.), and configuring users. On first @@ -182,9 +204,7 @@ the configuration. %package validate Summary: Validation tool for Ignition configs -License: ASL 2.0 - -Conflicts: ignition < 0.31.0-3 +License: Apache-2.0 %description validate Ignition is a utility used to manipulate systems during the initramfs. @@ -202,11 +222,9 @@ This package contains a tool for validating Ignition configurations. %package validate-redistributable Summary: Statically linked validation tool for Ignition configs -License: ASL 2.0 +License: Apache-2.0 BuildArch: noarch -Conflicts: ignition < 0.31.0-3 - # In case someone has this subpackage installed, obsolete the old name # Drop in Fedora 38 Obsoletes: ignition-validate-nonlinux < 2.13.0-4 @@ -218,18 +236,29 @@ 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} %package edge Summary: Enablement glue for Ignition on IoT/Edge systems -License: ASL 2.0 +License: Apache-2.0 %description edge This package contains dracut modules, services and binaries needed to enable Ignition on IoT/Edge systems. -%endif %prep %if 0%{?fedora} @@ -237,7 +266,13 @@ Ignition on IoT/Edge systems. %autopatch -p1 %else %forgeautosetup -p1 +%endif + tar xvf %{SOURCE1} + +%if 0%{?rhel} && 0%{?rhel} == 10 +# Prep vendored gdisk +tar xvf %{SOURCE2} %endif %build @@ -258,7 +293,7 @@ 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,11 +304,18 @@ 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 %endif +%if 0%{?rhel} && 0%{?rhel} == 10 +# Build vendored gdisk +cd gptfdisk-%{gdiskversion} +make CXXFLAGS="%{optflags} -D_FILE_OFFSET_BITS=64" LDFLAGS="%{build_ldflags}" +%endif + %install # dracut modules install -d -p %{buildroot}/%{dracutlibdir}/modules.d @@ -283,12 +325,17 @@ 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 @@ -301,8 +348,13 @@ install -p -m 0644 ./ignition-validate-x86_64-unknown-linux-gnu-static %{buildro # the command line. Install directly into the dracut module dir. install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition -%if 0%{?rhel} && !0%{?eln} %make_install -C ignition-edge-%{ignedgecommit} + +%if 0%{?rhel} && 0%{?rhel} == 10 +# Install vendored gdisk +cd gptfdisk-%{gdiskversion} +install -D -p -m 0755 sgdisk %{buildroot}%{_libexecdir}/ignition-sgdisk +install -D -p -m 644 COPYING %{buildroot}%{_datadir}/licenses/gdisk/COPYING %endif %if %{with check} @@ -318,6 +370,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_unitdir}/ignition-delete-config.service %{_libexecdir}/ignition-apply %{_libexecdir}/ignition-rmcfg +# Vendored gdisk +%{_libexecdir}/ignition-sgdisk +%{_datadir}/licenses/gdisk/COPYING %files validate %doc README.md @@ -328,6 +383,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,7 +392,6 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_datadir}/ignition/ignition-validate-x86_64-unknown-linux-gnu-static %endif -%if 0%{?rhel} && !0%{?eln} %files edge %license %{golicenses} %doc %{godocs} @@ -349,81 +404,141 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_unitdir}/ignition-firstboot-complete.service %{_libexecdir}/coreos-ignition-write-issues %{_libexecdir}/coreos-check-ssh-keys -%endif + +%files grub +%doc README.md +%license %{golicenses} +%{_prefix}/lib/bootupd/grub2-static/configs.d/05_ignition.cfg %changelog -* Mon Nov 04 2024 Steven Presti - 2.20.0-1 +## START: Generated by rpmautospec +* Mon Mar 24 2025 Yasmin Valim - 2.21.0-2 +- Ignition.cfg -> 05_ignition.cfg rename + +* Fri Mar 21 2025 Yasmin Valim - 2.21.0-1 +- spec: new upstream version 2.21.0 + +* Mon Nov 04 2024 Steven Prestil - 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 +* Thu Sep 26 2024 Joseph Marrero - 2.19.0-1 +- Rebase to https://github.com/coreos/ignition/releases/tag/v2.19.0 +- Update ignition-edge commit https://github.com/fedora-iot/ignition-edge/pull/2 -* Tue Jul 02 2024 Joseph Marrero - 2.19.0-2 -- Rebuild of 2.19.0 with a newer golang +* Thu Aug 22 2024 Timothée Ravier - 2.17.0-7 +- Vendor gdisk -* Wed Jun 12 2024 Steven Presti - 2.19.0-1 +* Thu Aug 22 2024 Timothée Ravier - 2.17.0-6 +- Remove gdisk require to prepare for the sfdisk migration + +* Mon Jun 24 2024 Troy Dawson - 2.17.0-5 +- Bump release for June 2024 mass rebuild + +* Wed Jan 24 2024 Fedora Release Engineering - 2.17.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jan 20 2024 Fedora Release Engineering - 2.17.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Dec 15 2023 Steven Prestil - 2.17.0-2 +- Add ignition-grub subpackage + +* Wed Nov 22 2023 Steven Prestil - 2.17.0-1 - New release -* Thu Mar 07 2024 Yasmin Valim - 2.18.0-1 +* Thu Jul 20 2023 Fedora Release Engineering - 2.16.2-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jul 12 2023 Benjamin Gilbert - 2.16.2-1 - New release -* Fri Feb 09 2024 Timothée Ravier - 2.17.0-2 -- Backport fix for unexpected Azure IMDS status codes - -* Mon Dec 18 2023 Yasmin Valim - 2.17.0-1 +* Mon Jul 10 2023 Benjamin Gilbert - 2.16.1-1 - New release -* Thu Jul 13 2023 Benjamin Gilbert - 2.16.2-1 +* Thu Jun 1 2023 Steven Presti - 2.15.0-4 +- Switch License tags to SPDX + +* Thu Feb 23 2023 Benjamin Gilbert - 2.15.0-3 +- Remove ignition-edge files from base package + +* Wed Feb 22 2023 Paul Whalen - 2.15.0-2 +- Enable ignition-edge in Fedora + +* Tue Feb 21 2023 Benjamin Gilbert - 2.15.0-1 - New release +- Drop Conflicts/Obsoletes for ancient Ignition releases -* Tue May 30 2023 Antonio Murdaca - 2.15.0-2 -- Fix Edge's Anaconda installer (#2203233) +* Thu Jan 19 2023 Fedora Release Engineering - 2.14.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild -* Wed Feb 22 2023 Benjamin Gilbert - 2.15.0-1 -- New release -- Clarify -edge subpackage summary and description - -* Tue Nov 22 2022 Antonio Murdaca - 2.14.0-4 -- Rebuild to include ignition-edge subpackage (#2144789) - -* Mon Oct 10 2022 Benjamin Gilbert - 2.14.0-3 -- Rebuild for unblocking ignition-validate subpackage (#2121002) - -* Tue Aug 9 2022 Christian Glombek - 2.14.0-2 +* Tue Aug 9 2022 Christian Glombek - 2.14.0-5 - Enable writing ssh keys fragments on RHEL/CentOS >= 9 -* Thu May 26 2022 Benjamin Gilbert - 2.14.0-1 +* Thu Jul 21 2022 Fedora Release Engineering - 2.14.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Mon Jun 27 2022 Benjamin Gilbert - 2.14.0-3 +- Add macOS aarch64 binary to -redistributable + +* Sat Jun 18 2022 Robert-André Mauchin - 2.14.0-2 +- Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, + CVE-2022-29526, CVE-2022-30629 + +* Mon May 16 2022 Steven Presti - 2.14.0-1 - New release - Add ignition-apply symlink - Add ignition-rmcfg symlink and ignition-delete-config.service -* Mon Mar 21 2022 Sohan Kunkerkar - 2.13.0-2 +* Thu Mar 17 2022 Sohan Kunkerkar - 2.13.0-5 +- Avoid kernel lockdown on VMware when running with secure boot + +* Fri Jan 28 2022 Benjamin Gilbert - 2.13.0-4 - Rename -validate-nonlinux subpackage to -validate-redistributable - Add static Linux binaries to -redistributable - Fix macro invocation in comment -- Avoid kernel lockdown on VMware when running with secure boot -* Thu Jan 20 2022 Benjamin Gilbert - 2.13.0-1 -- New release +* Thu Jan 20 2022 Benjamin Gilbert - 2.13.0-3 - Fix LUKS volume reuse -- Avoid double patch application +- Avoid double patch application on non-Fedora -* Thu Sep 16 2021 Sohan Kunkerkar - 2.12.0-1 -- Suppress hardcoded library path warning -- Fix go-mods-to-bundled-provides script to parse correct rpm version -- Import specfile from Fedora +* Thu Jan 20 2022 Fedora Release Engineering - 2.13.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild -* Mon Aug 09 2021 Mohan Boddu - 2.9.0-7 -- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags - Related: rhbz#1991688 +* Tue Nov 30 2021 Sohan Kunkerkar - 2.13.0-1 +- New release -* Tue Jun 22 2021 Mohan Boddu - 2.9.0-6 -- Rebuilt for RHEL 9 BETA for openssl 3.0 - Related: rhbz#1971065 +* Wed Oct 13 2021 Sohan Kunkerkar - 2.12.0-3 +- Move Ignition report to /etc -* Fri Apr 16 2021 Mohan Boddu - 2.9.0-5 -- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937 +* Thu Aug 26 2021 Sohan Kunkerkar - 2.12.0-2 +- Disable file fragment writing logic for SSH authorized_keys on RHEL/CentOS +- Disable compressdwarf flag to avoid build failures on RHEL/CentOS +- Disable cross-building of Ignition-validate on RHEL/CentOS +- Conditionalize Fedora-specific configuration + +* Fri Aug 6 2021 Sohan Kunkerkar - 2.12.0-1 +- New release + +* Thu Jul 22 2021 Fedora Release Engineering - 2.11.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Thu Jul 8 2021 Benjamin Gilbert - 2.11.0-2 +- Move ignition-firstboot-complete and ignition-setup-user services out of + package into distro glue + +* Fri Jun 25 2021 Benjamin Gilbert - 2.11.0-1 +- New release + +* Wed May 26 2021 Jonathan Lebon - 2.10.1-3 +- Backport patch for multipath on firstboot + https://github.com/coreos/ignition/pull/1208 + https://github.com/coreos/fedora-coreos-config/pull/1011 + +* Wed May 26 2021 Jonathan Lebon - 2.10.1-2 +- Redo packaging using go2rpm + +* Thu Apr 29 2021 Stephen Lowrie - 2.10.1-1 +- New release * Fri Feb 05 2021 Benjamin Gilbert - 2.9.0-4 - Drop Git commit hash from Release @@ -737,3 +852,6 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition * Thu Jun 21 2018 Dusty Mabe - 0.26.0-0.1.git7610725 - First package for Fedora + + +## END: Generated by rpmautospec diff --git a/sources b/sources new file mode 100644 index 0000000..1491feb --- /dev/null +++ b/sources @@ -0,0 +1,3 @@ +SHA512 (gptfdisk-1.0.10.tar.gz) = 76764e176cd92470648a1d7a8d2570ebc41005204e73b0f2dd5a7aff2fc1981d3bec61a3bd68b855cc3474bcb7cf49c1cb2ea25843d4e7945bef7648d548383d +SHA512 (ignition-2.21.0.tar.gz) = f388dff9f0bf0bbe54ec2e6c88f35fab886b2ca7de6828c10456c0bfa44412d41e624682df1271c153ac9f721b4ace1e70104ee48760e19e13c257b99f8ab453 +SHA512 (ignition-edge-b8d1b7a.tar.gz) = 4ad167d89a4efeca8a24f24fe5a0bd2e5a1acfa86eb21653d84ad136236c727c328e7da890f3294a2e81b32e7b52435713e71fdbdd9d93d815f1c202b4f49f36