Compare commits

..

1 commit

Author SHA1 Message Date
Steven Presti
0ba1289421 Revert "Update to 2.21.0"
This reverts commit a13fc83299.
2025-03-18 12:19:06 -04:00
5 changed files with 205 additions and 188 deletions

6
.gitignore vendored
View file

@ -67,9 +67,3 @@
/ignition-2.19.0.tar.gz
/ignition-2.20.0.tar.gz
/ignition-edge-a258749.tar.gz
/ignition-2.21.0.tar.gz
/ignition-2.22.0.tar.gz
/ignition-2.23.0.tar.gz
/ignition-2.24.0.tar.gz
/ignition-2.25.0.tar.gz
/ignition-2.25.1.tar.gz

View file

@ -0,0 +1,79 @@
From 116f0b82f7dc19461b5f0b09550c81f3489525ec Mon Sep 17 00:00:00 2001
From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
Date: Sun, 19 Jan 2025 07:59:23 -0500
Subject: [PATCH 1/2] engine: Add fmt string to Logger.PushPrefix call
The Vet in Go 1.24 will add a new check to the printf analyzer that
"reports a diagnostic for calls of the form `fmt.Printf(s)`, where
`s` is a non-constant format string, with no other arguments.
Such calls are nearly always a mistake as the value of `s` may contain
the `%` symbol; use `fmt.Print` instead."
---
internal/exec/engine.go | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/internal/exec/engine.go b/internal/exec/engine.go
index 11e699cc..f584e518 100644
--- a/internal/exec/engine.go
+++ b/internal/exec/engine.go
@@ -121,7 +121,7 @@ func (e Engine) Run(stageName string) error {
return err
}
- e.Logger.PushPrefix(stageName) //nolint:govet
+ e.Logger.PushPrefix("%s", stageName)
defer e.Logger.PopPrefix()
fullConfig := latest.Merge(baseConfig, latest.Merge(systemBaseConfig, cfg))
--
2.47.1
From beaeeb449973322adf92f6b5aa26bdf379e7efab Mon Sep 17 00:00:00 2001
From: "FeRD (Frank Dana)" <ferdnyc@gmail.com>
Date: Sun, 19 Jan 2025 08:09:41 -0500
Subject: [PATCH 2/2] main: Add fmt string to logger.Info calls
The Vet in Go 1.24 will add a new check to the printf analyzer that
"reports a diagnostic for calls of the form `fmt.Printf(s)`, where
`s` is a non-constant format string, with no other arguments.
Such calls are nearly always a mistake as the value of `s` may contain
the `%` symbol; use `fmt.Print` instead."
---
internal/main.go | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/internal/main.go b/internal/main.go
index 5cebe6a4..7e9e64c6 100644
--- a/internal/main.go
+++ b/internal/main.go
@@ -89,7 +89,7 @@ func ignitionMain() {
logger := log.New(flags.logToStdout)
defer logger.Close()
- logger.Info(version.String) //nolint:govet
+ logger.Info("%s", version.String)
logger.Info("Stage: %v", flags.stage)
platformConfig := platform.MustGet(flags.platform.String())
@@ -157,7 +157,7 @@ func ignitionApplyMain() {
logger := log.New(true)
defer logger.Close()
- logger.Info(version.String) //nolint:govet
+ logger.Info("%s", version.String)
var blob []byte
var err error
@@ -219,7 +219,7 @@ func ignitionRmCfgMain() {
logger := log.New(flags.logToStdout)
defer logger.Close()
- logger.Info(version.String) //nolint:govet
+ logger.Info("%s", version.String)
platformConfig := platform.MustGet(flags.platform)
fetcher, err := platformConfig.NewFetcher(&logger)
--
2.47.1

View file

@ -13,7 +13,7 @@
# https://github.com/coreos/ignition
%global goipath github.com/coreos/ignition
%global gomodulesmode GO111MODULE=on
Version: 2.25.1
Version: 2.20.0
%gometa
@ -22,7 +22,7 @@ Version: 2.25.1
%global dracutlibdir %{_prefix}/lib/dracut
Name: ignition
Release: 1%{?dist}
Release: 5%{?dist}
Summary: First boot installer and configuration tool
# Upstream license specification: Apache-2.0
@ -31,6 +31,9 @@ URL: %{gourl}
Source0: %{gosource}
Source1: https://github.com/fedora-iot/ignition-edge/archive/%{ignedgecommit}/ignition-edge-%{ignedgeshortcommit}.tar.gz
# Upstream PR #2000 (merged, not yet released)
# See: github.com/coreos/ignition/pull/2000
Patch0: ignition-2.20.0-go-1.24-compat.patch
BuildRequires: libblkid-devel
BuildRequires: systemd-rpm-macros
@ -47,137 +50,126 @@ Requires: dracut
Requires: dracut-network
# Generated by `go-mods-to-bundled-provides.py | sort`
Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.9.0
Provides: bundled(golang(cloud.google.com/go/storage)) = 1.58.0
Provides: bundled(golang(cloud.google.com/go/storage/experimental)) = 1.58.0
Provides: bundled(golang(cloud.google.com/go/storage/internal)) = 1.58.0
Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2)) = 1.58.0
Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2/storagepb)) = 1.58.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/arn)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/defaults)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/middleware)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/eventstreamapi)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/protocol/xml)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/ratelimit)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/retry)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/signer/internal/v4)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/signer/v4)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/transport/http)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/credentials/ec2rolecreds)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/feature/ec2/imds)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/feature/ec2/imds/internal/config)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/feature/s3/manager)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/auth)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/auth/smithy)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/awsutil)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/configsources)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/context)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/endpoints)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/endpoints/awsrulesfn)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/endpoints/v2)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/middleware)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/rand)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/sdk)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/sdkio)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/strings)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/sync/singleflight)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/timeconv)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/v4a)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/v4a/internal/crypto)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/v4a/internal/v4)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/checksum)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/presigned-url)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/s3shared)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/s3shared/arn)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/s3shared/config)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/internal/arn)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/internal/endpoints)) = 1.41.0
Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/types)) = 1.41.0
Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/azidentity)) = 1.13.1
Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/azidentity/internal)) = 1.13.1
Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob)) = 1.6.3
Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/appendblob)) = 1.6.3
Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob)) = 1.6.3
Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/bloberror)) = 1.6.3
Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blockblob)) = 1.6.3
Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container)) = 1.6.3
Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/base)) = 1.6.3
Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/exported)) = 1.6.3
Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated)) = 1.6.3
Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/shared)) = 1.6.3
Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/pageblob)) = 1.6.3
Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/sas)) = 1.6.3
Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/service)) = 1.6.3
Provides: bundled(golang(github.com/beevik/etree)) = 1.6.0
Provides: bundled(golang(github.com/containers/libhvee/pkg/kvp)) = 0.10.0
Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.3.0
Provides: bundled(golang(cloud.google.com/go/storage)) = 1.43.0
Provides: bundled(golang(cloud.google.com/go/storage/internal)) = 1.43.0
Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2)) = 1.43.0
Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2/storagepb)) = 1.43.0
Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/arn)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/auth/bearer)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/processcreds)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ssocreds)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/csm)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/context)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/arn)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/s3err)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkmath)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/strings)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sync/singleflight)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/private/checksum)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/json/jsonutil)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/jsonrpc)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restjson)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/service/ssooidc)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso/ssoiface)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.55.5
Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts/stsiface)) = 1.55.5
Provides: bundled(golang(github.com/beevik/etree)) = 1.4.0
Provides: bundled(golang(github.com/containers/libhvee/pkg/kvp)) = 0.7.1
Provides: bundled(golang(github.com/coreos/go-semver/semver)) = 0.3.1
Provides: bundled(golang(github.com/coreos/go-systemd/v22/dbus)) = 22.6.0
Provides: bundled(golang(github.com/coreos/go-systemd/v22/journal)) = 22.6.0
Provides: bundled(golang(github.com/coreos/go-systemd/v22/unit)) = 22.6.0
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
Provides: bundled(golang(github.com/coreos/go-systemd/v22/unit)) = 22.5.0
Provides: bundled(golang(github.com/coreos/vcontext/json)) = 0.0.0-20230201181013.gitd72178a18687
Provides: bundled(golang(github.com/coreos/vcontext/path)) = 0.0.0-20230201181013.gitd72178a18687
Provides: bundled(golang(github.com/coreos/vcontext/report)) = 0.0.0-20230201181013.gitd72178a18687
Provides: bundled(golang(github.com/coreos/vcontext/tree)) = 0.0.0-20230201181013.gitd72178a18687
Provides: bundled(golang(github.com/coreos/vcontext/validate)) = 0.0.0-20230201181013.gitd72178a18687
Provides: bundled(golang(github.com/google/renameio/v2)) = 2.0.1
Provides: bundled(golang(github.com/google/renameio/v2)) = 2.0.0
Provides: bundled(golang(github.com/google/uuid)) = 1.6.0
Provides: bundled(golang(github.com/mdlayher/vsock)) = 1.2.1
Provides: bundled(golang(github.com/mitchellh/copystructure)) = 1.2.0
Provides: bundled(golang(github.com/pin/tftp)) = 2.1.0
Provides: bundled(golang(github.com/pin/tftp/netascii)) = 2.1.0
Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.10
Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.11.1
Provides: bundled(golang(github.com/stretchr/testify/assert/yaml)) = 1.11.1
Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.6-0.20210604193023.gitd5e0c0615ace
Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.9.0
Provides: bundled(golang(github.com/vincent-petithory/dataurl)) = 1.0.0
Provides: bundled(golang(github.com/vmware/vmw-guestinfo/bdoor)) = 0.0.0-20220317130741.git510905f0efa3
Provides: bundled(golang(github.com/vmware/vmw-guestinfo/message)) = 0.0.0-20220317130741.git510905f0efa3
Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcout)) = 0.0.0-20220317130741.git510905f0efa3
Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcvmx)) = 0.0.0-20220317130741.git510905f0efa3
Provides: bundled(golang(github.com/vmware/vmw-guestinfo/vmcheck)) = 0.0.0-20220317130741.git510905f0efa3
Provides: bundled(golang(golang.org/x/net/bpf)) = 0.48.0
Provides: bundled(golang(golang.org/x/net/http2)) = 0.48.0
Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.48.0
Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.48.0
Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.48.0
Provides: bundled(golang(golang.org/x/net/idna)) = 0.48.0
Provides: bundled(golang(golang.org/x/net/internal/httpcommon)) = 0.48.0
Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.48.0
Provides: bundled(golang(golang.org/x/net/trace)) = 0.48.0
Provides: bundled(golang(golang.org/x/oauth2)) = 0.34.0
Provides: bundled(golang(golang.org/x/oauth2/authhandler)) = 0.34.0
Provides: bundled(golang(golang.org/x/oauth2/google)) = 0.34.0
Provides: bundled(golang(golang.org/x/oauth2/google/externalaccount)) = 0.34.0
Provides: bundled(golang(golang.org/x/oauth2/google/internal/externalaccountauthorizeduser)) = 0.34.0
Provides: bundled(golang(golang.org/x/oauth2/google/internal/impersonate)) = 0.34.0
Provides: bundled(golang(golang.org/x/oauth2/google/internal/stsexchange)) = 0.34.0
Provides: bundled(golang(golang.org/x/oauth2/internal)) = 0.34.0
Provides: bundled(golang(golang.org/x/oauth2/jws)) = 0.34.0
Provides: bundled(golang(golang.org/x/oauth2/jwt)) = 0.34.0
Provides: bundled(golang(golang.org/x/sys/cpu)) = 0.39.0
Provides: bundled(golang(golang.org/x/sys/unix)) = 0.39.0
Provides: bundled(golang(golang.org/x/sys/windows)) = 0.39.0
Provides: bundled(golang(golang.org/x/sys/windows/registry)) = 0.39.0
Provides: bundled(golang(google.golang.org/api/googleapi)) = 0.257.0
Provides: bundled(golang(google.golang.org/api/googleapi/transport)) = 0.257.0
Provides: bundled(golang(google.golang.org/api/iamcredentials/v1)) = 0.257.0
Provides: bundled(golang(google.golang.org/api/internal)) = 0.257.0
Provides: bundled(golang(google.golang.org/api/internal/cert)) = 0.257.0
Provides: bundled(golang(google.golang.org/api/internal/gensupport)) = 0.257.0
Provides: bundled(golang(google.golang.org/api/internal/impersonate)) = 0.257.0
Provides: bundled(golang(google.golang.org/api/internal/third_party/uritemplates)) = 0.257.0
Provides: bundled(golang(google.golang.org/api/iterator)) = 0.257.0
Provides: bundled(golang(google.golang.org/api/option)) = 0.257.0
Provides: bundled(golang(google.golang.org/api/option/internaloption)) = 0.257.0
Provides: bundled(golang(google.golang.org/api/storage/v1)) = 0.257.0
Provides: bundled(golang(google.golang.org/api/transport)) = 0.257.0
Provides: bundled(golang(google.golang.org/api/transport/grpc)) = 0.257.0
Provides: bundled(golang(google.golang.org/api/transport/http)) = 0.257.0
Provides: bundled(golang(golang.org/x/net/bpf)) = 0.30.0
Provides: bundled(golang(golang.org/x/net/http2)) = 0.30.0
Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.30.0
Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.30.0
Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.30.0
Provides: bundled(golang(golang.org/x/net/idna)) = 0.30.0
Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.30.0
Provides: bundled(golang(golang.org/x/net/trace)) = 0.30.0
Provides: bundled(golang(golang.org/x/oauth2)) = 0.23.0
Provides: bundled(golang(golang.org/x/oauth2/authhandler)) = 0.23.0
Provides: bundled(golang(golang.org/x/oauth2/google)) = 0.23.0
Provides: bundled(golang(golang.org/x/oauth2/google/externalaccount)) = 0.23.0
Provides: bundled(golang(golang.org/x/oauth2/google/internal/externalaccountauthorizeduser)) = 0.23.0
Provides: bundled(golang(golang.org/x/oauth2/google/internal/impersonate)) = 0.23.0
Provides: bundled(golang(golang.org/x/oauth2/google/internal/stsexchange)) = 0.23.0
Provides: bundled(golang(golang.org/x/oauth2/internal)) = 0.23.0
Provides: bundled(golang(golang.org/x/oauth2/jws)) = 0.23.0
Provides: bundled(golang(golang.org/x/oauth2/jwt)) = 0.23.0
Provides: bundled(golang(golang.org/x/sys/cpu)) = 0.26.0
Provides: bundled(golang(golang.org/x/sys/unix)) = 0.26.0
Provides: bundled(golang(golang.org/x/sys/windows)) = 0.26.0
Provides: bundled(golang(google.golang.org/api/googleapi)) = 0.187.0
Provides: bundled(golang(google.golang.org/api/googleapi/transport)) = 0.187.0
Provides: bundled(golang(google.golang.org/api/iamcredentials/v1)) = 0.187.0
Provides: bundled(golang(google.golang.org/api/internal)) = 0.187.0
Provides: bundled(golang(google.golang.org/api/internal/cert)) = 0.187.0
Provides: bundled(golang(google.golang.org/api/internal/gensupport)) = 0.187.0
Provides: bundled(golang(google.golang.org/api/internal/impersonate)) = 0.187.0
Provides: bundled(golang(google.golang.org/api/internal/third_party/uritemplates)) = 0.187.0
Provides: bundled(golang(google.golang.org/api/iterator)) = 0.187.0
Provides: bundled(golang(google.golang.org/api/option)) = 0.187.0
Provides: bundled(golang(google.golang.org/api/option/internaloption)) = 0.187.0
Provides: bundled(golang(google.golang.org/api/storage/v1)) = 0.187.0
Provides: bundled(golang(google.golang.org/api/transport)) = 0.187.0
Provides: bundled(golang(google.golang.org/api/transport/grpc)) = 0.187.0
Provides: bundled(golang(google.golang.org/api/transport/http)) = 0.187.0
Provides: bundled(golang(google.golang.org/api/transport/http/internal/propagation)) = 0.187.0
Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1
%description
@ -236,16 +228,14 @@ License: Apache-2.0
This package contains dracut modules, services and binaries needed to enable
Ignition on IoT/Edge systems.
############## grub subpackage ##############
############## ignition-grub subpackage ##############
%package ignition-grub
%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
%description ignition-grub
This package contains the grub2 config which is compatable with bootupd.
%prep
@ -271,7 +261,7 @@ LDFLAGS+=' -compressdwarf=false '
export GOFLAGS="-mod=vendor"
echo "Building ignition..."
GOEXPERIMENT=strictfipsruntime %gobuild -o ./ignition internal/main.go
%gobuild -o ./ignition internal/main.go
echo "Building ignition-validate..."
%gobuild -o ./ignition-validate validate/main.go
@ -280,17 +270,17 @@ echo "Building ignition-validate..."
%if 0%{?fedora}
echo "Building statically-linked Linux ignition-validate..."
GOEXPERIMENT= CGO_ENABLED=0 GOARCH=arm64 GOOS=linux %gocrossbuild -o ./ignition-validate-aarch64-unknown-linux-gnu-static validate/main.go
GOEXPERIMENT= CGO_ENABLED=0 GOARCH=ppc64le GOOS=linux %gocrossbuild -o ./ignition-validate-ppc64le-unknown-linux-gnu-static validate/main.go
GOEXPERIMENT= CGO_ENABLED=0 GOARCH=s390x GOOS=linux %gocrossbuild -o ./ignition-validate-s390x-unknown-linux-gnu-static validate/main.go
GOEXPERIMENT= CGO_ENABLED=0 GOARCH=amd64 GOOS=linux %gocrossbuild -o ./ignition-validate-x86_64-unknown-linux-gnu-static validate/main.go
CGO_ENABLED=0 GOARCH=arm64 GOOS=linux %gocrossbuild -o ./ignition-validate-aarch64-unknown-linux-gnu-static validate/main.go
CGO_ENABLED=0 GOARCH=ppc64le GOOS=linux %gocrossbuild -o ./ignition-validate-ppc64le-unknown-linux-gnu-static validate/main.go
CGO_ENABLED=0 GOARCH=s390x GOOS=linux %gocrossbuild -o ./ignition-validate-s390x-unknown-linux-gnu-static validate/main.go
CGO_ENABLED=0 GOARCH=amd64 GOOS=linux %gocrossbuild -o ./ignition-validate-x86_64-unknown-linux-gnu-static validate/main.go
echo "Building macOS ignition-validate..."
GOEXPERIMENT= GOARCH=amd64 GOOS=darwin %gocrossbuild -o ./ignition-validate-x86_64-apple-darwin validate/main.go
GOEXPERIMENT= GOARCH=arm64 GOOS=darwin %gocrossbuild -o ./ignition-validate-aarch64-apple-darwin validate/main.go
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..."
GOEXPERIMENT= GOARCH=amd64 GOOS=windows %gocrossbuild -o ./ignition-validate-x86_64-pc-windows-gnu.exe validate/main.go
GOARCH=amd64 GOOS=windows %gocrossbuild -o ./ignition-validate-x86_64-pc-windows-gnu.exe validate/main.go
%endif
%install
@ -302,9 +292,9 @@ 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-grub
install -d -p %{buildroot}%{_libdir}/bootupd/grub2-static/configs.d
install -p -m 0644 grub2/ignition.cfg %{buildroot}%{_libdir}/bootupd/grub2-static/configs.d/
# ignition
install -d -p %{buildroot}%{_bindir}
@ -372,53 +362,12 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition
%{_libexecdir}/coreos-ignition-write-issues
%{_libexecdir}/coreos-check-ssh-keys
%files grub
%files ignition-grub
%doc README.md
%license %{golicenses}
%{_prefix}/lib/bootupd/grub2-static/configs.d/05_ignition.cfg
%{_libdir}/bootupd/grub2-static/configs.d/ignition.cfg
%changelog
* Fri Dec 12 2025 Steven Presti <spresti@redhat.com> - 2.25.0-1
- New Release
* Tue Oct 14 2025 Steven Presti <spresti@redhat.com> - 2.24.0-1
- New Release
* Fri Oct 10 2025 Alejandro Sáez <asm@redhat.com> - 2.23.0-3
- rebuild
* Wed Oct 01 2025 Steven Presti <spresti@redhat.com> - 2.23.0-2
- Build Ignition with GOEXPERIMENT=strictfipsruntime
- Ignition-validate non-FIPS
* Wed Sep 10 2025 Steven Presti <spresti@redhat.com> - 2.23.0-1
- New Release
* Fri Aug 15 2025 Maxwell G <maxwell@gtmx.me> - 2.22.0-5
- Rebuild for golang-1.25.0
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 2.22.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Wed Jul 16 2025 Tiago Bueno <tiago.bueno@gmail.com> - 2.22.0-3
- Fix rpminspect debug symbols failure
* Tue Jul 15 2025 Tiago Bueno <tiago.bueno@gmail.com> - 2.22.0-2
- Backport fix for OracleCloud do not wrap errors from FetchToBuffer
* Tue Jul 8 2025 Yasmin Valim <ydesouza@redhat.com> - 2.22.0-1
- New Release
* Wed Mar 19 2025 Steven Presti <spresti@redhat.com> - 2.21.0-2
- Rename ignition.cfg -> 05_ignition.cfg to mirror upstream
additionally backport rename.
- Rename ignition-ignition-grub subpackage to ignition-grub
- Update grub2 config to use the correct dir for bootupd static grub configs
https://github.com/coreos/ignition/pull/2037#issuecomment-2736300056
* Fri Mar 14 2025 Steven Presti <spresti@redhat.com> - 2.21.0-1
- New Release
* Mon Jan 27 2025 David Jachimowicz <djachimo@redhat.com> - 2.20.0-5
- Update ignition-edge commit to include https://github.com/fedora-iot/ignition-edge/pull/3

View file

@ -1,5 +0,0 @@
---
debuginfo:
ignore:
- /usr/share/ignition/ignition-validate-*-unknown-linux-gnu-static

View file

@ -1,2 +1,2 @@
SHA512 (ignition-2.25.1.tar.gz) = 8ca2bd96cdff8986e09371a9357975883c655dc6c16eb481ffd2772de37515fe64060ca575b3e4ac25a626b4701c65e5f5a8707ff62f37791f65ec321f7bb3a6
SHA512 (ignition-2.20.0.tar.gz) = 96429a9ad98a54bcc66c65c2b6be8def67371eb70e9df295d44fb5ffdc1915a524772214f39409a0872c52521fdad8e1e4c6f80e019413c77ca3491afe754584
SHA512 (ignition-edge-a258749.tar.gz) = 0566807f7f4cbf9715566c8c39ba699df00f4ee5d579269c695a4af13d75a4e1f4639b54be85d0703373221d67a3ad0c532c0e075831316e3eed7a33cf316833