From 84db7cb04c28c2ff27a6ceb5d61facaeb8a7d709 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Sat, 21 Jul 2018 14:09:11 -0400 Subject: [PATCH 001/172] forgot to bump release --- ignition.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index df4832e..0ba9f23 100644 --- a/ignition.spec +++ b/ignition.spec @@ -79,7 +79,7 @@ Name: ignition Version: 0.26.0 -Release: 0.5.git%{shortcommit}%{?dist} +Release: 0.6.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} From c77c54becf84a29d81d8ac265cbba0d0f1719c10 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 10 Aug 2018 10:22:59 -0400 Subject: [PATCH 002/172] New release ignition-0.27.0-1.gitcc7ebe0 Notably, we now enable the new SELinux relabeling support. --- .gitignore | 1 + ignition.spec | 14 +++++++++++--- notes.txt | 2 +- sources | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index ddf3a40..05cb119 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /ignition-7610725.tar.gz /ignition-dracut-d664657.tar.gz +/ignition-cc7ebe0.tar.gz diff --git a/ignition.spec b/ignition.spec index 0ba9f23..ee71209 100644 --- a/ignition.spec +++ b/ignition.spec @@ -55,7 +55,7 @@ # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 76107251acd117c6d3e5b4dae2b47f82f944984b +%global commit cc7ebe0b92d0fd4b6af2f67873e121894411a80d %global shortcommit %(c=%{commit}; echo ${c:0:7}) # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these @@ -78,8 +78,8 @@ Name: ignition -Version: 0.26.0 -Release: 0.6.git%{shortcommit}%{?dist} +Version: 0.27.0 +Release: 1.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} @@ -115,6 +115,7 @@ BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials) BuildRequires: golang(github.com/aws/aws-sdk-go/aws) BuildRequires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata) BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3) +BuildRequires: golang(github.com/pborman/uuid) %endif # Main package Provides (generated with parsedeps.go) @@ -191,6 +192,7 @@ BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) BuildRequires: golang(github.com/coreos/go-semver/semver) BuildRequires: golang(github.com/coreos/go-systemd/dbus) BuildRequires: golang(github.com/coreos/go-systemd/unit) +BuildRequires: golang(github.com/pborman/uuid) BuildRequires: golang(github.com/pin/tftp) BuildRequires: golang(github.com/sigma/vmw-guestinfo/rpcvmx) BuildRequires: golang(github.com/sigma/vmw-guestinfo/vmcheck) @@ -212,6 +214,7 @@ Requires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) Requires: golang(github.com/coreos/go-semver/semver) Requires: golang(github.com/coreos/go-systemd/dbus) Requires: golang(github.com/coreos/go-systemd/unit) +Requires: golang(github.com/pborman/uuid) Requires: golang(github.com/pin/tftp) Requires: golang(github.com/sigma/vmw-guestinfo/rpcvmx) Requires: golang(github.com/sigma/vmw-guestinfo/vmcheck) @@ -342,6 +345,8 @@ export GOPATH=$(pwd):%{gopath} export LDFLAGS=%{ldflags} # Tell ignition where to find chroot binary export LDFLAGS+=' -X github.com/coreos/ignition/internal/distro.chrootCmd=%{_sbindir}/chroot ' +# Enable SELinux relabeling +export LDFLAGS+=' -X github.com/coreos/ignition/internal/distro.selinuxRelabel=true ' echo "Building ignition..." %gobuild -o ./ignition %{import_path}/internal @@ -465,6 +470,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Aug 10 2018 Jonathan Lebon - 0.27.0-1.gitcc7ebe0 +- New release 0.27.0 + * Sat Jul 21 2018 Dusty Mabe - 0.26.0-0.6.git7610725 - Bump to ignition-dracut d664657 diff --git a/notes.txt b/notes.txt index e49b6f8..0786721 100644 --- a/notes.txt +++ b/notes.txt @@ -43,7 +43,7 @@ Spec file golang-github-coreos-ignition.spec at /home/vagrant/golang-github-core # build RPM -$ rpmbuild -ba kompose.spec +$ rpmbuild -ba ignition.spec # find a srpm in `$HOME/rpmbuild/SRPMS` # find a RPM in `$HOME/rpmbuild/RPM/arch/` diff --git a/sources b/sources index 17937f3..7a8aeeb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-7610725.tar.gz) = bd47f26cfc65641b63cb0846bbfd939e835fb477816effbbaff1df83a4146d4eef7d7d2f18a85e8caa386703cabcc4e54ebfd4768c590bbfc795dee6a3949519 +SHA512 (ignition-cc7ebe0.tar.gz) = 2dce1cdf24af9d26753adf80b014be82fd2cf94efe5321482cf3608d7c4fdd10c36d08b2ce8b82f3ad37528372fdef7c938c9ac1d5c173bc6b7430c5268f6c26 SHA512 (ignition-dracut-d664657.tar.gz) = 6ea895a4d85e9e1664e74d14828bf1a23bf6452e781d066ed36e1e874b55a3d39d6da36b676a99665ad1a3a205a17672a8e2904cabe2be876008eea2cb0b6518 From 6cb4a05cfc850a3c57d2f36910ea0ea59a120a4d Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Wed, 15 Aug 2018 17:01:22 -0400 Subject: [PATCH 003/172] add basic tests for ignition --- tests/tests.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 tests/tests.yml diff --git a/tests/tests.yml b/tests/tests.yml new file mode 100644 index 0000000..85a1d6f --- /dev/null +++ b/tests/tests.yml @@ -0,0 +1,18 @@ +- hosts: localhost + roles: + - role: standard-test-basic + tags: + - classic + required-packages: + - ignition + - ignition-dracut + tests: + - ignition-run-version: + dir: ./ + run: /usr/bin/ignition --version + - ignition-rpm-installed: + dir: ./ + run: /usr/bin/rpm -q ignition + - ignition-dracut-rpm-installed: + dir: ./ + run: /usr/bin/rpm -q ignition-dracut From 5597ff7efcd65d36628913eb504acae4c0672c61 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 15 Aug 2018 10:55:56 -0400 Subject: [PATCH 004/172] Backport patch for /root relabeling upstream: https://github.com/coreos/ignition/pull/613 --- ...ges-files-also-relabel-root-home-dir.patch | 28 +++++++++++++++++++ ignition.spec | 10 ++++++- 2 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 0001-stages-files-also-relabel-root-home-dir.patch diff --git a/0001-stages-files-also-relabel-root-home-dir.patch b/0001-stages-files-also-relabel-root-home-dir.patch new file mode 100644 index 0000000..61ebfe6 --- /dev/null +++ b/0001-stages-files-also-relabel-root-home-dir.patch @@ -0,0 +1,28 @@ +From bff783ab7995370b254b9b461060f573ed031a80 Mon Sep 17 00:00:00 2001 +From: Jonathan Lebon +Date: Tue, 14 Aug 2018 15:38:25 -0400 +Subject: [PATCH] stages/files: also relabel /root home dir + +For the same reasons that `/home` is in that list. The difference is +that the "root" user will always exist, but we might be touching and +creating files there. For example, we might be adding an +`.ssh/authorized_keys`, which will need to be relabeled. +--- + internal/exec/stages/files/passwd.go | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/internal/exec/stages/files/passwd.go b/internal/exec/stages/files/passwd.go +index df16559..2eecd40 100644 +--- a/internal/exec/stages/files/passwd.go ++++ b/internal/exec/stages/files/passwd.go +@@ -40,6 +40,7 @@ func (s *stage) createPasswd(config types.Config) error { + "/etc/gshadow*", + "/etc/.pwd.lock", + "/home", ++ "/root", + ) + } + +-- +2.17.1 + diff --git a/ignition.spec b/ignition.spec index ee71209..9ad599d 100644 --- a/ignition.spec +++ b/ignition.spec @@ -79,12 +79,14 @@ Name: ignition Version: 0.27.0 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +Patch0: 0001-stages-files-also-relabel-root-home-dir.patch + # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. @@ -327,6 +329,8 @@ initramfs on boot. # setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html # unpack source0 and apply patches %setup -T -b 0 -q -n %{repo}-%{commit} +%patch0 -p1 + # unpack source1 (dracut modules) %setup -T -D -a 1 -q -n %{repo}-%{commit} @@ -470,6 +474,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Wed Aug 15 2018 Jonathan Lebon - 0.27.0-2.gitcc7ebe0 +- Backport patch for /root relabeling + https://github.com/coreos/ignition/pull/613 + * Fri Aug 10 2018 Jonathan Lebon - 0.27.0-1.gitcc7ebe0 - New release 0.27.0 From d2ffbc197f19ce29299b04b2a9c28eb92fa0ee12 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Fri, 17 Aug 2018 13:27:58 -0400 Subject: [PATCH 005/172] Bump to ignition-dracut 56aa514 --- .gitignore | 1 + ignition.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 05cb119..d93d625 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /ignition-7610725.tar.gz /ignition-dracut-d664657.tar.gz /ignition-cc7ebe0.tar.gz +/ignition-dracut-56aa514.tar.gz diff --git a/ignition.spec b/ignition.spec index 9ad599d..69a4c76 100644 --- a/ignition.spec +++ b/ignition.spec @@ -73,13 +73,13 @@ # https://github.com/dustymabe/ignition-dracut %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit d664657cc2f733d8f54e9c0e69ba603babe55d92 +%global dracutcommit 56aa51440a5e234edfbfdfc8e7cb48cfbccea168 %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 0.27.0 -Release: 2.git%{shortcommit}%{?dist} +Release: 3.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} @@ -474,6 +474,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Aug 17 2018 Dusty Mabe - 0.27.0-3.gitcc7ebe0 +- Bump to ignition-dracut 56aa514 + * Wed Aug 15 2018 Jonathan Lebon - 0.27.0-2.gitcc7ebe0 - Backport patch for /root relabeling https://github.com/coreos/ignition/pull/613 diff --git a/sources b/sources index 7a8aeeb..0c73f90 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ignition-cc7ebe0.tar.gz) = 2dce1cdf24af9d26753adf80b014be82fd2cf94efe5321482cf3608d7c4fdd10c36d08b2ce8b82f3ad37528372fdef7c938c9ac1d5c173bc6b7430c5268f6c26 -SHA512 (ignition-dracut-d664657.tar.gz) = 6ea895a4d85e9e1664e74d14828bf1a23bf6452e781d066ed36e1e874b55a3d39d6da36b676a99665ad1a3a205a17672a8e2904cabe2be876008eea2cb0b6518 +SHA512 (ignition-dracut-56aa514.tar.gz) = 99d0ebd3f9ab515bb16b6e1eeec4b5b6a33ec4a48c116fa26eb5b7a6538e2b729b8e983df08b7068cb6b9c329da7a55b4ebd82142d4d12478e066ef4b7e9cebb From c14ed2407eec77b86bdabae75ccaff75e179ccbd Mon Sep 17 00:00:00 2001 From: Andrew Jeddeloh Date: Fri, 31 Aug 2018 15:37:54 -0700 Subject: [PATCH 006/172] New release Ignition-0.28.0 This contains mostly test fixes and a bug fix for 4k sector disks. Drop the patch for relabeling /root since that is now included in Ignition itself. Delete the dropped patch from the repo as well. Sort all %BuildRequires, %Provides etc lists of go packages. Update the ignition.spec.orig as well. --- .gitignore | 1 + ...ges-files-also-relabel-root-home-dir.patch | 28 ------ ignition.spec | 87 +++++++++---------- ignition.spec.orig | 40 ++++----- sources | 2 +- 5 files changed, 63 insertions(+), 95 deletions(-) delete mode 100644 0001-stages-files-also-relabel-root-home-dir.patch diff --git a/.gitignore b/.gitignore index d93d625..01d6339 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ /ignition-dracut-d664657.tar.gz /ignition-cc7ebe0.tar.gz /ignition-dracut-56aa514.tar.gz +/ignition-f707912.tar.gz diff --git a/0001-stages-files-also-relabel-root-home-dir.patch b/0001-stages-files-also-relabel-root-home-dir.patch deleted file mode 100644 index 61ebfe6..0000000 --- a/0001-stages-files-also-relabel-root-home-dir.patch +++ /dev/null @@ -1,28 +0,0 @@ -From bff783ab7995370b254b9b461060f573ed031a80 Mon Sep 17 00:00:00 2001 -From: Jonathan Lebon -Date: Tue, 14 Aug 2018 15:38:25 -0400 -Subject: [PATCH] stages/files: also relabel /root home dir - -For the same reasons that `/home` is in that list. The difference is -that the "root" user will always exist, but we might be touching and -creating files there. For example, we might be adding an -`.ssh/authorized_keys`, which will need to be relabeled. ---- - internal/exec/stages/files/passwd.go | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/internal/exec/stages/files/passwd.go b/internal/exec/stages/files/passwd.go -index df16559..2eecd40 100644 ---- a/internal/exec/stages/files/passwd.go -+++ b/internal/exec/stages/files/passwd.go -@@ -40,6 +40,7 @@ func (s *stage) createPasswd(config types.Config) error { - "/etc/gshadow*", - "/etc/.pwd.lock", - "/home", -+ "/root", - ) - } - --- -2.17.1 - diff --git a/ignition.spec b/ignition.spec index 69a4c76..2fa165d 100644 --- a/ignition.spec +++ b/ignition.spec @@ -47,7 +47,7 @@ %define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**}; %endif -# macros for ignition +# macros for Ignition %global provider github %global provider_tld com %global project coreos @@ -55,7 +55,7 @@ # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit cc7ebe0b92d0fd4b6af2f67873e121894411a80d +%global commit f7079129b8651ac51dba14c3af65692bb413c1dd %global shortcommit %(c=%{commit}; echo ${c:0:7}) # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these @@ -78,15 +78,13 @@ Name: ignition -Version: 0.27.0 -Release: 3.git%{shortcommit}%{?dist} +Version: 0.28.0 +Release: 1.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz -Patch0: 0001-stages-files-also-relabel-root-home-dir.patch - # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. @@ -99,55 +97,55 @@ BuildRequires: libblkid-devel %if ! 0%{?with_bundled} # validate/main.go BuildRequires: golang(github.com/spf13/cobra) -# Remaining dependencies not included in main packages -BuildRequires: golang(github.com/coreos/go-systemd/unit) -BuildRequires: golang(github.com/coreos/go-semver/semver) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds) -BuildRequires: golang(github.com/pin/tftp) -BuildRequires: golang(github.com/sigma/vmw-guestinfo/vmcheck) -BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) -BuildRequires: golang(github.com/sigma/vmw-guestinfo/rpcvmx) -BuildRequires: golang(github.com/coreos/go-systemd/dbus) +# Remaining dependencies not included in main packages (sorted) +BuildRequires: golang(github.com/ajeddeloh/go-json) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws) BuildRequires: golang(github.com/aws/aws-sdk-go/aws/awserr) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata) BuildRequires: golang(github.com/aws/aws-sdk-go/aws/session) +BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3) +BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) +BuildRequires: golang(github.com/coreos/go-semver/semver) +BuildRequires: golang(github.com/coreos/go-systemd/dbus) +BuildRequires: golang(github.com/coreos/go-systemd/unit) +BuildRequires: golang(github.com/pborman/uuid) +BuildRequires: golang(github.com/pin/tftp) +BuildRequires: golang(github.com/sigma/vmw-guestinfo/rpcvmx) +BuildRequires: golang(github.com/sigma/vmw-guestinfo/vmcheck) BuildRequires: golang(github.com/vincent-petithory/dataurl) BuildRequires: golang(github.com/vmware/vmw-ovflib) -BuildRequires: golang(github.com/ajeddeloh/go-json) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata) -BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3) -BuildRequires: golang(github.com/pborman/uuid) %endif -# Main package Provides (generated with parsedeps.go) +# Main package Provides (generated with parsedeps.go | sort) %if 0%{?with_bundled} -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 Provides: bundled(golang(github.com/coreos/go-semver/semver)) = %{version}-294930c1e79c64e7dbe360054274fdad492c8cf5 Provides: bundled(golang(github.com/coreos/go-systemd/dbus)) = %{version}-39ca1b05acc7ad1220e09f133283b8859a8b71ab @@ -181,7 +179,7 @@ BuildArch: noarch # devel subpackage BuildRequires %if 0%{?with_check} && ! 0%{?with_bundled} -# These buildrequires are only for our tests (check) +# These buildrequires are only for our tests (check) (sorted) BuildRequires: golang(github.com/ajeddeloh/go-json) BuildRequires: golang(github.com/aws/aws-sdk-go/aws) BuildRequires: golang(github.com/aws/aws-sdk-go/aws/awserr) @@ -203,7 +201,7 @@ BuildRequires: golang(github.com/vmware/vmw-ovflib) %endif # devel subpackage Requires. This is basically the source code from -# all of the libraries that ignition imports during build. +# all of the libraries that ignition imports during build. (sorted) Requires: golang(github.com/ajeddeloh/go-json) Requires: golang(github.com/aws/aws-sdk-go/aws) Requires: golang(github.com/aws/aws-sdk-go/aws/awserr) @@ -223,26 +221,25 @@ Requires: golang(github.com/sigma/vmw-guestinfo/vmcheck) Requires: golang(github.com/vincent-petithory/dataurl) Requires: golang(github.com/vmware/vmw-ovflib) -# devel subpackage Provides -Provides: golang(%{import_path}/config/shared) = %{version}-%{release} +# devel subpackage Provides (sorted) Provides: golang(%{import_path}/config/shared/errors) = %{version}-%{release} Provides: golang(%{import_path}/config/shared/validations) = %{version}-%{release} +Provides: golang(%{import_path}/config/shared) = %{version}-%{release} Provides: golang(%{import_path}/config/util) = %{version}-%{release} -Provides: golang(%{import_path}/config/v1) = %{version}-%{release} Provides: golang(%{import_path}/config/v1/types) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_0) = %{version}-%{release} +Provides: golang(%{import_path}/config/v1) = %{version}-%{release} Provides: golang(%{import_path}/config/v2_0/types) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_1) = %{version}-%{release} +Provides: golang(%{import_path}/config/v2_0) = %{version}-%{release} Provides: golang(%{import_path}/config/v2_1/types) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_2) = %{version}-%{release} +Provides: golang(%{import_path}/config/v2_1) = %{version}-%{release} Provides: golang(%{import_path}/config/v2_2/types) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_3_experimental) = %{version}-%{release} +Provides: golang(%{import_path}/config/v2_2) = %{version}-%{release} Provides: golang(%{import_path}/config/v2_3_experimental/types) = %{version}-%{release} -Provides: golang(%{import_path}/config/validate) = %{version}-%{release} +Provides: golang(%{import_path}/config/v2_3_experimental) = %{version}-%{release} Provides: golang(%{import_path}/config/validate/astjson) = %{version}-%{release} Provides: golang(%{import_path}/config/validate/astnode) = %{version}-%{release} Provides: golang(%{import_path}/config/validate/report) = %{version}-%{release} -Provides: golang(%{import_path}/tests) = %{version}-%{release} +Provides: golang(%{import_path}/config/validate) = %{version}-%{release} Provides: golang(%{import_path}/tests/negative/files) = %{version}-%{release} Provides: golang(%{import_path}/tests/negative/filesystems) = %{version}-%{release} Provides: golang(%{import_path}/tests/negative/general) = %{version}-%{release} @@ -265,6 +262,7 @@ Provides: golang(%{import_path}/tests/positive/timeouts) = %{version}-%{rel Provides: golang(%{import_path}/tests/register) = %{version}-%{release} Provides: golang(%{import_path}/tests/registry) = %{version}-%{release} Provides: golang(%{import_path}/tests/types) = %{version}-%{release} +Provides: golang(%{import_path}/tests) = %{version}-%{release} %description devel %{summary} @@ -329,7 +327,6 @@ initramfs on boot. # setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html # unpack source0 and apply patches %setup -T -b 0 -q -n %{repo}-%{commit} -%patch0 -p1 # unpack source1 (dracut modules) %setup -T -D -a 1 -q -n %{repo}-%{commit} @@ -455,25 +452,27 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %files %license LICENSE -%doc CONTRIBUTING.md code-of-conduct.md README.md doc/ +%doc README.md code-of-conduct.md CONTRIBUTING.md doc/ %{_bindir}/%{name} %{_bindir}/%{name}-validate - %if 0%{?with_devel} %files devel -f devel.file-list %license LICENSE -%doc CONTRIBUTING.md code-of-conduct.md README.md +%doc README.md code-of-conduct.md CONTRIBUTING.md %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} %endif %if 0%{?with_unit_test} && 0%{?with_devel} %files unit-test-devel -f unit-test-devel.file-list %license LICENSE -%doc CONTRIBUTING.md code-of-conduct.md README.md +%doc README.md code-of-conduct.md CONTRIBUTING.md %endif %changelog +* Thu Aug 30 2018 Andrew Jeddeloh - 0.28.0-3.gitf707912 +- New release 0.28.0 + * Fri Aug 17 2018 Dusty Mabe - 0.27.0-3.gitcc7ebe0 - Bump to ignition-dracut 56aa514 diff --git a/ignition.spec.orig b/ignition.spec.orig index 5b8cf97..aced5ef 100644 --- a/ignition.spec.orig +++ b/ignition.spec.orig @@ -1,13 +1,7 @@ -# Original spec file as generated by: -# gofed repo2spec --detect github.com/coreos/ignition --commit 76107251acd117c6d3e5b4dae2b47f82f944984b --with-extra --with-build -f -# With: -# gofed@8f62d8d2dea0a87ef60cad72f72e2d7558c0cb75 -# And: -# $ git submodule status -# 33207573a1875bc828da3f863e1de439d7af8166 third_party/cmdsignature (heads/master) -# 6bff7ae54535689e2ade3d0bd3d33d903a2190b9 third_party/gofed_infra (remotes/origin/WIP-37-g6bff7ae) -# 7e414c78930a81167dc2cd4d3e9adb79eeed38a6 third_party/gofed_resources (heads/master) -# ef6ec0e387f3b125308243898435774da6128a4c third_party/gofedlib (0.1.0a1-20-gef6ec0e) +# Original spec file as generated by: +# gofed repo2spec --detect github.com/coreos/ignition --commit f7079129b8651ac51dba14c3af65692bb413c1dd --with-extra --with-build -f +# With: +# gofed/gofed:v1.0.1 docker image # If any of the following macros should be set otherwise, @@ -52,7 +46,7 @@ # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 76107251acd117c6d3e5b4dae2b47f82f944984b +%global commit f7079129b8651ac51dba14c3af65692bb413c1dd %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: golang-%{provider}-%{project}-%{repo} @@ -75,23 +69,24 @@ BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: golang(github.com/spf13/cobra) # Remaining dependencies not included in main packages +BuildRequires: golang(github.com/vmware/vmw-ovflib) BuildRequires: golang(github.com/coreos/go-systemd/unit) BuildRequires: golang(github.com/coreos/go-semver/semver) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds) -BuildRequires: golang(github.com/pin/tftp) BuildRequires: golang(github.com/sigma/vmw-guestinfo/vmcheck) +BuildRequires: golang(github.com/pin/tftp) BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) BuildRequires: golang(github.com/sigma/vmw-guestinfo/rpcvmx) BuildRequires: golang(github.com/coreos/go-systemd/dbus) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/awserr) +BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3) BuildRequires: golang(github.com/aws/aws-sdk-go/aws/session) BuildRequires: golang(github.com/vincent-petithory/dataurl) -BuildRequires: golang(github.com/vmware/vmw-ovflib) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/awserr) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds) BuildRequires: golang(github.com/ajeddeloh/go-json) BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws) BuildRequires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata) -BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3) +BuildRequires: golang(github.com/pborman/uuid) +BuildRequires: golang(github.com/aws/aws-sdk-go/aws) %endif %description @@ -115,6 +110,7 @@ BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) BuildRequires: golang(github.com/coreos/go-semver/semver) BuildRequires: golang(github.com/coreos/go-systemd/dbus) BuildRequires: golang(github.com/coreos/go-systemd/unit) +BuildRequires: golang(github.com/pborman/uuid) BuildRequires: golang(github.com/pin/tftp) BuildRequires: golang(github.com/sigma/vmw-guestinfo/rpcvmx) BuildRequires: golang(github.com/sigma/vmw-guestinfo/vmcheck) @@ -134,6 +130,7 @@ Requires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) Requires: golang(github.com/coreos/go-semver/semver) Requires: golang(github.com/coreos/go-systemd/dbus) Requires: golang(github.com/coreos/go-systemd/unit) +Requires: golang(github.com/pborman/uuid) Requires: golang(github.com/pin/tftp) Requires: golang(github.com/sigma/vmw-guestinfo/rpcvmx) Requires: golang(github.com/sigma/vmw-guestinfo/vmcheck) @@ -325,7 +322,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %files %license LICENSE -%doc CONTRIBUTING.md code-of-conduct.md README.md +%doc README.md code-of-conduct.md CONTRIBUTING.md #%{_bindir}/internal #%{_bindir}/internal/util/tools/docs #%{_bindir}/tests/stubs/id-stub @@ -336,17 +333,16 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %if 0%{?with_devel} %files devel -f devel.file-list %license LICENSE -%doc CONTRIBUTING.md code-of-conduct.md README.md +%doc README.md code-of-conduct.md CONTRIBUTING.md %dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} %endif %if 0%{?with_unit_test} && 0%{?with_devel} %files unit-test-devel -f unit-test-devel.file-list %license LICENSE -%doc CONTRIBUTING.md code-of-conduct.md README.md +%doc README.md code-of-conduct.md CONTRIBUTING.md %endif -%changelog -* Thu Jun 21 2018 vagrant - 0-0.1.git7610725 +%changelog* Thu Aug 30 2018 root - 0-0.1.gitf707912 - First package for Fedora diff --git a/sources b/sources index 0c73f90..5e6ca5a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-cc7ebe0.tar.gz) = 2dce1cdf24af9d26753adf80b014be82fd2cf94efe5321482cf3608d7c4fdd10c36d08b2ce8b82f3ad37528372fdef7c938c9ac1d5c173bc6b7430c5268f6c26 +SHA512 (ignition-f707912.tar.gz) = a01d61415ae2e1f053ab7b17642a9377d77b51d34b9ca3e44a9e4c598c705b575b53620558eda69fcfa35131d9fe3ec3df3b9d4675c5b3aa5da3e205343d006b SHA512 (ignition-dracut-56aa514.tar.gz) = 99d0ebd3f9ab515bb16b6e1eeec4b5b6a33ec4a48c116fa26eb5b7a6538e2b729b8e983df08b7068cb6b9c329da7a55b4ebd82142d4d12478e066ef4b7e9cebb From baf7e10e472ceb629123e51b1924c03a0ab59287 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Wed, 5 Sep 2018 16:59:10 -0400 Subject: [PATCH 007/172] fixups for c14ed24 - match gofed call at top of .spec match .orig - fix release to -1 in changelog comment --- ignition.spec | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/ignition.spec b/ignition.spec index 2fa165d..ccca6d1 100644 --- a/ignition.spec +++ b/ignition.spec @@ -1,13 +1,7 @@ -# Original spec file as generated by: -# gofed repo2spec --detect github.com/coreos/ignition --commit 76107251acd117c6d3e5b4dae2b47f82f944984b --with-extra --with-build -f -# With: -# gofed@8f62d8d2dea0a87ef60cad72f72e2d7558c0cb75 -# And: -# $ git submodule status -# 33207573a1875bc828da3f863e1de439d7af8166 third_party/cmdsignature (heads/master) -# 6bff7ae54535689e2ade3d0bd3d33d903a2190b9 third_party/gofed_infra (remotes/origin/WIP-37-g6bff7ae) -# 7e414c78930a81167dc2cd4d3e9adb79eeed38a6 third_party/gofed_resources (heads/master) -# ef6ec0e387f3b125308243898435774da6128a4c third_party/gofedlib (0.1.0a1-20-gef6ec0e) +# Original spec file as generated by: +# gofed repo2spec --detect github.com/coreos/ignition --commit f7079129b8651ac51dba14c3af65692bb413c1dd --with-extra --with-build -f +# With: +# gofed/gofed:v1.0.1 docker image # If any of the following macros should be set otherwise, @@ -470,7 +464,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog -* Thu Aug 30 2018 Andrew Jeddeloh - 0.28.0-3.gitf707912 +* Thu Aug 30 2018 Andrew Jeddeloh - 0.28.0-1.gitf707912 - New release 0.28.0 * Fri Aug 17 2018 Dusty Mabe - 0.27.0-3.gitcc7ebe0 From 8c01d9272657fd943c4ff7838519f5befeb73f98 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Wed, 5 Sep 2018 16:57:34 -0400 Subject: [PATCH 008/172] Bump to ignition-dracut d056287 * 3f41219 dracut/ignition: remove CL-legacy udev references * 92ef9dd coreos-firstboot-complete: RemainAfterExit=yes --- .gitignore | 1 + ignition.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 01d6339..99dad65 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ /ignition-cc7ebe0.tar.gz /ignition-dracut-56aa514.tar.gz /ignition-f707912.tar.gz +/ignition-dracut-d056287.tar.gz diff --git a/ignition.spec b/ignition.spec index ccca6d1..2473f50 100644 --- a/ignition.spec +++ b/ignition.spec @@ -67,13 +67,13 @@ # https://github.com/dustymabe/ignition-dracut %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit 56aa51440a5e234edfbfdfc8e7cb48cfbccea168 +%global dracutcommit d056287951bd6823d6c087a81b63c9eb271ab240 %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 0.28.0 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} @@ -464,6 +464,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Thu Aug 30 2018 Dusty Mabe - 0.28.0-2.gitf707912 +- Bump to ignition-dracut d056287 +- * 3f41219 dracut/ignition: remove CL-legacy udev references +- * 92ef9dd coreos-firstboot-complete: RemainAfterExit=yes + * Thu Aug 30 2018 Andrew Jeddeloh - 0.28.0-1.gitf707912 - New release 0.28.0 diff --git a/sources b/sources index 5e6ca5a..aea1a98 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ignition-f707912.tar.gz) = a01d61415ae2e1f053ab7b17642a9377d77b51d34b9ca3e44a9e4c598c705b575b53620558eda69fcfa35131d9fe3ec3df3b9d4675c5b3aa5da3e205343d006b -SHA512 (ignition-dracut-56aa514.tar.gz) = 99d0ebd3f9ab515bb16b6e1eeec4b5b6a33ec4a48c116fa26eb5b7a6538e2b729b8e983df08b7068cb6b9c329da7a55b4ebd82142d4d12478e066ef4b7e9cebb +SHA512 (ignition-dracut-d056287.tar.gz) = be63f16fd4f12e5942e6116776b96fd916ebb16d5bca4842d7cb380a4e5cdc54164180cc105fee4f71b9293a5bbb564364f63e5604b9aa902ff762e4d250f126 From 89e03c4b515e5a6d00f9e5ff9ee6a712c6c090bb Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 6 Sep 2018 08:55:06 +0000 Subject: [PATCH 009/172] ignition/spec: add requires for disks stage This adds dependencies for binaries that can be invoked by ignition disks stage. --- ignition.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index 2473f50..6182028 100644 --- a/ignition.spec +++ b/ignition.spec @@ -73,7 +73,7 @@ Name: ignition Version: 0.28.0 -Release: 2.git%{shortcommit}%{?dist} +Release: 3.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} @@ -87,6 +87,11 @@ BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} # add non golang BuildRequires that weren't detected BuildRequires: libblkid-devel +# Requires for 'disks' stage +Requires: btrfs-progs +Requires: dosfstools +Requires: gdisk + # Main rpm package BuildRequires %if ! 0%{?with_bundled} # validate/main.go @@ -464,6 +469,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Thu Sep 06 2018 Luca Bruno - 0.28.0-3.gitf707912 +- Add requires for disks stage + * Thu Aug 30 2018 Dusty Mabe - 0.28.0-2.gitf707912 - Bump to ignition-dracut d056287 - * 3f41219 dracut/ignition: remove CL-legacy udev references From 623734c384aaa1d50c26d3b55b75c983b06684ce Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Mon, 17 Sep 2018 14:31:45 -0400 Subject: [PATCH 010/172] Backport patch for relabeling /var/home on FCOS Ref: https://github.com/coreos/fedora-coreos-config/issues/2 --- ...es-relabel-var-home-and-var-roothome.patch | 50 +++++++++++++++++++ ignition.spec | 9 +++- 2 files changed, 58 insertions(+), 1 deletion(-) create mode 100644 0001-stages-files-relabel-var-home-and-var-roothome.patch diff --git a/0001-stages-files-relabel-var-home-and-var-roothome.patch b/0001-stages-files-relabel-var-home-and-var-roothome.patch new file mode 100644 index 0000000..196b15e --- /dev/null +++ b/0001-stages-files-relabel-var-home-and-var-roothome.patch @@ -0,0 +1,50 @@ +From 45b75181389d2bc357de524dc32ede787222dedc Mon Sep 17 00:00:00 2001 +From: Jonathan Lebon +Date: Fri, 14 Sep 2018 15:27:37 -0400 +Subject: [PATCH] stages/files: relabel /var/home and /var/roothome + +The behaviour of how `restorecon` handles symlinks changed between RHCOS +and FCOS. More specifically, `restorecon` will follow symlinks that are +part of a given path, but not if the target path is a symlink itself. +On OSTree-based systems, `/home` and `/root` are just symlinks, so the +newer `restorecon` wasn't actually relabeling anything under there. + +Add the real paths to the list of dirs to relabel and add `-i` so that +it's not a fatal error on non-OSTree-based systems. + +Closes: coreos/fedora-coreos-config#2 +--- + internal/exec/stages/files/files.go | 2 +- + internal/exec/stages/files/passwd.go | 3 +++ + 2 files changed, 4 insertions(+), 1 deletion(-) + +diff --git a/internal/exec/stages/files/files.go b/internal/exec/stages/files/files.go +index 077d383..609a0e8 100644 +--- a/internal/exec/stages/files/files.go ++++ b/internal/exec/stages/files/files.go +@@ -146,7 +146,7 @@ OnFailureJobMode=replace-irreversibly + + [Service] + Type=oneshot +-ExecStart=` + distro.RestoreconCmd() + ` -0vRf /etc/selinux/ignition.relabel ++ExecStart=` + distro.RestoreconCmd() + ` -0vRif /etc/selinux/ignition.relabel + ExecStart=/usr/bin/rm /etc/selinux/ignition.relabel + RemainAfterExit=yes`, + } +diff --git a/internal/exec/stages/files/passwd.go b/internal/exec/stages/files/passwd.go +index 2eecd40..1ae0f02 100644 +--- a/internal/exec/stages/files/passwd.go ++++ b/internal/exec/stages/files/passwd.go +@@ -41,6 +41,9 @@ func (s *stage) createPasswd(config types.Config) error { + "/etc/.pwd.lock", + "/home", + "/root", ++ // for OSTree-based systems (newer restorecon doesn't follow symlinks) ++ "/var/home", ++ "/var/roothome", + ) + } + +-- +2.19.0 + diff --git a/ignition.spec b/ignition.spec index 6182028..ef9b72d 100644 --- a/ignition.spec +++ b/ignition.spec @@ -73,12 +73,14 @@ Name: ignition Version: 0.28.0 -Release: 3.git%{shortcommit}%{?dist} +Release: 4.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +Patch0: 0001-stages-files-relabel-var-home-and-var-roothome.patch + # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. @@ -326,6 +328,7 @@ initramfs on boot. # setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html # unpack source0 and apply patches %setup -T -b 0 -q -n %{repo}-%{commit} +%patch0 -p1 # unpack source1 (dracut modules) %setup -T -D -a 1 -q -n %{repo}-%{commit} @@ -469,6 +472,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Mon Sep 17 2018 Jonathan Lebon - 0.28.0-4.gitf707912 +- Backport patch for relabeling /var/home on FCOS + https://github.com/coreos/fedora-coreos-config/issues/2 + * Thu Sep 06 2018 Luca Bruno - 0.28.0-3.gitf707912 - Add requires for disks stage From 1ba750e8dfdc20f8d163f31547975368396d60fb Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 24 Sep 2018 13:54:23 -0400 Subject: [PATCH 011/172] Only require btrfs-progs on Fedora Other distributions may choose not to ship it. --- ignition.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ignition.spec b/ignition.spec index ef9b72d..64b2aa8 100644 --- a/ignition.spec +++ b/ignition.spec @@ -90,7 +90,9 @@ BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} BuildRequires: libblkid-devel # Requires for 'disks' stage +%if 0%{?fedora} Requires: btrfs-progs +%endif Requires: dosfstools Requires: gdisk From 8a2fd45726bcb394f99783fe48f085aff043841e Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Mon, 24 Sep 2018 15:03:33 -0400 Subject: [PATCH 012/172] Bump to ignition-dracut 8c85eb3 * 26f2396 journal: Don't log to console AND kmsg --- .gitignore | 1 + ignition.spec | 9 +++++++-- sources | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 99dad65..771223e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ /ignition-dracut-56aa514.tar.gz /ignition-f707912.tar.gz /ignition-dracut-d056287.tar.gz +/ignition-dracut-8c85eb3.tar.gz diff --git a/ignition.spec b/ignition.spec index 64b2aa8..362e283 100644 --- a/ignition.spec +++ b/ignition.spec @@ -67,13 +67,13 @@ # https://github.com/dustymabe/ignition-dracut %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit d056287951bd6823d6c087a81b63c9eb271ab240 +%global dracutcommit 8c85eb38bdce5014e3f608563c99176216b4bed5 %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 0.28.0 -Release: 4.git%{shortcommit}%{?dist} +Release: 5.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} @@ -474,6 +474,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Mon Sep 24 2018 Dusty Mabe - 0.28.0-5.gitf707912 +- Remove requires for btrfs on !fedora +- Bump to ignition-dracut 8c85eb3 +- * 26f2396 journal: Don't log to console AND kmsg + * Mon Sep 17 2018 Jonathan Lebon - 0.28.0-4.gitf707912 - Backport patch for relabeling /var/home on FCOS https://github.com/coreos/fedora-coreos-config/issues/2 diff --git a/sources b/sources index aea1a98..d391528 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ignition-f707912.tar.gz) = a01d61415ae2e1f053ab7b17642a9377d77b51d34b9ca3e44a9e4c598c705b575b53620558eda69fcfa35131d9fe3ec3df3b9d4675c5b3aa5da3e205343d006b -SHA512 (ignition-dracut-d056287.tar.gz) = be63f16fd4f12e5942e6116776b96fd916ebb16d5bca4842d7cb380a4e5cdc54164180cc105fee4f71b9293a5bbb564364f63e5604b9aa902ff762e4d250f126 +SHA512 (ignition-dracut-8c85eb3.tar.gz) = 3bf633365ee91eb60b9c02df4e3c367c1dc9c91d370d01813acc37f5d101cb29e90b63753abc761ea81ddf67cbd2517784df666d8353004ec813882a48ed2045 From 42544b245ff18d176185d58a2f56d206058e4f01 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Wed, 26 Sep 2018 10:44:51 -0400 Subject: [PATCH 013/172] Bump to ignition-dracut c09ce6f * ce9f648 30ignition: add support for ignition-disks --- .gitignore | 1 + ignition.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 771223e..7c10515 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /ignition-f707912.tar.gz /ignition-dracut-d056287.tar.gz /ignition-dracut-8c85eb3.tar.gz +/ignition-dracut-c09ce6f.tar.gz diff --git a/ignition.spec b/ignition.spec index 362e283..e941f0a 100644 --- a/ignition.spec +++ b/ignition.spec @@ -67,13 +67,13 @@ # https://github.com/dustymabe/ignition-dracut %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit 8c85eb38bdce5014e3f608563c99176216b4bed5 +%global dracutcommit c09ce6f72313bb69f42951244f915e8852ee80a5 %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 0.28.0 -Release: 5.git%{shortcommit}%{?dist} +Release: 6.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} @@ -474,6 +474,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Wed Sep 26 2018 Dusty Mabe - 0.28.0-6.gitf707912 +- Bump to ignition-dracut c09ce6f +- * ce9f648 30ignition: add support for ignition-disks + * Mon Sep 24 2018 Dusty Mabe - 0.28.0-5.gitf707912 - Remove requires for btrfs on !fedora - Bump to ignition-dracut 8c85eb3 diff --git a/sources b/sources index d391528..3f76160 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ignition-f707912.tar.gz) = a01d61415ae2e1f053ab7b17642a9377d77b51d34b9ca3e44a9e4c598c705b575b53620558eda69fcfa35131d9fe3ec3df3b9d4675c5b3aa5da3e205343d006b -SHA512 (ignition-dracut-8c85eb3.tar.gz) = 3bf633365ee91eb60b9c02df4e3c367c1dc9c91d370d01813acc37f5d101cb29e90b63753abc761ea81ddf67cbd2517784df666d8353004ec813882a48ed2045 +SHA512 (ignition-dracut-c09ce6f.tar.gz) = b852d27eedb23fe12b0f8d5e8f3f1a2f61489687e06050f9c353826e34250cf77de1880012a01d2f350e308296a1d0b9bdb92ea87476ab9f00a841aa04e1bbac From 0d1e132c3e67221fb176511211861f7e8b238f26 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 10 Oct 2018 15:45:17 -0400 Subject: [PATCH 014/172] Backport patch for sysctl.d handling This was required before by just https://github.com/coreos/coreos-assembler/pull/128 which could wait. But now this showed up in the machine-config-operator as well: https://github.com/openshift/machine-config-operator/pull/123 So let's just backport it now to make sure the new installer doesn't get bitten by this. --- ...-relabel-files-before-systemd-sysctl.patch | 35 +++++++++++++++++++ ignition.spec | 9 ++++- 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 0001-stages-files-relabel-files-before-systemd-sysctl.patch diff --git a/0001-stages-files-relabel-files-before-systemd-sysctl.patch b/0001-stages-files-relabel-files-before-systemd-sysctl.patch new file mode 100644 index 0000000..7f9081d --- /dev/null +++ b/0001-stages-files-relabel-files-before-systemd-sysctl.patch @@ -0,0 +1,35 @@ +From bab77f2fa4ecbc1d0428dd6e8a54d34848d78fd1 Mon Sep 17 00:00:00 2001 +From: Jonathan Lebon +Date: Thu, 27 Sep 2018 16:40:24 -0400 +Subject: [PATCH] stages/files: relabel files before systemd-sysctl + +This is a workaround for an inherent issue with the current relabeling +approach (see #635). `systemd-sysctl.service` is definitely one of those +early services that have a high probability of reading files from `/etc` +before it's relabeled. + +They're both pulled in by `sysinit.target`, but +`ignition-relabel.service` has an additional `After=local-fs.target` +which makes it likelier to run later (also see #635 about that). So for +now, let's just hack around this by making sure `systemd-sysctl` runs +after us. +--- + internal/exec/stages/files/files.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/internal/exec/stages/files/files.go b/internal/exec/stages/files/files.go +index 609a0e8..24676bc 100644 +--- a/internal/exec/stages/files/files.go ++++ b/internal/exec/stages/files/files.go +@@ -138,7 +138,7 @@ func (s *stage) addRelabelUnit(config types.Config) error { + Description=Relabel files created by Ignition + DefaultDependencies=no + After=local-fs.target +-Before=sysinit.target ++Before=sysinit.target systemd-sysctl.service + ConditionSecurity=selinux + ConditionPathExists=/etc/selinux/ignition.relabel + OnFailure=emergency.target +-- +2.17.1 + diff --git a/ignition.spec b/ignition.spec index e941f0a..e825a54 100644 --- a/ignition.spec +++ b/ignition.spec @@ -73,13 +73,14 @@ Name: ignition Version: 0.28.0 -Release: 6.git%{shortcommit}%{?dist} +Release: 7.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz Patch0: 0001-stages-files-relabel-var-home-and-var-roothome.patch +Patch1: 0001-stages-files-relabel-files-before-systemd-sysctl.patch # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} @@ -331,6 +332,7 @@ initramfs on boot. # unpack source0 and apply patches %setup -T -b 0 -q -n %{repo}-%{commit} %patch0 -p1 +%patch1 -p1 # unpack source1 (dracut modules) %setup -T -D -a 1 -q -n %{repo}-%{commit} @@ -474,6 +476,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Wed Oct 10 2018 Jonathan Lebon - 0.28.0-7.gitf707912 +- Backport patch for handling sysctl files correctly + https://github.com/coreos/coreos-assembler/pull/128 + https://github.com/openshift/machine-config-operator/pull/123 + * Wed Sep 26 2018 Dusty Mabe - 0.28.0-6.gitf707912 - Bump to ignition-dracut c09ce6f - * ce9f648 30ignition: add support for ignition-disks From c1c1198ead974979832cf368d1ae920da721faa2 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Mon, 15 Oct 2018 10:07:09 -0400 Subject: [PATCH 015/172] Bump to ignition-dracut 4bdfb34 * 6d0763a module-setup: Make mkfs.btrfs optional --- .gitignore | 1 + ignition.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7c10515..7de2693 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /ignition-dracut-d056287.tar.gz /ignition-dracut-8c85eb3.tar.gz /ignition-dracut-c09ce6f.tar.gz +/ignition-dracut-4bdfb34.tar.gz diff --git a/ignition.spec b/ignition.spec index e825a54..eea8004 100644 --- a/ignition.spec +++ b/ignition.spec @@ -67,13 +67,13 @@ # https://github.com/dustymabe/ignition-dracut %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit c09ce6f72313bb69f42951244f915e8852ee80a5 +%global dracutcommit 4bdfb342181c3d746c1bb47fc613f9967a8a24a8 %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 0.28.0 -Release: 7.git%{shortcommit}%{?dist} +Release: 8.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} @@ -476,6 +476,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Mon Oct 15 2018 Dusty Mabe - 0.28.0-8.gitf707912 +- Bump to ignition-dracut 4bdfb34 +- * 6d0763a module-setup: Make mkfs.btrfs optional + * Wed Oct 10 2018 Jonathan Lebon - 0.28.0-7.gitf707912 - Backport patch for handling sysctl files correctly https://github.com/coreos/coreos-assembler/pull/128 diff --git a/sources b/sources index 3f76160..420dcd1 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ignition-f707912.tar.gz) = a01d61415ae2e1f053ab7b17642a9377d77b51d34b9ca3e44a9e4c598c705b575b53620558eda69fcfa35131d9fe3ec3df3b9d4675c5b3aa5da3e205343d006b -SHA512 (ignition-dracut-c09ce6f.tar.gz) = b852d27eedb23fe12b0f8d5e8f3f1a2f61489687e06050f9c353826e34250cf77de1880012a01d2f350e308296a1d0b9bdb92ea87476ab9f00a841aa04e1bbac +SHA512 (ignition-dracut-4bdfb34.tar.gz) = 7c0f55ceb34cfbad254dc2c5decb7f52dbcb11ee0c7d4503632b46e5c1b7e69cdafc77a27db6785842e8313236b63d665b0a93a71c503e8bf0d2cb5f29b4be22 From 6fc7632a89aa7556705e258399c6b4f6134968b0 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Thu, 25 Oct 2018 10:14:18 -0400 Subject: [PATCH 016/172] Bump to ignition-dracut 7ee64ca * 3ec0b39 remove ignition-remount-sysroot.service files * 66335f2 ignition: run files stage at original CL ordering * 0301a03 ignition-disks.service: drop Requires=network.target * a0bc135 ignition-ask-var-mount.service: use RemainAfterExit=yes * ecf5779 module-setup.sh: explicitly install qemu_fw_cfg --- .gitignore | 1 + ignition.spec | 12 ++++++++++-- sources | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 7de2693..600fdab 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ /ignition-dracut-8c85eb3.tar.gz /ignition-dracut-c09ce6f.tar.gz /ignition-dracut-4bdfb34.tar.gz +/ignition-dracut-7ee64ca.tar.gz diff --git a/ignition.spec b/ignition.spec index eea8004..71cd9bf 100644 --- a/ignition.spec +++ b/ignition.spec @@ -67,13 +67,13 @@ # https://github.com/dustymabe/ignition-dracut %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit 4bdfb342181c3d746c1bb47fc613f9967a8a24a8 +%global dracutcommit 7ee64ca0b54f9504fb319c6a1ddf673dde957713 %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 0.28.0 -Release: 8.git%{shortcommit}%{?dist} +Release: 9.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} @@ -476,6 +476,14 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Thu Oct 25 2018 Dusty Mabe - 0.28.0-9.gitf707912 +- Bump to ignition-dracut 7ee64ca +- * 3ec0b39 remove ignition-remount-sysroot.service files + * 66335f2 ignition: run files stage at original CL ordering + * 0301a03 ignition-disks.service: drop Requires=network.target + * a0bc135 ignition-ask-var-mount.service: use RemainAfterExit=yes + * ecf5779 module-setup.sh: explicitly install qemu_fw_cfg + * Mon Oct 15 2018 Dusty Mabe - 0.28.0-8.gitf707912 - Bump to ignition-dracut 4bdfb34 - * 6d0763a module-setup: Make mkfs.btrfs optional diff --git a/sources b/sources index 420dcd1..0a2cbe8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ignition-f707912.tar.gz) = a01d61415ae2e1f053ab7b17642a9377d77b51d34b9ca3e44a9e4c598c705b575b53620558eda69fcfa35131d9fe3ec3df3b9d4675c5b3aa5da3e205343d006b -SHA512 (ignition-dracut-4bdfb34.tar.gz) = 7c0f55ceb34cfbad254dc2c5decb7f52dbcb11ee0c7d4503632b46e5c1b7e69cdafc77a27db6785842e8313236b63d665b0a93a71c503e8bf0d2cb5f29b4be22 +SHA512 (ignition-dracut-7ee64ca.tar.gz) = 2a01840cacf9ea63cf8db153c2cd121434dd41907274a9e476086af52ce38b16ac4b45057b509011b43dd1104f94d04777f605e51163d4385f3baec8a88a622c From a0c94134f832d85da31a07b4c8ec59c79d45e1bd Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Thu, 25 Oct 2018 18:00:24 -0400 Subject: [PATCH 017/172] Bump to ignition-dracut decf63f * 03d8438 30ignition: only instmods if module available --- .gitignore | 1 + ignition.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 600fdab..958725e 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /ignition-dracut-c09ce6f.tar.gz /ignition-dracut-4bdfb34.tar.gz /ignition-dracut-7ee64ca.tar.gz +/ignition-dracut-decf63f.tar.gz diff --git a/ignition.spec b/ignition.spec index 71cd9bf..1dc210a 100644 --- a/ignition.spec +++ b/ignition.spec @@ -67,13 +67,13 @@ # https://github.com/dustymabe/ignition-dracut %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit 7ee64ca0b54f9504fb319c6a1ddf673dde957713 +%global dracutcommit decf63fb4e0d0a17485ed930984d1d97ebc0bb0b %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 0.28.0 -Release: 9.git%{shortcommit}%{?dist} +Release: 10.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} @@ -476,6 +476,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Thu Oct 25 2018 Dusty Mabe - 0.28.0-10.gitf707912 +- Bump to ignition-dracut decf63f +- * 03d8438 30ignition: only instmods if module available + * Thu Oct 25 2018 Dusty Mabe - 0.28.0-9.gitf707912 - Bump to ignition-dracut 7ee64ca - * 3ec0b39 remove ignition-remount-sysroot.service files diff --git a/sources b/sources index 0a2cbe8..94eda79 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ignition-f707912.tar.gz) = a01d61415ae2e1f053ab7b17642a9377d77b51d34b9ca3e44a9e4c598c705b575b53620558eda69fcfa35131d9fe3ec3df3b9d4675c5b3aa5da3e205343d006b -SHA512 (ignition-dracut-7ee64ca.tar.gz) = 2a01840cacf9ea63cf8db153c2cd121434dd41907274a9e476086af52ce38b16ac4b45057b509011b43dd1104f94d04777f605e51163d4385f3baec8a88a622c +SHA512 (ignition-dracut-decf63f.tar.gz) = 4aa08112ce0367a2410cca981e08d47f71cd44da9955ec089d3c3ccb153a6c9378fe2d95ed82a36658011e13a559851b87090101d0e09549963fb6c511b99034 From 78722da2a898733c4e84376209175a4ff09470b3 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Tue, 20 Nov 2018 14:58:31 -0500 Subject: [PATCH 018/172] Bump to ignition-dracut 7b83454 --- .gitignore | 1 + ignition.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 958725e..860f118 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ /ignition-dracut-4bdfb34.tar.gz /ignition-dracut-7ee64ca.tar.gz /ignition-dracut-decf63f.tar.gz +/ignition-dracut-7b83454.tar.gz diff --git a/ignition.spec b/ignition.spec index 1dc210a..2bb5d71 100644 --- a/ignition.spec +++ b/ignition.spec @@ -62,18 +62,18 @@ %global dracutlibdir %{_prefix}/lib/dracut %global dracutprovider github %global dracutprovider_tld com -%global dracutproject dustymabe +%global dracutproject coreos %global dracutrepo ignition-dracut -# https://github.com/dustymabe/ignition-dracut +# https://github.com/coreos/ignition-dracut %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit decf63fb4e0d0a17485ed930984d1d97ebc0bb0b +%global dracutcommit 7b83454d48ca5f73d82dbd21d0a03fff7974ca0b %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 0.28.0 -Release: 10.git%{shortcommit}%{?dist} +Release: 11.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} @@ -476,6 +476,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Tue Nov 20 2018 Jonathan Lebon - 0.28.0-11.git7b83454 +- Bump to ignition-dracut 7b83454 + * Thu Oct 25 2018 Dusty Mabe - 0.28.0-10.gitf707912 - Bump to ignition-dracut decf63f - * 03d8438 30ignition: only instmods if module available diff --git a/sources b/sources index 94eda79..8ffc6a4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ignition-f707912.tar.gz) = a01d61415ae2e1f053ab7b17642a9377d77b51d34b9ca3e44a9e4c598c705b575b53620558eda69fcfa35131d9fe3ec3df3b9d4675c5b3aa5da3e205343d006b -SHA512 (ignition-dracut-decf63f.tar.gz) = 4aa08112ce0367a2410cca981e08d47f71cd44da9955ec089d3c3ccb153a6c9378fe2d95ed82a36658011e13a559851b87090101d0e09549963fb6c511b99034 +SHA512 (ignition-dracut-7b83454.tar.gz) = 8a523998efa1f55de77a7d4fb6a7fa060ebd3632d81e46fba1384fa8645934ae45044d524f25e724d56fe5dbf24424327e1d0bdc8d46c6e95793e92fbbe221f3 From 603981e76a7529f545b7acd6fec22cd994b7f975 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Wed, 21 Nov 2018 17:16:17 +0100 Subject: [PATCH 019/172] Rebuild for protobuf 3.6 Signed-off-by: Igor Gnatenko --- ignition.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index 2bb5d71..fc91877 100644 --- a/ignition.spec +++ b/ignition.spec @@ -73,7 +73,7 @@ Name: ignition Version: 0.28.0 -Release: 11.git%{shortcommit}%{?dist} +Release: 12.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} @@ -476,6 +476,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Wed Nov 21 2018 Igor Gnatenko - 0.28.0-12.gitf707912 +- Rebuild for protobuf 3.6 + * Tue Nov 20 2018 Jonathan Lebon - 0.28.0-11.git7b83454 - Bump to ignition-dracut 7b83454 From 6cf1223812c68fc2e5375a106ca2aa4959ed72e6 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Wed, 21 Nov 2018 21:38:03 -0500 Subject: [PATCH 020/172] clarify that protobuf 3.6 is only for f30 Since I'd like to keep common git history among all of our branches (it makes things easier) I'm going to push the latest changes to all branches. I clarified the changelog message to indicate the protobuf 3.6 change was only for rawhide/f30. --- ignition.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index fc91877..1d6ba00 100644 --- a/ignition.spec +++ b/ignition.spec @@ -477,7 +477,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %changelog * Wed Nov 21 2018 Igor Gnatenko - 0.28.0-12.gitf707912 -- Rebuild for protobuf 3.6 +- Rebuild for protobuf 3.6 in rawhide (f30) * Tue Nov 20 2018 Jonathan Lebon - 0.28.0-11.git7b83454 - Bump to ignition-dracut 7b83454 From 56617235ec9638bda496449d46a4172854eaf9e8 Mon Sep 17 00:00:00 2001 From: Andrew Jeddeloh Date: Tue, 11 Dec 2018 10:34:31 -0800 Subject: [PATCH 021/172] Bump to Ignition 0.29.1 --- .gitignore | 1 + ...-relabel-files-before-systemd-sysctl.patch | 35 ------------- ...es-relabel-var-home-and-var-roothome.patch | 50 ------------------- ignition.spec | 27 +++++----- sources | 2 +- 5 files changed, 16 insertions(+), 99 deletions(-) delete mode 100644 0001-stages-files-relabel-files-before-systemd-sysctl.patch delete mode 100644 0001-stages-files-relabel-var-home-and-var-roothome.patch diff --git a/.gitignore b/.gitignore index 860f118..a7b368f 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ /ignition-dracut-7ee64ca.tar.gz /ignition-dracut-decf63f.tar.gz /ignition-dracut-7b83454.tar.gz +/ignition-b1ab0b2.tar.gz diff --git a/0001-stages-files-relabel-files-before-systemd-sysctl.patch b/0001-stages-files-relabel-files-before-systemd-sysctl.patch deleted file mode 100644 index 7f9081d..0000000 --- a/0001-stages-files-relabel-files-before-systemd-sysctl.patch +++ /dev/null @@ -1,35 +0,0 @@ -From bab77f2fa4ecbc1d0428dd6e8a54d34848d78fd1 Mon Sep 17 00:00:00 2001 -From: Jonathan Lebon -Date: Thu, 27 Sep 2018 16:40:24 -0400 -Subject: [PATCH] stages/files: relabel files before systemd-sysctl - -This is a workaround for an inherent issue with the current relabeling -approach (see #635). `systemd-sysctl.service` is definitely one of those -early services that have a high probability of reading files from `/etc` -before it's relabeled. - -They're both pulled in by `sysinit.target`, but -`ignition-relabel.service` has an additional `After=local-fs.target` -which makes it likelier to run later (also see #635 about that). So for -now, let's just hack around this by making sure `systemd-sysctl` runs -after us. ---- - internal/exec/stages/files/files.go | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/internal/exec/stages/files/files.go b/internal/exec/stages/files/files.go -index 609a0e8..24676bc 100644 ---- a/internal/exec/stages/files/files.go -+++ b/internal/exec/stages/files/files.go -@@ -138,7 +138,7 @@ func (s *stage) addRelabelUnit(config types.Config) error { - Description=Relabel files created by Ignition - DefaultDependencies=no - After=local-fs.target --Before=sysinit.target -+Before=sysinit.target systemd-sysctl.service - ConditionSecurity=selinux - ConditionPathExists=/etc/selinux/ignition.relabel - OnFailure=emergency.target --- -2.17.1 - diff --git a/0001-stages-files-relabel-var-home-and-var-roothome.patch b/0001-stages-files-relabel-var-home-and-var-roothome.patch deleted file mode 100644 index 196b15e..0000000 --- a/0001-stages-files-relabel-var-home-and-var-roothome.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 45b75181389d2bc357de524dc32ede787222dedc Mon Sep 17 00:00:00 2001 -From: Jonathan Lebon -Date: Fri, 14 Sep 2018 15:27:37 -0400 -Subject: [PATCH] stages/files: relabel /var/home and /var/roothome - -The behaviour of how `restorecon` handles symlinks changed between RHCOS -and FCOS. More specifically, `restorecon` will follow symlinks that are -part of a given path, but not if the target path is a symlink itself. -On OSTree-based systems, `/home` and `/root` are just symlinks, so the -newer `restorecon` wasn't actually relabeling anything under there. - -Add the real paths to the list of dirs to relabel and add `-i` so that -it's not a fatal error on non-OSTree-based systems. - -Closes: coreos/fedora-coreos-config#2 ---- - internal/exec/stages/files/files.go | 2 +- - internal/exec/stages/files/passwd.go | 3 +++ - 2 files changed, 4 insertions(+), 1 deletion(-) - -diff --git a/internal/exec/stages/files/files.go b/internal/exec/stages/files/files.go -index 077d383..609a0e8 100644 ---- a/internal/exec/stages/files/files.go -+++ b/internal/exec/stages/files/files.go -@@ -146,7 +146,7 @@ OnFailureJobMode=replace-irreversibly - - [Service] - Type=oneshot --ExecStart=` + distro.RestoreconCmd() + ` -0vRf /etc/selinux/ignition.relabel -+ExecStart=` + distro.RestoreconCmd() + ` -0vRif /etc/selinux/ignition.relabel - ExecStart=/usr/bin/rm /etc/selinux/ignition.relabel - RemainAfterExit=yes`, - } -diff --git a/internal/exec/stages/files/passwd.go b/internal/exec/stages/files/passwd.go -index 2eecd40..1ae0f02 100644 ---- a/internal/exec/stages/files/passwd.go -+++ b/internal/exec/stages/files/passwd.go -@@ -41,6 +41,9 @@ func (s *stage) createPasswd(config types.Config) error { - "/etc/.pwd.lock", - "/home", - "/root", -+ // for OSTree-based systems (newer restorecon doesn't follow symlinks) -+ "/var/home", -+ "/var/roothome", - ) - } - --- -2.19.0 - diff --git a/ignition.spec b/ignition.spec index 1d6ba00..9a48528 100644 --- a/ignition.spec +++ b/ignition.spec @@ -1,8 +1,8 @@ -# Original spec file as generated by: +# Original spec file for 0.28.0 as generated by: # gofed repo2spec --detect github.com/coreos/ignition --commit f7079129b8651ac51dba14c3af65692bb413c1dd --with-extra --with-build -f # With: # gofed/gofed:v1.0.1 docker image - +# Modified by hand for 0.29.1 # If any of the following macros should be set otherwise, # you can wrap any of them with the following conditions: @@ -49,7 +49,7 @@ # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit f7079129b8651ac51dba14c3af65692bb413c1dd +%global commit b1ab0b28d4aa17535b6503b8d97ed81953da20e5 %global shortcommit %(c=%{commit}; echo ${c:0:7}) # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these @@ -72,15 +72,13 @@ Name: ignition -Version: 0.28.0 -Release: 12.git%{shortcommit}%{?dist} +Version: 0.29.1 +Release: 1.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz -Patch0: 0001-stages-files-relabel-var-home-and-var-roothome.patch -Patch1: 0001-stages-files-relabel-files-before-systemd-sysctl.patch # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} @@ -152,8 +150,8 @@ Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = %{ve Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 Provides: bundled(golang(github.com/coreos/go-semver/semver)) = %{version}-294930c1e79c64e7dbe360054274fdad492c8cf5 -Provides: bundled(golang(github.com/coreos/go-systemd/dbus)) = %{version}-39ca1b05acc7ad1220e09f133283b8859a8b71ab -Provides: bundled(golang(github.com/coreos/go-systemd/unit)) = %{version}-39ca1b05acc7ad1220e09f133283b8859a8b71ab +Provides: bundled(golang(github.com/coreos/go-systemd/dbus)) = %{version}-9002847aa1425fb6ac49077c0a630b3b67e0fbfd +Provides: bundled(golang(github.com/coreos/go-systemd/unit)) = %{version}-9002847aa1425fb6ac49077c0a630b3b67e0fbfd Provides: bundled(golang(github.com/pin/tftp/netascii)) = %{version}-9ea92f6b1029bc1bf3072bba195c84bb9b0370e3 Provides: bundled(golang(github.com/sigma/vmw-guestinfo/rpcvmx)) = %{version}-95dd4126d6e8b4ef1970b3f3fe2e8cdd470d2903 Provides: bundled(golang(github.com/sigma/vmw-guestinfo/vmcheck)) = %{version}-95dd4126d6e8b4ef1970b3f3fe2e8cdd470d2903 @@ -331,8 +329,6 @@ initramfs on boot. # setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html # unpack source0 and apply patches %setup -T -b 0 -q -n %{repo}-%{commit} -%patch0 -p1 -%patch1 -p1 # unpack source1 (dracut modules) %setup -T -D -a 1 -q -n %{repo}-%{commit} @@ -442,8 +438,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %gotest %{import_path}/config/v2_1/types %gotest %{import_path}/config/v2_2 %gotest %{import_path}/config/v2_2/types -%gotest %{import_path}/config/v2_3_experimental -%gotest %{import_path}/config/v2_3_experimental/types +%gotest %{import_path}/config/v2_3 +%gotest %{import_path}/config/v2_3/types +%gotest %{import_path}/config/v2_4_experimental +%gotest %{import_path}/config/v2_4_experimental/types %gotest %{import_path}/config/validate %gotest %{import_path}/internal/config %gotest %{import_path}/internal/exec/stages/files @@ -476,6 +474,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Tue Dec 11 2018 Andrew Jeddeloh - 0.29.1-1.gitb1ab0b2 +- New release 0.29.1 + * Wed Nov 21 2018 Igor Gnatenko - 0.28.0-12.gitf707912 - Rebuild for protobuf 3.6 in rawhide (f30) diff --git a/sources b/sources index 8ffc6a4..31be46d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-f707912.tar.gz) = a01d61415ae2e1f053ab7b17642a9377d77b51d34b9ca3e44a9e4c598c705b575b53620558eda69fcfa35131d9fe3ec3df3b9d4675c5b3aa5da3e205343d006b +SHA512 (ignition-b1ab0b2.tar.gz) = 7723b60f71ba71b937b89b10d27afd244e3cee16da95391928de212983db38be03a5d0f3c641c7de423bb1eabd79e8120add483791d0d23bc3ce96180cfcee65 SHA512 (ignition-dracut-7b83454.tar.gz) = 8a523998efa1f55de77a7d4fb6a7fa060ebd3632d81e46fba1384fa8645934ae45044d524f25e724d56fe5dbf24424327e1d0bdc8d46c6e95793e92fbbe221f3 From f1d23b1b462bfe4d1ee9f18cac06bcfcba781ed1 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Tue, 11 Dec 2018 16:05:13 -0500 Subject: [PATCH 022/172] fixups for building against rhel7 - require golang >= 1.10 - specify arch list since no %go_arches macro --- ignition.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index 9a48528..764854f 100644 --- a/ignition.spec +++ b/ignition.spec @@ -73,17 +73,25 @@ Name: ignition Version: 0.29.1 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +# For RHEL7 we'll want to specify list of arches since there is no +# go_arches macro. We'll also want to make sure we pull in golang 1.10 +# require golang >= 1.10 +%if 0%{?rhel} <= 7 && 0%{?centos} == 0 +ExclusiveArch: x86_64 ppc64le aarch64 s390x +BuildRequires: golang >= 1.10 +%else # e.g. el6 has ppc64 arch without gcc-go, so EA tag is required ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} # If go_compiler is not set to 1, there is no virtual provide. Use golang instead. BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} +%endif # add non golang BuildRequires that weren't detected BuildRequires: libblkid-devel @@ -474,6 +482,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Tue Dec 11 2018 Dusty Mabe - 0.29.1-2.gitb1ab0b2 +- require golang >= 1.10 and specify architecture list for RHEL7 + * Tue Dec 11 2018 Andrew Jeddeloh - 0.29.1-1.gitb1ab0b2 - New release 0.29.1 From 45ea7ada150e536b747d7aacc25e41009c1c0ed9 Mon Sep 17 00:00:00 2001 From: Michael Nguyen Date: Fri, 14 Dec 2018 17:58:28 +0000 Subject: [PATCH 023/172] additional fixups for building against rhel7 add gopath macro to build against rhel7 --- ignition.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ignition.spec b/ignition.spec index 764854f..260886d 100644 --- a/ignition.spec +++ b/ignition.spec @@ -73,17 +73,17 @@ Name: ignition Version: 0.29.1 -Release: 2.git%{shortcommit}%{?dist} +Release: 3.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz - -# For RHEL7 we'll want to specify list of arches since there is no -# go_arches macro. We'll also want to make sure we pull in golang 1.10 -# require golang >= 1.10 +# For RHEL7 we'll want to specify gopath and list of arches since there is no +# gopath or go_arches macro. We'll also want to make sure we pull in golang +# 1.10 require golang >= 1.10 %if 0%{?rhel} <= 7 && 0%{?centos} == 0 +%define gopath %{_datadir}/gocode ExclusiveArch: x86_64 ppc64le aarch64 s390x BuildRequires: golang >= 1.10 %else @@ -482,6 +482,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Dec 14 2018 Michael Nguyen - 0.29.1-3.gitb1ab0b2 +- define gopath for RHEL7 + * Tue Dec 11 2018 Dusty Mabe - 0.29.1-2.gitb1ab0b2 - require golang >= 1.10 and specify architecture list for RHEL7 From a917a6aa1a071d657742242bee85e93ff1461254 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Sat, 15 Dec 2018 15:06:08 -0500 Subject: [PATCH 024/172] Bump to Ignition 0.30.0 --- .gitignore | 1 + ignition.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index a7b368f..e8ea5b8 100644 --- a/.gitignore +++ b/.gitignore @@ -11,3 +11,4 @@ /ignition-dracut-decf63f.tar.gz /ignition-dracut-7b83454.tar.gz /ignition-b1ab0b2.tar.gz +/ignition-308d7a0.tar.gz diff --git a/ignition.spec b/ignition.spec index 260886d..ada4b94 100644 --- a/ignition.spec +++ b/ignition.spec @@ -2,7 +2,7 @@ # gofed repo2spec --detect github.com/coreos/ignition --commit f7079129b8651ac51dba14c3af65692bb413c1dd --with-extra --with-build -f # With: # gofed/gofed:v1.0.1 docker image -# Modified by hand for 0.29.1 +# Modified by hand for 0.30.0 # If any of the following macros should be set otherwise, # you can wrap any of them with the following conditions: @@ -49,7 +49,7 @@ # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit b1ab0b28d4aa17535b6503b8d97ed81953da20e5 +%global commit 308d7a05213ae66a9317c90c042eec366bba10fb %global shortcommit %(c=%{commit}; echo ${c:0:7}) # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these @@ -72,8 +72,8 @@ Name: ignition -Version: 0.29.1 -Release: 3.git%{shortcommit}%{?dist} +Version: 0.30.0 +Release: 1.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} @@ -482,6 +482,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Sat Dec 15 2018 Benjamin Gilbert - 0.30.0-1.git308d7a0 +- New release 0.30.0 + * Fri Dec 14 2018 Michael Nguyen - 0.29.1-3.gitb1ab0b2 - define gopath for RHEL7 diff --git a/sources b/sources index 31be46d..c7ece79 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-b1ab0b2.tar.gz) = 7723b60f71ba71b937b89b10d27afd244e3cee16da95391928de212983db38be03a5d0f3c641c7de423bb1eabd79e8120add483791d0d23bc3ce96180cfcee65 +SHA512 (ignition-308d7a0.tar.gz) = 5fe18f5868a6004656494976498e39b1bb20e62b15038c4cf793bc5d1dc812a65da44912a0002f028e6aa4f7afe0724dd0cab7a5b7d98222809c4234bba61fa2 SHA512 (ignition-dracut-7b83454.tar.gz) = 8a523998efa1f55de77a7d4fb6a7fa060ebd3632d81e46fba1384fa8645934ae45044d524f25e724d56fe5dbf24424327e1d0bdc8d46c6e95793e92fbbe221f3 From d3515dd2ddec3f5f7291758c4efd82318cddd2be Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Sat, 5 Jan 2019 17:08:57 -0500 Subject: [PATCH 025/172] add a few utility scripts for downloading sources --- download-ignition-dracut.sh | 3 +++ download-ignition.sh | 3 +++ 2 files changed, 6 insertions(+) create mode 100755 download-ignition-dracut.sh create mode 100755 download-ignition.sh diff --git a/download-ignition-dracut.sh b/download-ignition-dracut.sh new file mode 100755 index 0000000..38c76af --- /dev/null +++ b/download-ignition-dracut.sh @@ -0,0 +1,3 @@ +#!/bin/bash +set -xeuo pipefail +rpmspec -P ignition.spec | grep 'Source1:' | tr -s ' ' | cut -d ' ' -f 2 | xargs wget diff --git a/download-ignition.sh b/download-ignition.sh new file mode 100755 index 0000000..02ff383 --- /dev/null +++ b/download-ignition.sh @@ -0,0 +1,3 @@ +#!/bin/bash +set -xeuo pipefail +rpmspec -P ignition.spec | grep 'Source0:' | tr -s ' ' | cut -d ' ' -f 2 | xargs wget From 83f481ab24111aca59550f693610479eddef7212 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Mon, 28 Jan 2019 12:18:24 -0500 Subject: [PATCH 026/172] Bump to ignition-dracut fa7131b --- .gitignore | 1 + ignition.spec | 10 ++++++++-- sources | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index e8ea5b8..f3fb275 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,4 @@ /ignition-dracut-7b83454.tar.gz /ignition-b1ab0b2.tar.gz /ignition-308d7a0.tar.gz +/ignition-dracut-fa7131b.tar.gz diff --git a/ignition.spec b/ignition.spec index ada4b94..f035fa2 100644 --- a/ignition.spec +++ b/ignition.spec @@ -67,13 +67,13 @@ # https://github.com/coreos/ignition-dracut %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit 7b83454d48ca5f73d82dbd21d0a03fff7974ca0b +%global dracutcommit fa7131b6d3cbc5017449be6e6359a054327c354a %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 0.30.0 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} @@ -482,6 +482,12 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Mon Jan 28 2019 Dusty Mabe - 0.30.0-2.git308d7a0 +- Bump to ignition-dracut fa7131b +- * 7579b92 journal: add clarifying comment for context + * a6551f1 Remount /sysroot rw (#38) + * ignition-firstboot-complete.service: Remount /boot rw + * Sat Dec 15 2018 Benjamin Gilbert - 0.30.0-1.git308d7a0 - New release 0.30.0 diff --git a/sources b/sources index c7ece79..b6b63d8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ignition-308d7a0.tar.gz) = 5fe18f5868a6004656494976498e39b1bb20e62b15038c4cf793bc5d1dc812a65da44912a0002f028e6aa4f7afe0724dd0cab7a5b7d98222809c4234bba61fa2 -SHA512 (ignition-dracut-7b83454.tar.gz) = 8a523998efa1f55de77a7d4fb6a7fa060ebd3632d81e46fba1384fa8645934ae45044d524f25e724d56fe5dbf24424327e1d0bdc8d46c6e95793e92fbbe221f3 +SHA512 (ignition-dracut-fa7131b.tar.gz) = 4620b0497860903a2e49470d77853dd945f7a02b6fb708805b620f698fe123fca9daf5e561678a871c4defd93d73cfee8a632fe853aba16ec08b36f8ad85a2ae From d8b94af17d0d581adb7db707ba2f5d5af1cef885 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 03:13:42 +0000 Subject: [PATCH 027/172] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ignition.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index f035fa2..90d4784 100644 --- a/ignition.spec +++ b/ignition.spec @@ -73,7 +73,7 @@ Name: ignition Version: 0.30.0 -Release: 2.git%{shortcommit}%{?dist} +Release: 3.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} @@ -482,6 +482,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 0.30.0-3.git308d7a0 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Jan 28 2019 Dusty Mabe - 0.30.0-2.git308d7a0 - Bump to ignition-dracut fa7131b - * 7579b92 journal: add clarifying comment for context From 25ea599bd02de4d54432cd20650a7ae260a4917e Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Fri, 15 Feb 2019 17:39:24 -0500 Subject: [PATCH 028/172] Bump to ignition-dracut 2c69925 --- .gitignore | 1 + ignition.spec | 11 +++++++++-- sources | 2 +- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f3fb275..2d65c80 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,4 @@ /ignition-b1ab0b2.tar.gz /ignition-308d7a0.tar.gz /ignition-dracut-fa7131b.tar.gz +/ignition-dracut-2c69925.tar.gz diff --git a/ignition.spec b/ignition.spec index 90d4784..9896651 100644 --- a/ignition.spec +++ b/ignition.spec @@ -67,13 +67,13 @@ # https://github.com/coreos/ignition-dracut %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit fa7131b6d3cbc5017449be6e6359a054327c354a +%global dracutcommit 2c699252247fd4eb786b66db30a30b777dcd8468 %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 0.30.0 -Release: 3.git%{shortcommit}%{?dist} +Release: 4.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} @@ -482,6 +482,13 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Feb 15 2019 Dusty Mabe - 0.30.0-4.git308d7a0 +- Bump to ignition-dracut 2c69925 +- * support platform configs and user configs in /boot + ^ https://github.com/coreos/ignition-dracut/pull/43 + * Add ability to parse config.ign file on boot + ^ https://github.com/coreos/ignition-dracut/pull/42 + * Fri Feb 01 2019 Fedora Release Engineering - 0.30.0-3.git308d7a0 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild diff --git a/sources b/sources index b6b63d8..aaf1df4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ignition-308d7a0.tar.gz) = 5fe18f5868a6004656494976498e39b1bb20e62b15038c4cf793bc5d1dc812a65da44912a0002f028e6aa4f7afe0724dd0cab7a5b7d98222809c4234bba61fa2 -SHA512 (ignition-dracut-fa7131b.tar.gz) = 4620b0497860903a2e49470d77853dd945f7a02b6fb708805b620f698fe123fca9daf5e561678a871c4defd93d73cfee8a632fe853aba16ec08b36f8ad85a2ae +SHA512 (ignition-dracut-2c69925.tar.gz) = 4df397a6b19cc8482353c4b38e4cee25690addd1713b66b8fc70c08858c5dbeb6ec4d0b1164f95f4a8a603889430967481c01632b8caf07cd56137901c1e18eb From ed359188d7460e14b28ecb24d7e60b3e7e7f7f47 Mon Sep 17 00:00:00 2001 From: Andrew Jeddeloh Date: Wed, 20 Feb 2019 15:23:02 -0800 Subject: [PATCH 029/172] Bump to Ignition v0.31.0 --- .gitignore | 1 + ignition.spec | 13 +++++++------ sources | 2 +- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 2d65c80..9285d84 100644 --- a/.gitignore +++ b/.gitignore @@ -14,3 +14,4 @@ /ignition-308d7a0.tar.gz /ignition-dracut-fa7131b.tar.gz /ignition-dracut-2c69925.tar.gz +/ignition-f59a653.tar.gz diff --git a/ignition.spec b/ignition.spec index 9896651..632956d 100644 --- a/ignition.spec +++ b/ignition.spec @@ -2,7 +2,7 @@ # gofed repo2spec --detect github.com/coreos/ignition --commit f7079129b8651ac51dba14c3af65692bb413c1dd --with-extra --with-build -f # With: # gofed/gofed:v1.0.1 docker image -# Modified by hand for 0.30.0 +# Modified by hand for 0.31.0 # If any of the following macros should be set otherwise, # you can wrap any of them with the following conditions: @@ -49,7 +49,7 @@ # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit 308d7a05213ae66a9317c90c042eec366bba10fb +%global commit f59a653629be8b1825ed4ff2f9e3d21aa87bd85a %global shortcommit %(c=%{commit}; echo ${c:0:7}) # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these @@ -72,8 +72,8 @@ Name: ignition -Version: 0.30.0 -Release: 4.git%{shortcommit}%{?dist} +Version: 0.31.0 +Release: 1.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} @@ -105,8 +105,6 @@ Requires: gdisk # Main rpm package BuildRequires %if ! 0%{?with_bundled} -# validate/main.go -BuildRequires: golang(github.com/spf13/cobra) # Remaining dependencies not included in main packages (sorted) BuildRequires: golang(github.com/ajeddeloh/go-json) BuildRequires: golang(github.com/aws/aws-sdk-go/aws) @@ -482,6 +480,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Wed Feb 20 2019 Andrew Jeddeloh - 0.31.0-1.gitf59a653 +- New release 0.31.0 + * Fri Feb 15 2019 Dusty Mabe - 0.30.0-4.git308d7a0 - Bump to ignition-dracut 2c69925 - * support platform configs and user configs in /boot diff --git a/sources b/sources index aaf1df4..007cc47 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-308d7a0.tar.gz) = 5fe18f5868a6004656494976498e39b1bb20e62b15038c4cf793bc5d1dc812a65da44912a0002f028e6aa4f7afe0724dd0cab7a5b7d98222809c4234bba61fa2 +SHA512 (ignition-f59a653.tar.gz) = fd198a24536c037c27ab99546e94027b08c3634724324b972828ee48f8ab9e1ba4ec1bd49d6aba6337381754cb30025c5311ab85da17c645eb7503b62e9529ff SHA512 (ignition-dracut-2c69925.tar.gz) = 4df397a6b19cc8482353c4b38e4cee25690addd1713b66b8fc70c08858c5dbeb6ec4d0b1164f95f4a8a603889430967481c01632b8caf07cd56137901c1e18eb From 14c71e122e3b8aaa5bff4e51bf98d82af62c2335 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Mon, 4 Mar 2019 20:32:50 -0500 Subject: [PATCH 030/172] ignition-dracut: backport patch for finding ignition.firstboot file on UEFI systems https://github.com/coreos/ignition-dracut/pull/52 --- ...d-boot-partition-and-use-it-directly.patch | 38 +++++++++++++++++++ ignition.spec | 10 ++++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 0001-grub-find-boot-partition-and-use-it-directly.patch diff --git a/0001-grub-find-boot-partition-and-use-it-directly.patch b/0001-grub-find-boot-partition-and-use-it-directly.patch new file mode 100644 index 0000000..9915095 --- /dev/null +++ b/0001-grub-find-boot-partition-and-use-it-directly.patch @@ -0,0 +1,38 @@ +From 552edb5c959bb4a99be6cba15423bf357d016aa8 Mon Sep 17 00:00:00 2001 +From: Dusty Mabe +Date: Mon, 4 Mar 2019 16:42:28 -0500 +Subject: [PATCH] grub: find boot partition and use it directly + +On UEFI systems the grub $root might be the /boot/efi/ +partition and not the /boot/ partition so let's search +for the partition with the `boot` label and then detect +the file directly. + +Fixes #51 +--- + grub/02_ignition_firstboot | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/grub/02_ignition_firstboot b/grub/02_ignition_firstboot +index 9ceca5d..a154918 100755 +--- a/grub/02_ignition_firstboot ++++ b/grub/02_ignition_firstboot +@@ -1,7 +1,13 @@ + #!/bin/sh + exec tail -n +3 $0 ++# We store the file on the /boot/ partition so find the ++# boot partition. On UEFI this may different than the grub ++# $root so we search for it here. ++# https://github.com/coreos/ignition-dracut/issues/51 ++search --set=bootpart --label boot ++# Determine if this is a first boot and set the variable ++# to be used later on the kernel command line. + set ignition_firstboot="" +-# Determine if this is a first boot. +-if [ -f "/ignition.firstboot" ]; then ++if [ -f "(${bootpart})/ignition.firstboot" ]; then + set ignition_firstboot="ignition.firstboot" + fi +-- +2.20.1 + diff --git a/ignition.spec b/ignition.spec index 632956d..f97b701 100644 --- a/ignition.spec +++ b/ignition.spec @@ -73,7 +73,7 @@ Name: ignition Version: 0.31.0 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} @@ -318,6 +318,8 @@ Requires: dracut Requires: dracut-network BuildArchitectures: noarch +Patch0: 0001-grub-find-boot-partition-and-use-it-directly.patch + %description dracut Dracut modules for ignition to enable ignition services to run in the initramfs on boot. @@ -338,6 +340,8 @@ initramfs on boot. # unpack source1 (dracut modules) %setup -T -D -a 1 -q -n %{repo}-%{commit} +cd %{dracutrepo}-%{dracutcommit} +%patch0 -p1 %build # Set up PWD as a proper import path for go @@ -480,6 +484,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Mon Mar 04 2019 Dusty Mabe - 0.31.0-2.gitf59a653 +- ignition-dracut: backport patch for finding ignition.firstboot file on UEFI systems + https://github.com/coreos/ignition-dracut/pull/52 + * Wed Feb 20 2019 Andrew Jeddeloh - 0.31.0-1.gitf59a653 - New release 0.31.0 From 08c873e0e31e7cd84d0002c6210f0a84d72814e8 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Mon, 18 Mar 2019 19:59:05 +0000 Subject: [PATCH 031/172] Backport networking patch --- ...tboot-Enable-networking-if-Ignition-.patch | 28 +++++++++++++++++++ ignition.spec | 7 ++++- 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 0001-02_ignition_firstboot-Enable-networking-if-Ignition-.patch diff --git a/0001-02_ignition_firstboot-Enable-networking-if-Ignition-.patch b/0001-02_ignition_firstboot-Enable-networking-if-Ignition-.patch new file mode 100644 index 0000000..9f71bee --- /dev/null +++ b/0001-02_ignition_firstboot-Enable-networking-if-Ignition-.patch @@ -0,0 +1,28 @@ +From c62a108c79db49cecb9f323d6567d33a86fa6dc7 Mon Sep 17 00:00:00 2001 +From: Colin Walters +Date: Mon, 18 Mar 2019 13:54:56 +0000 +Subject: [PATCH] 02_ignition_firstboot: Enable networking if Ignition will run + +Today coreos-assembler is hardcoding the initramfs networking kargs to +do DHCP; this is problematic for e.g. bare metal where one often wants +to configure static networking. + +Let's only enable initramfs networking if we're doing Ignition. +--- + grub/02_ignition_firstboot | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/grub/02_ignition_firstboot b/grub/02_ignition_firstboot +index a154918..b4e926d 100755 +--- a/grub/02_ignition_firstboot ++++ b/grub/02_ignition_firstboot +@@ -9,5 +9,5 @@ search --set=bootpart --label boot + # to be used later on the kernel command line. + set ignition_firstboot="" + if [ -f "(${bootpart})/ignition.firstboot" ]; then +- set ignition_firstboot="ignition.firstboot" ++ set ignition_firstboot="ignition.firstboot rd.neednet=1 ip=dhcp" + fi +-- +2.20.1 + diff --git a/ignition.spec b/ignition.spec index f97b701..bd9691a 100644 --- a/ignition.spec +++ b/ignition.spec @@ -73,7 +73,7 @@ Name: ignition Version: 0.31.0 -Release: 2.git%{shortcommit}%{?dist} +Release: 3.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} @@ -319,6 +319,7 @@ Requires: dracut-network BuildArchitectures: noarch Patch0: 0001-grub-find-boot-partition-and-use-it-directly.patch +Patch1: 0001-02_ignition_firstboot-Enable-networking-if-Ignition-.patch %description dracut Dracut modules for ignition to enable ignition services to run in the @@ -342,6 +343,7 @@ initramfs on boot. %setup -T -D -a 1 -q -n %{repo}-%{commit} cd %{dracutrepo}-%{dracutcommit} %patch0 -p1 +%patch1 -p1 %build # Set up PWD as a proper import path for go @@ -484,6 +486,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Mon Mar 18 2019 Colin Walters - 0.31.0-3.gitf59a653 +- Backport patch for networking + * Mon Mar 04 2019 Dusty Mabe - 0.31.0-2.gitf59a653 - ignition-dracut: backport patch for finding ignition.firstboot file on UEFI systems https://github.com/coreos/ignition-dracut/pull/52 From efdd301baba74ba0b41fb94908da6f277a131e25 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 15 Mar 2019 22:05:45 -0400 Subject: [PATCH 032/172] Move some dracut subpackage configuration within the specfile --- ignition.spec | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/ignition.spec b/ignition.spec index bd9691a..7b74899 100644 --- a/ignition.spec +++ b/ignition.spec @@ -73,11 +73,15 @@ Name: ignition Version: 0.31.0 -Release: 3.git%{shortcommit}%{?dist} +Release: 4.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +Source1: https://%{dracutprovider_prefix}/archive/%{dracutcommit}/%{dracutrepo}-%{dracutshortcommit}.tar.gz + +Patch0: 0001-grub-find-boot-partition-and-use-it-directly.patch +Patch1: 0001-02_ignition_firstboot-Enable-networking-if-Ignition-.patch # For RHEL7 we'll want to specify gopath and list of arches since there is no # gopath or go_arches macro. We'll also want to make sure we pull in golang @@ -312,27 +316,16 @@ providing packages with %{import_path} prefix. Summary: Dracut modules for ignition License: BSD URL: https://%{dracutprovider_prefix} -Source1: https://%{dracutprovider_prefix}/archive/%{dracutcommit}/%{dracutrepo}-%{dracutshortcommit}.tar.gz Requires: %{name} = %{version}-%{release} Requires: dracut Requires: dracut-network BuildArchitectures: noarch -Patch0: 0001-grub-find-boot-partition-and-use-it-directly.patch -Patch1: 0001-02_ignition_firstboot-Enable-networking-if-Ignition-.patch %description dracut Dracut modules for ignition to enable ignition services to run in the initramfs on boot. -%files dracut -%doc README.md -%license LICENSE -%{dracutlibdir}/modules.d/30ignition -%{dracutlibdir}/modules.d/99journald-conf -%{_sysconfdir}/grub.d/* -%{_prefix}/lib/systemd/system/*.service -############## end dracut subpackage ############## %prep # setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html @@ -472,6 +465,14 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{_bindir}/%{name} %{_bindir}/%{name}-validate +%files dracut +%doc README.md +%license LICENSE +%{dracutlibdir}/modules.d/30ignition +%{dracutlibdir}/modules.d/99journald-conf +%{_sysconfdir}/grub.d/* +%{_prefix}/lib/systemd/system/*.service + %if 0%{?with_devel} %files devel -f devel.file-list %license LICENSE @@ -486,6 +487,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Mon Mar 18 2019 Benjamin Gilbert - 0.31.0-4.gitf59a653 +- Move some dracut subpackage configuration within the specfile + * Mon Mar 18 2019 Colin Walters - 0.31.0-3.gitf59a653 - Backport patch for networking From a50f54ed84f830be380f5472fab0ce9b915a5884 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 15 Mar 2019 22:20:51 -0400 Subject: [PATCH 033/172] Fix trailing spaces in %description --- ignition.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ignition.spec b/ignition.spec index 7b74899..975e850 100644 --- a/ignition.spec +++ b/ignition.spec @@ -173,10 +173,10 @@ Provides: bundled(golang(go4.org/errorutil)) = %{version}-03efcb870d84809319ea50 %description -Ignition is a utility used to manipulate systems during the initramfs. +Ignition is a utility used to manipulate systems during the initramfs. This includes partitioning disks, formatting partitions, writing files (regular files, systemd units, networkd units, etc.), and configuring -users. On first boot, Ignition reads its configuration from a source +users. On first boot, Ignition reads its configuration from a source of truth (remote URL, network metadata service, hypervisor bridge, etc.) and applies the configuration. From 785d4775419a910b7db5d8d9fabc46ba0026d41c Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 15 Mar 2019 23:16:58 -0400 Subject: [PATCH 034/172] Drop stray summary line from package description --- ignition.spec | 2 -- 1 file changed, 2 deletions(-) diff --git a/ignition.spec b/ignition.spec index 975e850..bfe80ff 100644 --- a/ignition.spec +++ b/ignition.spec @@ -180,8 +180,6 @@ users. On first boot, Ignition reads its configuration from a source of truth (remote URL, network metadata service, hypervisor bridge, etc.) and applies the configuration. -%{summary} - ############## devel subpackage ############## %if 0%{?with_devel} From c796b57e009539294aa0495525498679096a853b Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 15 Mar 2019 23:08:47 -0400 Subject: [PATCH 035/172] Remember to exit ignition-dracut directory after installing --- ignition.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index bfe80ff..84727ab 100644 --- a/ignition.spec +++ b/ignition.spec @@ -370,11 +370,12 @@ install -p -m 0755 ./ignition-validate %{buildroot}%{_bindir} install -d -p %{buildroot}/%{dracutlibdir}/modules.d install -d -p %{buildroot}/%{_prefix}/lib/systemd/system install -d -p %{buildroot}/%{_sysconfdir}/grub.d -cd %{dracutrepo}-%{dracutcommit} +pushd %{dracutrepo}-%{dracutcommit} >/dev/null rm dracut/README.txt cp -r dracut/* %{buildroot}/%{dracutlibdir}/modules.d/ install -m 0644 -t %{buildroot}/%{_prefix}/lib/systemd/system/ systemd/* install -m 0755 -t %{buildroot}/%{_sysconfdir}/grub.d/ grub/* +popd >/dev/null # source codes for building projects %if 0%{?with_devel} From ecc7b2311ec2efcc0d08fffe623c9bf18154567c Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 15 Mar 2019 22:24:33 -0400 Subject: [PATCH 036/172] Merge ignition-dracut into ignition; split out ignition-validate --- ignition.spec | 52 +++++++++++++++++++++++++++++-------------------- tests/tests.yml | 6 +++--- 2 files changed, 34 insertions(+), 24 deletions(-) diff --git a/ignition.spec b/ignition.spec index 84727ab..1cd3ffe 100644 --- a/ignition.spec +++ b/ignition.spec @@ -75,7 +75,7 @@ Name: ignition Version: 0.31.0 Release: 4.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool -License: ASL 2.0 +License: ASL 2.0 and BSD URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz Source1: https://%{dracutprovider_prefix}/archive/%{dracutcommit}/%{dracutrepo}-%{dracutshortcommit}.tar.gz @@ -106,6 +106,10 @@ Requires: btrfs-progs %endif Requires: dosfstools Requires: gdisk +Requires: dracut +Requires: dracut-network + +Obsoletes: ignition-dracut < 0.31.0-3 # Main rpm package BuildRequires %if ! 0%{?with_bundled} @@ -186,6 +190,7 @@ and applies the configuration. %package devel Summary: %{summary} BuildArch: noarch +License: ASL 2.0 # devel subpackage BuildRequires %if 0%{?with_check} && ! 0%{?with_bundled} @@ -286,6 +291,7 @@ building other packages which use import path with %if 0%{?with_unit_test} && 0%{?with_devel} %package unit-test-devel Summary: Unit tests for %{name} package +License: ASL 2.0 %if 0%{?with_check} #Here comes all BuildRequires: PACKAGE the unit tests #in %%check section need for running @@ -308,21 +314,23 @@ providing packages with %{import_path} prefix. %endif -############## dracut subpackage ############## -%package dracut +############## validate subpackage ############## +%package validate -Summary: Dracut modules for ignition -License: BSD -URL: https://%{dracutprovider_prefix} -Requires: %{name} = %{version}-%{release} -Requires: dracut -Requires: dracut-network -BuildArchitectures: noarch +Summary: Validation tool for Ignition configs +License: ASL 2.0 +Conflicts: ignition < 0.31.0-3 -%description dracut -Dracut modules for ignition to enable ignition services to run in the -initramfs on boot. +%description validate +Ignition is a utility used to manipulate systems during the initramfs. +This includes partitioning disks, formatting partitions, writing files +(regular files, systemd units, networkd units, etc.), and configuring +users. On first boot, Ignition reads its configuration from a source +of truth (remote URL, network metadata service, hypervisor bridge, etc.) +and applies the configuration. + +This package contains a tool for validating Ignition configurations. %prep @@ -362,11 +370,12 @@ echo "Building ignition-validate..." %install -# main package +# ignition install -d -p %{buildroot}%{_bindir} install -p -m 0755 ./ignition %{buildroot}%{_bindir} install -p -m 0755 ./ignition-validate %{buildroot}%{_bindir} -# dracut subpackage + +# ignition-dracut install -d -p %{buildroot}/%{dracutlibdir}/modules.d install -d -p %{buildroot}/%{_prefix}/lib/systemd/system install -d -p %{buildroot}/%{_sysconfdir}/grub.d @@ -462,16 +471,16 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %license LICENSE %doc README.md code-of-conduct.md CONTRIBUTING.md doc/ %{_bindir}/%{name} -%{_bindir}/%{name}-validate - -%files dracut -%doc README.md -%license LICENSE %{dracutlibdir}/modules.d/30ignition %{dracutlibdir}/modules.d/99journald-conf %{_sysconfdir}/grub.d/* %{_prefix}/lib/systemd/system/*.service +%files validate +%doc README.md +%license LICENSE +%{_bindir}/%{name}-validate + %if 0%{?with_devel} %files devel -f devel.file-list %license LICENSE @@ -487,7 +496,8 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %changelog * Mon Mar 18 2019 Benjamin Gilbert - 0.31.0-4.gitf59a653 -- Move some dracut subpackage configuration within the specfile +- Move dracut modules into main ignition package +- Move ignition-validate into a subpackage * Mon Mar 18 2019 Colin Walters - 0.31.0-3.gitf59a653 - Backport patch for networking diff --git a/tests/tests.yml b/tests/tests.yml index 85a1d6f..dde4b80 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -5,7 +5,7 @@ - classic required-packages: - ignition - - ignition-dracut + - ignition-validate tests: - ignition-run-version: dir: ./ @@ -13,6 +13,6 @@ - ignition-rpm-installed: dir: ./ run: /usr/bin/rpm -q ignition - - ignition-dracut-rpm-installed: + - ignition-validate-rpm-installed: dir: ./ - run: /usr/bin/rpm -q ignition-dracut + run: /usr/bin/rpm -q ignition-validate From b311717e6057ba7a46d644fa855135ec1be7adcf Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 15 Mar 2019 22:27:57 -0400 Subject: [PATCH 037/172] Include ignition-dracut license file --- ignition.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index 1cd3ffe..a87f714 100644 --- a/ignition.spec +++ b/ignition.spec @@ -343,6 +343,8 @@ This package contains a tool for validating Ignition configurations. cd %{dracutrepo}-%{dracutcommit} %patch0 -p1 %patch1 -p1 +mv LICENSE ../LICENSE.dracut + %build # Set up PWD as a proper import path for go @@ -468,7 +470,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{!?_licensedir:%global license %doc} %files -%license LICENSE +%license LICENSE LICENSE.dracut %doc README.md code-of-conduct.md CONTRIBUTING.md doc/ %{_bindir}/%{name} %{dracutlibdir}/modules.d/30ignition @@ -498,6 +500,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} * Mon Mar 18 2019 Benjamin Gilbert - 0.31.0-4.gitf59a653 - Move dracut modules into main ignition package - Move ignition-validate into a subpackage +- Include ignition-dracut license file * Mon Mar 18 2019 Colin Walters - 0.31.0-3.gitf59a653 - Backport patch for networking From a4778c41916786a0a0160fb35cdd69b59f7fcd66 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 15 Mar 2019 22:30:00 -0400 Subject: [PATCH 038/172] Drop developer docs from base package --- ignition.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index a87f714..a9eabf3 100644 --- a/ignition.spec +++ b/ignition.spec @@ -471,7 +471,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %files %license LICENSE LICENSE.dracut -%doc README.md code-of-conduct.md CONTRIBUTING.md doc/ +%doc README.md doc/ %{_bindir}/%{name} %{dracutlibdir}/modules.d/30ignition %{dracutlibdir}/modules.d/99journald-conf @@ -501,6 +501,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} - Move dracut modules into main ignition package - Move ignition-validate into a subpackage - Include ignition-dracut license file +- Drop developer docs from base package * Mon Mar 18 2019 Colin Walters - 0.31.0-3.gitf59a653 - Backport patch for networking From 49656b110529aca82702610be379f04fa2d754af Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 15 Mar 2019 22:38:01 -0400 Subject: [PATCH 039/172] Move ignition binary into dracut module directory It's too dangerous to put in the PATH. --- dracut-ignition-not-in-path.patch | 24 ++++++++++++++++++++++++ ignition.spec | 17 +++++++++++------ tests/tests.yml | 2 +- 3 files changed, 36 insertions(+), 7 deletions(-) create mode 100644 dracut-ignition-not-in-path.patch diff --git a/dracut-ignition-not-in-path.patch b/dracut-ignition-not-in-path.patch new file mode 100644 index 0000000..b336f28 --- /dev/null +++ b/dracut-ignition-not-in-path.patch @@ -0,0 +1,24 @@ +diff --git a/dracut/30ignition/module-setup.sh b/dracut/30ignition/module-setup.sh +index 4b1c1aa..211da77 100755 +--- a/dracut/30ignition/module-setup.sh ++++ b/dracut/30ignition/module-setup.sh +@@ -11,7 +11,6 @@ install() { + chroot \ + groupadd \ + id \ +- ignition \ + mkfs.ext4 \ + mkfs.vfat \ + mkfs.xfs \ +@@ -32,6 +31,11 @@ install() { + # inst_script "$moddir/retry-umount.sh" \ + # "/usr/sbin/retry-umount" + ++ # Distro packaging is expected to install the ignition binary into the ++ # module directory. ++ inst_simple "$moddir/ignition" \ ++ "/usr/bin/ignition" ++ + inst_simple "$moddir/ignition-generator" \ + "$systemdutildir/system-generators/ignition-generator" + diff --git a/ignition.spec b/ignition.spec index a9eabf3..2436a8e 100644 --- a/ignition.spec +++ b/ignition.spec @@ -82,6 +82,8 @@ Source1: https://%{dracutprovider_prefix}/archive/%{dracutcommit}/%{dracu Patch0: 0001-grub-find-boot-partition-and-use-it-directly.patch Patch1: 0001-02_ignition_firstboot-Enable-networking-if-Ignition-.patch +# https://github.com/coreos/ignition-dracut/pull/56 +Patch2: dracut-ignition-not-in-path.patch # For RHEL7 we'll want to specify gopath and list of arches since there is no # gopath or go_arches macro. We'll also want to make sure we pull in golang @@ -343,6 +345,7 @@ This package contains a tool for validating Ignition configurations. cd %{dracutrepo}-%{dracutcommit} %patch0 -p1 %patch1 -p1 +%patch2 -p1 mv LICENSE ../LICENSE.dracut @@ -372,11 +375,6 @@ echo "Building ignition-validate..." %install -# ignition -install -d -p %{buildroot}%{_bindir} -install -p -m 0755 ./ignition %{buildroot}%{_bindir} -install -p -m 0755 ./ignition-validate %{buildroot}%{_bindir} - # ignition-dracut install -d -p %{buildroot}/%{dracutlibdir}/modules.d install -d -p %{buildroot}/%{_prefix}/lib/systemd/system @@ -388,6 +386,13 @@ install -m 0644 -t %{buildroot}/%{_prefix}/lib/systemd/system/ systemd/* install -m 0755 -t %{buildroot}/%{_sysconfdir}/grub.d/ grub/* popd >/dev/null +# ignition +install -d -p %{buildroot}%{_bindir} +install -p -m 0755 ./ignition-validate %{buildroot}%{_bindir} +# The ignition binary is only for dracut, and is dangerous to run from +# the command line. Install directly into the dracut module dir. +install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition + # source codes for building projects %if 0%{?with_devel} install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ @@ -472,7 +477,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %files %license LICENSE LICENSE.dracut %doc README.md doc/ -%{_bindir}/%{name} %{dracutlibdir}/modules.d/30ignition %{dracutlibdir}/modules.d/99journald-conf %{_sysconfdir}/grub.d/* @@ -499,6 +503,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %changelog * Mon Mar 18 2019 Benjamin Gilbert - 0.31.0-4.gitf59a653 - Move dracut modules into main ignition package +- Move ignition binary out of the PATH - Move ignition-validate into a subpackage - Include ignition-dracut license file - Drop developer docs from base package diff --git a/tests/tests.yml b/tests/tests.yml index dde4b80..2745b45 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -9,7 +9,7 @@ tests: - ignition-run-version: dir: ./ - run: /usr/bin/ignition --version + run: /usr/lib/dracut/modules.d/30ignition/ignition --version - ignition-rpm-installed: dir: ./ run: /usr/bin/rpm -q ignition From e797537371660a38a36abe22c3bd37f9af454017 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Mon, 18 Mar 2019 14:32:43 -0400 Subject: [PATCH 040/172] tests: try running ignition-validate --- tests/tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/tests.yml b/tests/tests.yml index 2745b45..7239cf6 100644 --- a/tests/tests.yml +++ b/tests/tests.yml @@ -10,6 +10,9 @@ - ignition-run-version: dir: ./ run: /usr/lib/dracut/modules.d/30ignition/ignition --version + - ignition-validate-run-version: + dir: ./ + run: /usr/bin/ignition-validate --version - ignition-rpm-installed: dir: ./ run: /usr/bin/rpm -q ignition From 8f7558a4051a2b33be820e4d8639c227f35166f3 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Mon, 18 Mar 2019 17:27:28 -0400 Subject: [PATCH 041/172] Use the spec2x branch of ignition-dracut upstream Since ignition-dracut master has moved to supported ignition spec 3.x we are applying fixes 2.x related fixes to the spec2x branch in the ignition-dracut repo. Summary of backports: https://github.com/coreos/ignition-dracut/pull/58 --- .gitignore | 1 + ...tboot-Enable-networking-if-Ignition-.patch | 28 -------------- ...d-boot-partition-and-use-it-directly.patch | 38 ------------------- dracut-ignition-not-in-path.patch | 24 ------------ ignition.spec | 21 +++++----- sources | 2 +- 6 files changed, 12 insertions(+), 102 deletions(-) delete mode 100644 0001-02_ignition_firstboot-Enable-networking-if-Ignition-.patch delete mode 100644 0001-grub-find-boot-partition-and-use-it-directly.patch delete mode 100644 dracut-ignition-not-in-path.patch diff --git a/.gitignore b/.gitignore index 9285d84..2bd52d6 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ /ignition-dracut-fa7131b.tar.gz /ignition-dracut-2c69925.tar.gz /ignition-f59a653.tar.gz +/ignition-dracut-0d09097.tar.gz diff --git a/0001-02_ignition_firstboot-Enable-networking-if-Ignition-.patch b/0001-02_ignition_firstboot-Enable-networking-if-Ignition-.patch deleted file mode 100644 index 9f71bee..0000000 --- a/0001-02_ignition_firstboot-Enable-networking-if-Ignition-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c62a108c79db49cecb9f323d6567d33a86fa6dc7 Mon Sep 17 00:00:00 2001 -From: Colin Walters -Date: Mon, 18 Mar 2019 13:54:56 +0000 -Subject: [PATCH] 02_ignition_firstboot: Enable networking if Ignition will run - -Today coreos-assembler is hardcoding the initramfs networking kargs to -do DHCP; this is problematic for e.g. bare metal where one often wants -to configure static networking. - -Let's only enable initramfs networking if we're doing Ignition. ---- - grub/02_ignition_firstboot | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/grub/02_ignition_firstboot b/grub/02_ignition_firstboot -index a154918..b4e926d 100755 ---- a/grub/02_ignition_firstboot -+++ b/grub/02_ignition_firstboot -@@ -9,5 +9,5 @@ search --set=bootpart --label boot - # to be used later on the kernel command line. - set ignition_firstboot="" - if [ -f "(${bootpart})/ignition.firstboot" ]; then -- set ignition_firstboot="ignition.firstboot" -+ set ignition_firstboot="ignition.firstboot rd.neednet=1 ip=dhcp" - fi --- -2.20.1 - diff --git a/0001-grub-find-boot-partition-and-use-it-directly.patch b/0001-grub-find-boot-partition-and-use-it-directly.patch deleted file mode 100644 index 9915095..0000000 --- a/0001-grub-find-boot-partition-and-use-it-directly.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 552edb5c959bb4a99be6cba15423bf357d016aa8 Mon Sep 17 00:00:00 2001 -From: Dusty Mabe -Date: Mon, 4 Mar 2019 16:42:28 -0500 -Subject: [PATCH] grub: find boot partition and use it directly - -On UEFI systems the grub $root might be the /boot/efi/ -partition and not the /boot/ partition so let's search -for the partition with the `boot` label and then detect -the file directly. - -Fixes #51 ---- - grub/02_ignition_firstboot | 10 ++++++++-- - 1 file changed, 8 insertions(+), 2 deletions(-) - -diff --git a/grub/02_ignition_firstboot b/grub/02_ignition_firstboot -index 9ceca5d..a154918 100755 ---- a/grub/02_ignition_firstboot -+++ b/grub/02_ignition_firstboot -@@ -1,7 +1,13 @@ - #!/bin/sh - exec tail -n +3 $0 -+# We store the file on the /boot/ partition so find the -+# boot partition. On UEFI this may different than the grub -+# $root so we search for it here. -+# https://github.com/coreos/ignition-dracut/issues/51 -+search --set=bootpart --label boot -+# Determine if this is a first boot and set the variable -+# to be used later on the kernel command line. - set ignition_firstboot="" --# Determine if this is a first boot. --if [ -f "/ignition.firstboot" ]; then -+if [ -f "(${bootpart})/ignition.firstboot" ]; then - set ignition_firstboot="ignition.firstboot" - fi --- -2.20.1 - diff --git a/dracut-ignition-not-in-path.patch b/dracut-ignition-not-in-path.patch deleted file mode 100644 index b336f28..0000000 --- a/dracut-ignition-not-in-path.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/dracut/30ignition/module-setup.sh b/dracut/30ignition/module-setup.sh -index 4b1c1aa..211da77 100755 ---- a/dracut/30ignition/module-setup.sh -+++ b/dracut/30ignition/module-setup.sh -@@ -11,7 +11,6 @@ install() { - chroot \ - groupadd \ - id \ -- ignition \ - mkfs.ext4 \ - mkfs.vfat \ - mkfs.xfs \ -@@ -32,6 +31,11 @@ install() { - # inst_script "$moddir/retry-umount.sh" \ - # "/usr/sbin/retry-umount" - -+ # Distro packaging is expected to install the ignition binary into the -+ # module directory. -+ inst_simple "$moddir/ignition" \ -+ "/usr/bin/ignition" -+ - inst_simple "$moddir/ignition-generator" \ - "$systemdutildir/system-generators/ignition-generator" - diff --git a/ignition.spec b/ignition.spec index 2436a8e..e160eed 100644 --- a/ignition.spec +++ b/ignition.spec @@ -64,27 +64,22 @@ %global dracutprovider_tld com %global dracutproject coreos %global dracutrepo ignition-dracut -# https://github.com/coreos/ignition-dracut +# https://github.com/coreos/ignition-dracut spec2x branch %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit 2c699252247fd4eb786b66db30a30b777dcd8468 +%global dracutcommit 0d09097f8bf9f3b0118d629f85c8f06f1becdc1f %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 0.31.0 -Release: 4.git%{shortcommit}%{?dist} +Release: 5.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz Source1: https://%{dracutprovider_prefix}/archive/%{dracutcommit}/%{dracutrepo}-%{dracutshortcommit}.tar.gz -Patch0: 0001-grub-find-boot-partition-and-use-it-directly.patch -Patch1: 0001-02_ignition_firstboot-Enable-networking-if-Ignition-.patch -# https://github.com/coreos/ignition-dracut/pull/56 -Patch2: dracut-ignition-not-in-path.patch - # For RHEL7 we'll want to specify gopath and list of arches since there is no # gopath or go_arches macro. We'll also want to make sure we pull in golang # 1.10 require golang >= 1.10 @@ -343,9 +338,6 @@ This package contains a tool for validating Ignition configurations. # unpack source1 (dracut modules) %setup -T -D -a 1 -q -n %{repo}-%{commit} cd %{dracutrepo}-%{dracutcommit} -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 mv LICENSE ../LICENSE.dracut @@ -501,6 +493,13 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Mon Mar 18 2019 Dusty Mabe - 0.31.0-5.gitf59a653 +- Use the spec2x branch of ignition-dracut upstream +- * Since ignition-dracut master has moved to supporting ignition + spec 3.x we are applying 2.x related fixes to the spec2x + branch in the ignition-dracut repo. + * Summary of backports: https://github.com/coreos/ignition-dracut/pull/58 + * Mon Mar 18 2019 Benjamin Gilbert - 0.31.0-4.gitf59a653 - Move dracut modules into main ignition package - Move ignition binary out of the PATH diff --git a/sources b/sources index 007cc47..d893a40 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ignition-f59a653.tar.gz) = fd198a24536c037c27ab99546e94027b08c3634724324b972828ee48f8ab9e1ba4ec1bd49d6aba6337381754cb30025c5311ab85da17c645eb7503b62e9529ff -SHA512 (ignition-dracut-2c69925.tar.gz) = 4df397a6b19cc8482353c4b38e4cee25690addd1713b66b8fc70c08858c5dbeb6ec4d0b1164f95f4a8a603889430967481c01632b8caf07cd56137901c1e18eb +SHA512 (ignition-dracut-0d09097.tar.gz) = 83723c46c147172aa56a08a169814e0f3afd5c244609c8104d72d3999a8a28c6a536584ffaea3522400ef094ca38a559fea986e81f565f4e0b2a258bbe829ff2 From cdb9cf4cdb5dbd126b8f865f97825eb53537af35 Mon Sep 17 00:00:00 2001 From: Michael Nguyen Date: Wed, 20 Mar 2019 15:54:30 -0400 Subject: [PATCH 042/172] Backport support for ignition vmware properties Backport support for guestinfo.ignition.config.data --- ...t-coreos.config.-and-ignition.config.patch | 93 +++++++++++++++++++ ignition.spec | 9 +- 2 files changed, 100 insertions(+), 2 deletions(-) create mode 100644 0001-support-coreos.config.-and-ignition.config.patch diff --git a/0001-support-coreos.config.-and-ignition.config.patch b/0001-support-coreos.config.-and-ignition.config.patch new file mode 100644 index 0000000..99b09f6 --- /dev/null +++ b/0001-support-coreos.config.-and-ignition.config.patch @@ -0,0 +1,93 @@ +From 41faa514b2598386c3a0c8a90ebd207e282cd1d5 Mon Sep 17 00:00:00 2001 +From: Michael Nguyen +Date: Fri, 1 Mar 2019 12:10:47 -0500 +Subject: [PATCH] support coreos.config.* and ignition.config.* + +This is backwards compatibility work for spec2x following the changes +made in #663 to make options more distribution neutral. + +ref: https://github.com/coreos/ignition/pull/663 +--- + internal/providers/cmdline/cmdline.go | 13 ++++++------- + internal/providers/vmware/vmware_amd64.go | 20 ++++++++++++++++---- + 2 files changed, 22 insertions(+), 11 deletions(-) + +diff --git a/internal/providers/cmdline/cmdline.go b/internal/providers/cmdline/cmdline.go +index 0bdba2d..1a393fb 100644 +--- a/internal/providers/cmdline/cmdline.go ++++ b/internal/providers/cmdline/cmdline.go +@@ -32,7 +32,8 @@ import ( + ) + + const ( +- cmdlineUrlFlag = "coreos.config.url" ++ cmdlineUrlFlagLegacy = "coreos.config.url" ++ cmdlineUrlFlag = "ignition.config.url" + ) + + func FetchConfig(f resource.Fetcher) (types.Config, report.Report, error) { +@@ -83,12 +84,10 @@ func parseCmdline(cmdline []byte) (url string) { + parts := strings.SplitN(strings.TrimSpace(arg), "=", 2) + key := parts[0] + +- if key != cmdlineUrlFlag { +- continue +- } +- +- if len(parts) == 2 { +- url = parts[1] ++ if key == cmdlineUrlFlagLegacy || key == cmdlineUrlFlag { ++ if len(parts) == 2 { ++ url = parts[1] ++ } + } + } + +diff --git a/internal/providers/vmware/vmware_amd64.go b/internal/providers/vmware/vmware_amd64.go +index e26baf0..9c0ffc7 100644 +--- a/internal/providers/vmware/vmware_amd64.go ++++ b/internal/providers/vmware/vmware_amd64.go +@@ -54,6 +54,8 @@ func fetchRawConfig(f resource.Fetcher) (config, error) { + + var ovfData string + var ovfEncoding string ++ var ovfDataKey string ++ var ovfEncodingKey string + + ovfEnv, err := info.String("ovfenv", "") + if err != nil { +@@ -65,17 +67,27 @@ func fetchRawConfig(f resource.Fetcher) (config, error) { + f.Logger.Warning("failed to parse OVF environment: %v. Continuing...", err) + } + +- ovfData = env.Properties["guestinfo.coreos.config.data"] +- ovfEncoding = env.Properties["guestinfo.coreos.config.data.encoding"] ++ if _, ok := env.Properties["guestinfo.coreos.config.data"]; ok { ++ ovfDataKey = "guestinfo.coreos.config.data" ++ ovfEncodingKey = "guestinfo.coreos.config.data.encoding" ++ } else if _, ok := env.Properties["guestinfo.ignition.config.data"]; ok { ++ ovfDataKey = "guestinfo.ignition.config.data" ++ ovfEncodingKey = "guestinfo.ignition.config.data.encoding" ++ } else { ++ f.Logger.Debug("failed to find guestinfo ignition properties") ++ } ++ ++ ovfData = env.Properties[ovfDataKey] ++ ovfEncoding = env.Properties[ovfEncodingKey] + } + +- data, err := info.String("coreos.config.data", ovfData) ++ data, err := info.String(ovfDataKey[len("guestinfo."):], ovfData) + if err != nil { + f.Logger.Debug("failed to fetch config: %v", err) + return config{}, err + } + +- encoding, err := info.String("coreos.config.data.encoding", ovfEncoding) ++ encoding, err := info.String(ovfEncodingKey[len("guestinfo."):], ovfEncoding) + if err != nil { + f.Logger.Debug("failed to fetch config encoding: %v", err) + return config{}, err +-- +2.19.1 + diff --git a/ignition.spec b/ignition.spec index e160eed..22b2608 100644 --- a/ignition.spec +++ b/ignition.spec @@ -73,13 +73,15 @@ Name: ignition Version: 0.31.0 -Release: 5.git%{shortcommit}%{?dist} +Release: 6.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz Source1: https://%{dracutprovider_prefix}/archive/%{dracutcommit}/%{dracutrepo}-%{dracutshortcommit}.tar.gz +Patch0: 0001-support-coreos.config.-and-ignition.config.patch + # For RHEL7 we'll want to specify gopath and list of arches since there is no # gopath or go_arches macro. We'll also want to make sure we pull in golang # 1.10 require golang >= 1.10 @@ -334,13 +336,13 @@ This package contains a tool for validating Ignition configurations. # setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html # unpack source0 and apply patches %setup -T -b 0 -q -n %{repo}-%{commit} +%patch0 -p1 # unpack source1 (dracut modules) %setup -T -D -a 1 -q -n %{repo}-%{commit} cd %{dracutrepo}-%{dracutcommit} mv LICENSE ../LICENSE.dracut - %build # Set up PWD as a proper import path for go mkdir -p src/%{provider}.%{provider_tld}/%{project} @@ -493,6 +495,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Wed Mar 20 2019 Michael Nguyen - 0.31.0-6.gitf59a653 +- Backport patch for supporting guestinfo.ignition.config.data + * Mon Mar 18 2019 Dusty Mabe - 0.31.0-5.gitf59a653 - Use the spec2x branch of ignition-dracut upstream - * Since ignition-dracut master has moved to supporting ignition From f1fa20fc1485ebef5a00d59bb695a3ec8ea60bdd Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Fri, 22 Mar 2019 17:28:54 -0400 Subject: [PATCH 043/172] backports from spec2x branches - ignition-dracut: Pull in latest from spec2x branch * grub: support overriding network kcmdline args - ignition: pull in subuid/subgid files patch from spec2x branch * stages/files: Also relabel subuid/subgid files --- .gitignore | 1 + ...les-Also-relabel-subuid-subgid-files.patch | 29 +++++++++++++++++++ ignition.spec | 12 ++++++-- sources | 2 +- 4 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 0001-stages-files-Also-relabel-subuid-subgid-files.patch diff --git a/.gitignore b/.gitignore index 2bd52d6..6b92fb6 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,4 @@ /ignition-dracut-2c69925.tar.gz /ignition-f59a653.tar.gz /ignition-dracut-0d09097.tar.gz +/ignition-dracut-73ec3fc.tar.gz diff --git a/0001-stages-files-Also-relabel-subuid-subgid-files.patch b/0001-stages-files-Also-relabel-subuid-subgid-files.patch new file mode 100644 index 0000000..6e62173 --- /dev/null +++ b/0001-stages-files-Also-relabel-subuid-subgid-files.patch @@ -0,0 +1,29 @@ +From 6e7a0683788906bb7ae21a708d5519481d6d058f Mon Sep 17 00:00:00 2001 +From: Jonathan Lebon +Date: Wed, 20 Mar 2019 16:14:29 -0400 +Subject: [PATCH] stages/files: Also relabel subuid/subgid files + +Those get touched by `useradd` and so we need relabeling if we added any +users or groups. + +Closes: #762 +--- + internal/exec/stages/files/passwd.go | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/internal/exec/stages/files/passwd.go b/internal/exec/stages/files/passwd.go +index 1ae0f02..58fde2e 100644 +--- a/internal/exec/stages/files/passwd.go ++++ b/internal/exec/stages/files/passwd.go +@@ -38,6 +38,8 @@ func (s *stage) createPasswd(config types.Config) error { + "/etc/group*", + "/etc/shadow*", + "/etc/gshadow*", ++ "/etc/subuid*", ++ "/etc/subgid*", + "/etc/.pwd.lock", + "/home", + "/root", +-- +2.20.1 + diff --git a/ignition.spec b/ignition.spec index 22b2608..dd7afda 100644 --- a/ignition.spec +++ b/ignition.spec @@ -67,13 +67,13 @@ # https://github.com/coreos/ignition-dracut spec2x branch %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit 0d09097f8bf9f3b0118d629f85c8f06f1becdc1f +%global dracutcommit 73ec3fcbc6b3bc3265586480e2d0ad76a0febb5f %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 0.31.0 -Release: 6.git%{shortcommit}%{?dist} +Release: 7.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -81,6 +81,7 @@ Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcomm Source1: https://%{dracutprovider_prefix}/archive/%{dracutcommit}/%{dracutrepo}-%{dracutshortcommit}.tar.gz Patch0: 0001-support-coreos.config.-and-ignition.config.patch +Patch1: 0001-stages-files-Also-relabel-subuid-subgid-files.patch # For RHEL7 we'll want to specify gopath and list of arches since there is no # gopath or go_arches macro. We'll also want to make sure we pull in golang @@ -337,6 +338,7 @@ This package contains a tool for validating Ignition configurations. # unpack source0 and apply patches %setup -T -b 0 -q -n %{repo}-%{commit} %patch0 -p1 +%patch1 -p1 # unpack source1 (dracut modules) %setup -T -D -a 1 -q -n %{repo}-%{commit} @@ -495,6 +497,12 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Mar 22 2019 Dusty Mabe - 0.31.0-7.gitf59a653 +- ignition-dracut: Pull in latest from spec2x branch + * grub: support overriding network kcmdline args +- ignition: pull in subuid/subgid files patch from spec2x branch + * stages/files: Also relabel subuid/subgid files + * Wed Mar 20 2019 Michael Nguyen - 0.31.0-6.gitf59a653 - Backport patch for supporting guestinfo.ignition.config.data diff --git a/sources b/sources index d893a40..541fe83 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ignition-f59a653.tar.gz) = fd198a24536c037c27ab99546e94027b08c3634724324b972828ee48f8ab9e1ba4ec1bd49d6aba6337381754cb30025c5311ab85da17c645eb7503b62e9529ff -SHA512 (ignition-dracut-0d09097.tar.gz) = 83723c46c147172aa56a08a169814e0f3afd5c244609c8104d72d3999a8a28c6a536584ffaea3522400ef094ca38a559fea986e81f565f4e0b2a258bbe829ff2 +SHA512 (ignition-dracut-73ec3fc.tar.gz) = 8583f9de45607c57dded4ece4b395e09a39b74b00da573e5915889025e577998239c16935159eb4651f5cbbeb42ae2e3562e826fef501cf9d8199e1faec212f0 From d551c56f90632fa5b60b58d2230070cb3ca38a17 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 27 Mar 2019 09:37:17 -0400 Subject: [PATCH 044/172] Bump to Ignition v2.0.0-alpha Go back to git master for ignition-dracut and import Ignition from git tag v2.0.0-alpha. This required adapting the build to using go modules by building with `-mod=vendor` and `GO111MODULE=on` and dropping the `GOPATH` hacks. We also drop `parsedeps.go` since Ignition moved away from glide. Instead introduce a new tiny `go-mods-to-bundled-provides.py` script that just parses `go.mod` and `vendor/modules.txt` to generate virtual `Provides`. The `parsedeps.go` approach also had a few issues that are fixed in the new script. Notably, it would only pick up on subpackages of dependent repos, and not the main packages (e.g. it skipped over `ajeddeloh/go-json`). And also, it was generating `Provides` at the version of the Ignition package (using `%{version}`), instead of the version of the bundled package itself. --- .gitignore | 2 + go-mods-to-bundled-provides.py | 84 ++++++++++++++++++ ignition.spec | 158 ++++++++++++++++----------------- notes.txt | 4 +- parsedeps.go | 47 ---------- sources | 4 +- 6 files changed, 165 insertions(+), 134 deletions(-) create mode 100755 go-mods-to-bundled-provides.py delete mode 100644 parsedeps.go diff --git a/.gitignore b/.gitignore index 6b92fb6..b2f7ea0 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,5 @@ /ignition-f59a653.tar.gz /ignition-dracut-0d09097.tar.gz /ignition-dracut-73ec3fc.tar.gz +/ignition-dracut-ec9a492.tar.gz +/ignition-906cf04.tar.gz diff --git a/go-mods-to-bundled-provides.py b/go-mods-to-bundled-provides.py new file mode 100755 index 0000000..ad4e380 --- /dev/null +++ b/go-mods-to-bundled-provides.py @@ -0,0 +1,84 @@ +#!/bin/python3 + +''' + Tiny dumb script that generates virtual bundled `Provides` from a repo that + uses go modules and vendoring. +''' + +import sys +import re + + +def main(): + repos = get_repos_from_go_mod() + print_provides_from_modules_txt(repos) + + +def get_repos_from_go_mod(): + repos = {} + in_reqs = False + for line in open('go.mod'): + line = line.strip() + if in_reqs and line.startswith(')'): + break + if not in_reqs: + if line.startswith('require ('): + in_reqs = True + continue + req = line.split() + + repo = req[0] + tag = req[1] + + repos[repo] = go_mod_tag_to_rpm_provides_version(tag) + + return repos + + +def go_mod_tag_to_rpm_provides_version(tag): + + # go.mod tags are either exact git tags, or may be "pseudo-versions". We + # want to convert these tags to something resembling a version string that + # RPM won't fail on. For more information, see + # https://golang.org/cmd/go/#hdr-Pseudo_versions and following sections. + + # trim off any +incompatible + if tag.endswith('+incompatible'): + tag = tag[:-len('+incompatible')] + + # git tags are normally of the form v$VERSION + if tag.startswith('v'): + tag = tag[1:] + + # is this a pseudo-version? e.g. v0.0.0-20181031085051-9002847aa142 + m = re.match("(.*)-([0-9]{14})-([a-f0-9]{12})", tag) + if m: + # rpm doesn't like multiple dashes in the version, so just merge the + # timestamp and the commit checksum into the "release" field + tag = f"{m.group(1)}-{m.group(2)}.git{m.group(3)}" + + return tag + + +def print_provides_from_modules_txt(repos): + + for line in open('vendor/modules.txt'): + if line.startswith('#'): + continue + gopkg = line.strip() + repo = lookup_repo_for_pkg(repos, gopkg) + if not repo: + # must be a pkg for tests only; ignore + continue + tag = repos[repo] + print(f"Provides: bundled(golang({gopkg})) = {tag}") + + +def lookup_repo_for_pkg(repos, gopkg): + for repo in repos: + if gopkg.startswith(repo): + return repo + + +if __name__ == '__main__': + sys.exit(main()) diff --git a/ignition.spec b/ignition.spec index dd7afda..8f8cde8 100644 --- a/ignition.spec +++ b/ignition.spec @@ -2,7 +2,7 @@ # gofed repo2spec --detect github.com/coreos/ignition --commit f7079129b8651ac51dba14c3af65692bb413c1dd --with-extra --with-build -f # With: # gofed/gofed:v1.0.1 docker image -# Modified by hand for 0.31.0 +# Modified by hand for v2.0.0-alpha # If any of the following macros should be set otherwise, # you can wrap any of them with the following conditions: @@ -49,7 +49,7 @@ # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix} -%global commit f59a653629be8b1825ed4ff2f9e3d21aa87bd85a +%global commit 906cf047ba84638088391a9e3badeea0743626a7 %global shortcommit %(c=%{commit}; echo ${c:0:7}) # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these @@ -67,22 +67,19 @@ # https://github.com/coreos/ignition-dracut spec2x branch %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit 73ec3fcbc6b3bc3265586480e2d0ad76a0febb5f +%global dracutcommit ec9a492ad250cb713c1580c2e8825fe5bb48864b %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition -Version: 0.31.0 -Release: 7.git%{shortcommit}%{?dist} +Version: 2.0.0 +Release: alpha.1.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz Source1: https://%{dracutprovider_prefix}/archive/%{dracutcommit}/%{dracutrepo}-%{dracutshortcommit}.tar.gz -Patch0: 0001-support-coreos.config.-and-ignition.config.patch -Patch1: 0001-stages-files-Also-relabel-subuid-subgid-files.patch - # For RHEL7 we'll want to specify gopath and list of arches since there is no # gopath or go_arches macro. We'll also want to make sure we pull in golang # 1.10 require golang >= 1.10 @@ -134,45 +131,54 @@ BuildRequires: golang(github.com/vincent-petithory/dataurl) BuildRequires: golang(github.com/vmware/vmw-ovflib) %endif -# Main package Provides (generated with parsedeps.go | sort) -%if 0%{?with_bundled} -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = %{version}-c861d27d0304a79f727e9a8a4e2ac1e74602fdc0 -Provides: bundled(golang(github.com/coreos/go-semver/semver)) = %{version}-294930c1e79c64e7dbe360054274fdad492c8cf5 -Provides: bundled(golang(github.com/coreos/go-systemd/dbus)) = %{version}-9002847aa1425fb6ac49077c0a630b3b67e0fbfd -Provides: bundled(golang(github.com/coreos/go-systemd/unit)) = %{version}-9002847aa1425fb6ac49077c0a630b3b67e0fbfd -Provides: bundled(golang(github.com/pin/tftp/netascii)) = %{version}-9ea92f6b1029bc1bf3072bba195c84bb9b0370e3 -Provides: bundled(golang(github.com/sigma/vmw-guestinfo/rpcvmx)) = %{version}-95dd4126d6e8b4ef1970b3f3fe2e8cdd470d2903 -Provides: bundled(golang(github.com/sigma/vmw-guestinfo/vmcheck)) = %{version}-95dd4126d6e8b4ef1970b3f3fe2e8cdd470d2903 -Provides: bundled(golang(github.com/vmware/vmw-guestinfo/bdoor)) = %{version}-25eff159a728be87e103a0b8045e08273f4dbec4 -Provides: bundled(golang(github.com/vmware/vmw-guestinfo/message)) = %{version}-25eff159a728be87e103a0b8045e08273f4dbec4 -Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcout)) = %{version}-25eff159a728be87e103a0b8045e08273f4dbec4 -Provides: bundled(golang(go4.org/errorutil)) = %{version}-03efcb870d84809319ea509714dd6d19a1498483 +# Main package Provides (generated with go-mods-to-bundled-provides.py | sort) +%if 0%{?with_bundled} +Provides: bundled(golang(github.com/ajeddeloh/go-json)) = 0.0.0-20160803184958.git73d058cf8437 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.8.39 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.8.39 +Provides: bundled(golang(github.com/coreos/go-semver/semver)) = 0.1.0 +Provides: bundled(golang(github.com/coreos/go-systemd/dbus)) = 0.0.0-20181031085051.git9002847aa142 +Provides: bundled(golang(github.com/coreos/go-systemd/unit)) = 0.0.0-20181031085051.git9002847aa142 +Provides: bundled(golang(github.com/godbus/dbus)) = 0.0.0-20181025153459.git66d97aec3384 +Provides: bundled(golang(github.com/go-ini/ini)) = 1.25.4 +Provides: bundled(golang(github.com/jmespath/go-jmespath)) = 0.0.0-20160202185014.git0b12d6b521d8 +Provides: bundled(golang(github.com/pborman/uuid)) = 0.0.0-20170612153648.gite790cca94e6c +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/sigma/bdoor)) = 0.0.0-20160202064022.gitbabf2a4017b0 +Provides: bundled(golang(github.com/sigma/vmw-guestinfo/rpcvmx)) = 0.0.0-20160204083807.git95dd4126d6e8 +Provides: bundled(golang(github.com/sigma/vmw-guestinfo/vmcheck)) = 0.0.0-20160204083807.git95dd4126d6e8 +Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.3.0 +Provides: bundled(golang(github.com/vincent-petithory/dataurl)) = 0.0.0-20160330182126.git9a301d65acbb +Provides: bundled(golang(github.com/vmware/vmw-guestinfo/bdoor)) = 0.0.0-20170707015358.git25eff159a728 +Provides: bundled(golang(github.com/vmware/vmw-guestinfo/message)) = 0.0.0-20170707015358.git25eff159a728 +Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcout)) = 0.0.0-20170707015358.git25eff159a728 +Provides: bundled(golang(github.com/vmware/vmw-ovflib)) = 0.0.0-20170608004843.git1f217b9dc714 %endif @@ -237,28 +243,25 @@ Requires: golang(github.com/vincent-petithory/dataurl) Requires: golang(github.com/vmware/vmw-ovflib) # devel subpackage Provides (sorted) +Provides: golang(%{import_path}/config/merge) = %{version}-%{release} Provides: golang(%{import_path}/config/shared/errors) = %{version}-%{release} Provides: golang(%{import_path}/config/shared/validations) = %{version}-%{release} Provides: golang(%{import_path}/config/shared) = %{version}-%{release} +Provides: golang(%{import_path}/config/translate/tests/pkga) = %{version}-%{release} +Provides: golang(%{import_path}/config/translate/tests/pkgb) = %{version}-%{release} +Provides: golang(%{import_path}/config/translate) = %{version}-%{release} Provides: golang(%{import_path}/config/util) = %{version}-%{release} -Provides: golang(%{import_path}/config/v1/types) = %{version}-%{release} -Provides: golang(%{import_path}/config/v1) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_0/types) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_0) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_1/types) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_1) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_2/types) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_2) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_3_experimental/types) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_3_experimental) = %{version}-%{release} +Provides: golang(%{import_path}/config/v3_0/types) = %{version}-%{release} +Provides: golang(%{import_path}/config/v3_0) = %{version}-%{release} Provides: golang(%{import_path}/config/validate/astjson) = %{version}-%{release} Provides: golang(%{import_path}/config/validate/astnode) = %{version}-%{release} Provides: golang(%{import_path}/config/validate/report) = %{version}-%{release} +Provides: golang(%{import_path}/config/validate/util) = %{version}-%{release} Provides: golang(%{import_path}/config/validate) = %{version}-%{release} +Provides: golang(%{import_path}/config) = %{version}-%{release} Provides: golang(%{import_path}/tests/negative/files) = %{version}-%{release} Provides: golang(%{import_path}/tests/negative/filesystems) = %{version}-%{release} Provides: golang(%{import_path}/tests/negative/general) = %{version}-%{release} -Provides: golang(%{import_path}/tests/negative/networkd) = %{version}-%{release} Provides: golang(%{import_path}/tests/negative/partitions) = %{version}-%{release} Provides: golang(%{import_path}/tests/negative/regression) = %{version}-%{release} Provides: golang(%{import_path}/tests/negative/security) = %{version}-%{release} @@ -266,8 +269,6 @@ Provides: golang(%{import_path}/tests/negative/timeouts) = %{version}-%{rel Provides: golang(%{import_path}/tests/positive/files) = %{version}-%{release} Provides: golang(%{import_path}/tests/positive/filesystems) = %{version}-%{release} Provides: golang(%{import_path}/tests/positive/general) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/networkd) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/oem) = %{version}-%{release} Provides: golang(%{import_path}/tests/positive/partitions) = %{version}-%{release} Provides: golang(%{import_path}/tests/positive/passwd) = %{version}-%{release} Provides: golang(%{import_path}/tests/positive/regression) = %{version}-%{release} @@ -276,6 +277,7 @@ Provides: golang(%{import_path}/tests/positive/systemd) = %{version}-%{rele Provides: golang(%{import_path}/tests/positive/timeouts) = %{version}-%{release} Provides: golang(%{import_path}/tests/register) = %{version}-%{release} Provides: golang(%{import_path}/tests/registry) = %{version}-%{release} +Provides: golang(%{import_path}/tests/servers) = %{version}-%{release} Provides: golang(%{import_path}/tests/types) = %{version}-%{release} Provides: golang(%{import_path}/tests) = %{version}-%{release} @@ -337,8 +339,6 @@ This package contains a tool for validating Ignition configurations. # setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html # unpack source0 and apply patches %setup -T -b 0 -q -n %{repo}-%{commit} -%patch0 -p1 -%patch1 -p1 # unpack source1 (dracut modules) %setup -T -D -a 1 -q -n %{repo}-%{commit} @@ -350,19 +350,16 @@ mv LICENSE ../LICENSE.dracut mkdir -p src/%{provider}.%{provider_tld}/%{project} ln -s ../../../ src/%{import_path} -%if ! 0%{?with_bundled} -export GOPATH=$(pwd):%{gopath} -%else -# No dependency directories so far -export GOPATH=$(pwd):%{gopath} -%endif - export LDFLAGS=%{ldflags} # Tell ignition where to find chroot binary export LDFLAGS+=' -X github.com/coreos/ignition/internal/distro.chrootCmd=%{_sbindir}/chroot ' # Enable SELinux relabeling export LDFLAGS+=' -X github.com/coreos/ignition/internal/distro.selinuxRelabel=true ' +# Modules, baby! +export GO111MODULE=on +export GOFLAGS='-mod=vendor' + echo "Building ignition..." %gobuild -o ./ignition %{import_path}/internal @@ -376,7 +373,6 @@ install -d -p %{buildroot}/%{dracutlibdir}/modules.d install -d -p %{buildroot}/%{_prefix}/lib/systemd/system install -d -p %{buildroot}/%{_sysconfdir}/grub.d pushd %{dracutrepo}-%{dracutcommit} >/dev/null -rm dracut/README.txt cp -r dracut/* %{buildroot}/%{dracutlibdir}/modules.d/ install -m 0644 -t %{buildroot}/%{_prefix}/lib/systemd/system/ systemd/* install -m 0755 -t %{buildroot}/%{_sysconfdir}/grub.d/ grub/* @@ -446,20 +442,12 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %global gotest go test %endif -%gotest %{import_path}/config/v1 -%gotest %{import_path}/config/v1/types -%gotest %{import_path}/config/v2_0 -%gotest %{import_path}/config/v2_0/types -%gotest %{import_path}/config/v2_1 -%gotest %{import_path}/config/v2_1/types -%gotest %{import_path}/config/v2_2 -%gotest %{import_path}/config/v2_2/types -%gotest %{import_path}/config/v2_3 -%gotest %{import_path}/config/v2_3/types -%gotest %{import_path}/config/v2_4_experimental -%gotest %{import_path}/config/v2_4_experimental/types +%gotest %{import_path}/config +%gotest %{import_path}/config/merge +%gotest %{import_path}/config/translate +%gotest %{import_path}/config/v3_0 +%gotest %{import_path}/config/v3_0/types %gotest %{import_path}/config/validate -%gotest %{import_path}/internal/config %gotest %{import_path}/internal/exec/stages/files %gotest %{import_path}/internal/exec/util %gotest %{import_path}/internal/registry @@ -497,6 +485,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Wed Mar 27 2019 Jonathan Lebon - 2.0.0-alpha.1.git906cf04 +- New release 2.0.0-alpha +- ignition-dracut: Go back to master branch + * Fri Mar 22 2019 Dusty Mabe - 0.31.0-7.gitf59a653 - ignition-dracut: Pull in latest from spec2x branch * grub: support overriding network kcmdline args diff --git a/notes.txt b/notes.txt index 0786721..d97e49e 100644 --- a/notes.txt +++ b/notes.txt @@ -31,8 +31,8 @@ Spec file golang-github-coreos-ignition.spec at /home/vagrant/golang-github-core # go through and fix things up - see diff -# generate bundled provides by copying/using parsedeps.go to the ignition -# source folder and then running `go run parsedeps.go`. copy into spec file +# generate bundled provides by copying/using go-mods-to-bundled-provides.py to +# the ignition source folder and then running it. copy into spec file # should be done by gofed at some point - https://github.com/gofed/gofed/issues/42 # grab source tarball diff --git a/parsedeps.go b/parsedeps.go deleted file mode 100644 index ead0537..0000000 --- a/parsedeps.go +++ /dev/null @@ -1,47 +0,0 @@ -// Helper for parsing glide.lock file and spitting out -// bundled provides statements for an rpm spec file. -package main - -import ( - "fmt" - "io/ioutil" - "log" - "path" - - yaml "gopkg.in/yaml.v2" -) - -type Import struct { - Name string - Version string - Subpackages []string -} - -type Glide struct { - Hash string - Updated string - Imports []Import - TestImports []Import -} - -func main() { - yamlFile, err := ioutil.ReadFile("glide.lock") - if err != nil { - log.Fatal(err) - } - - var glide Glide - err = yaml.Unmarshal(yamlFile, &glide) - if err != nil { - log.Fatal(err) - } - - for _, imp := range glide.Imports { - // we need format like this: - // Provides: bundled(golang(github.com/coreos/go-oidc/oauth2)) = %{version}-5cf2aa52da8c574d3aa4458f471ad6ae2240fe6b - for _, subp := range imp.Subpackages { - name := path.Join(imp.Name, subp) - fmt.Printf("Provides: bundled(golang(%s)) = %s-%s\n", name, "%{version}", imp.Version) - } - } -} diff --git a/sources b/sources index 541fe83..95de5e2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-f59a653.tar.gz) = fd198a24536c037c27ab99546e94027b08c3634724324b972828ee48f8ab9e1ba4ec1bd49d6aba6337381754cb30025c5311ab85da17c645eb7503b62e9529ff -SHA512 (ignition-dracut-73ec3fc.tar.gz) = 8583f9de45607c57dded4ece4b395e09a39b74b00da573e5915889025e577998239c16935159eb4651f5cbbeb42ae2e3562e826fef501cf9d8199e1faec212f0 +SHA512 (ignition-dracut-ec9a492.tar.gz) = 5875816d02061f1b43f267aaed8fee22c177ddb94ae6cf5bbf2588b55eab1198dcaf9d028733c4d48735e68929b5029844886e38d092426c34867da2dc6b2017 +SHA512 (ignition-906cf04.tar.gz) = df203ac05a06089b9b5db52627e139c8a0a5b54e60fc67a4d6eeac869a5170ae710f5e7fa3a92ccea8e440a1b1d88da6202d7d4910572d0e747b0cce695eaa60 From 0b9a765df3dcf5671367322ce3111c0e3559cee9 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Wed, 27 Mar 2019 18:23:49 -0400 Subject: [PATCH 045/172] Drop old patch files --- ...les-Also-relabel-subuid-subgid-files.patch | 29 ------ ...t-coreos.config.-and-ignition.config.patch | 93 ------------------- 2 files changed, 122 deletions(-) delete mode 100644 0001-stages-files-Also-relabel-subuid-subgid-files.patch delete mode 100644 0001-support-coreos.config.-and-ignition.config.patch diff --git a/0001-stages-files-Also-relabel-subuid-subgid-files.patch b/0001-stages-files-Also-relabel-subuid-subgid-files.patch deleted file mode 100644 index 6e62173..0000000 --- a/0001-stages-files-Also-relabel-subuid-subgid-files.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 6e7a0683788906bb7ae21a708d5519481d6d058f Mon Sep 17 00:00:00 2001 -From: Jonathan Lebon -Date: Wed, 20 Mar 2019 16:14:29 -0400 -Subject: [PATCH] stages/files: Also relabel subuid/subgid files - -Those get touched by `useradd` and so we need relabeling if we added any -users or groups. - -Closes: #762 ---- - internal/exec/stages/files/passwd.go | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/internal/exec/stages/files/passwd.go b/internal/exec/stages/files/passwd.go -index 1ae0f02..58fde2e 100644 ---- a/internal/exec/stages/files/passwd.go -+++ b/internal/exec/stages/files/passwd.go -@@ -38,6 +38,8 @@ func (s *stage) createPasswd(config types.Config) error { - "/etc/group*", - "/etc/shadow*", - "/etc/gshadow*", -+ "/etc/subuid*", -+ "/etc/subgid*", - "/etc/.pwd.lock", - "/home", - "/root", --- -2.20.1 - diff --git a/0001-support-coreos.config.-and-ignition.config.patch b/0001-support-coreos.config.-and-ignition.config.patch deleted file mode 100644 index 99b09f6..0000000 --- a/0001-support-coreos.config.-and-ignition.config.patch +++ /dev/null @@ -1,93 +0,0 @@ -From 41faa514b2598386c3a0c8a90ebd207e282cd1d5 Mon Sep 17 00:00:00 2001 -From: Michael Nguyen -Date: Fri, 1 Mar 2019 12:10:47 -0500 -Subject: [PATCH] support coreos.config.* and ignition.config.* - -This is backwards compatibility work for spec2x following the changes -made in #663 to make options more distribution neutral. - -ref: https://github.com/coreos/ignition/pull/663 ---- - internal/providers/cmdline/cmdline.go | 13 ++++++------- - internal/providers/vmware/vmware_amd64.go | 20 ++++++++++++++++---- - 2 files changed, 22 insertions(+), 11 deletions(-) - -diff --git a/internal/providers/cmdline/cmdline.go b/internal/providers/cmdline/cmdline.go -index 0bdba2d..1a393fb 100644 ---- a/internal/providers/cmdline/cmdline.go -+++ b/internal/providers/cmdline/cmdline.go -@@ -32,7 +32,8 @@ import ( - ) - - const ( -- cmdlineUrlFlag = "coreos.config.url" -+ cmdlineUrlFlagLegacy = "coreos.config.url" -+ cmdlineUrlFlag = "ignition.config.url" - ) - - func FetchConfig(f resource.Fetcher) (types.Config, report.Report, error) { -@@ -83,12 +84,10 @@ func parseCmdline(cmdline []byte) (url string) { - parts := strings.SplitN(strings.TrimSpace(arg), "=", 2) - key := parts[0] - -- if key != cmdlineUrlFlag { -- continue -- } -- -- if len(parts) == 2 { -- url = parts[1] -+ if key == cmdlineUrlFlagLegacy || key == cmdlineUrlFlag { -+ if len(parts) == 2 { -+ url = parts[1] -+ } - } - } - -diff --git a/internal/providers/vmware/vmware_amd64.go b/internal/providers/vmware/vmware_amd64.go -index e26baf0..9c0ffc7 100644 ---- a/internal/providers/vmware/vmware_amd64.go -+++ b/internal/providers/vmware/vmware_amd64.go -@@ -54,6 +54,8 @@ func fetchRawConfig(f resource.Fetcher) (config, error) { - - var ovfData string - var ovfEncoding string -+ var ovfDataKey string -+ var ovfEncodingKey string - - ovfEnv, err := info.String("ovfenv", "") - if err != nil { -@@ -65,17 +67,27 @@ func fetchRawConfig(f resource.Fetcher) (config, error) { - f.Logger.Warning("failed to parse OVF environment: %v. Continuing...", err) - } - -- ovfData = env.Properties["guestinfo.coreos.config.data"] -- ovfEncoding = env.Properties["guestinfo.coreos.config.data.encoding"] -+ if _, ok := env.Properties["guestinfo.coreos.config.data"]; ok { -+ ovfDataKey = "guestinfo.coreos.config.data" -+ ovfEncodingKey = "guestinfo.coreos.config.data.encoding" -+ } else if _, ok := env.Properties["guestinfo.ignition.config.data"]; ok { -+ ovfDataKey = "guestinfo.ignition.config.data" -+ ovfEncodingKey = "guestinfo.ignition.config.data.encoding" -+ } else { -+ f.Logger.Debug("failed to find guestinfo ignition properties") -+ } -+ -+ ovfData = env.Properties[ovfDataKey] -+ ovfEncoding = env.Properties[ovfEncodingKey] - } - -- data, err := info.String("coreos.config.data", ovfData) -+ data, err := info.String(ovfDataKey[len("guestinfo."):], ovfData) - if err != nil { - f.Logger.Debug("failed to fetch config: %v", err) - return config{}, err - } - -- encoding, err := info.String("coreos.config.data.encoding", ovfEncoding) -+ encoding, err := info.String(ovfEncodingKey[len("guestinfo."):], ovfEncoding) - if err != nil { - f.Logger.Debug("failed to fetch config encoding: %v", err) - return config{}, err --- -2.19.1 - From edf3b2635a72bc86e8eaecfe8578a8eb9526d56d Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Wed, 27 Mar 2019 18:27:16 -0400 Subject: [PATCH 046/172] Backport fix for SELinux relabeling of systemd units --- ...x-unit-relabeling-to-exclude-DestDir.patch | 77 +++++++++++++++++++ ignition.spec | 8 +- 2 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 0001-stages-files-fix-unit-relabeling-to-exclude-DestDir.patch diff --git a/0001-stages-files-fix-unit-relabeling-to-exclude-DestDir.patch b/0001-stages-files-fix-unit-relabeling-to-exclude-DestDir.patch new file mode 100644 index 0000000..8aaab11 --- /dev/null +++ b/0001-stages-files-fix-unit-relabeling-to-exclude-DestDir.patch @@ -0,0 +1,77 @@ +From 5d57d6107a56fecfe9b6c8bb1a06f2dd1889a7e0 Mon Sep 17 00:00:00 2001 +From: Benjamin Gilbert +Date: Wed, 27 Mar 2019 17:29:15 -0400 +Subject: [PATCH] stages/files: fix unit relabeling to exclude DestDir + +Non-runtime units and dropins need to be relabeled relative to DestDir, +since relabeling happens in the real root. + +e42ecb08f9b5 addressed this for files. +--- + internal/exec/stages/files/units.go | 22 ++++++++++++++++++++-- + 1 file changed, 20 insertions(+), 2 deletions(-) + +diff --git a/internal/exec/stages/files/units.go b/internal/exec/stages/files/units.go +index 98c0797..c73141c 100644 +--- a/internal/exec/stages/files/units.go ++++ b/internal/exec/stages/files/units.go +@@ -15,7 +15,9 @@ + package files + + import ( ++ "fmt" + "path/filepath" ++ "strings" + + "github.com/coreos/ignition/config/v3_0/types" + "github.com/coreos/ignition/internal/distro" +@@ -85,6 +87,14 @@ func (s *stage) writeSystemdUnit(unit types.Unit, runtime bool) error { + s.Logger.Crit("error converting systemd dropin: %v", err) + return err + } ++ relabelPath := f.Node.Path ++ if !runtime { ++ // trim off prefix since this needs to be relative to the sysroot ++ if !strings.HasPrefix(f.Node.Path, s.DestDir) { ++ panic(fmt.Sprintf("Dropin path %s isn't under prefix %s", f.Node.Path, s.DestDir)) ++ } ++ relabelPath = f.Node.Path[len(s.DestDir):] ++ } + if err := s.Logger.LogOp( + func() error { return u.PerformFetch(f) }, + "writing systemd drop-in %q at %q", dropin.Name, f.Node.Path, +@@ -92,7 +102,7 @@ func (s *stage) writeSystemdUnit(unit types.Unit, runtime bool) error { + return err + } + if !relabeledDropinDir { +- s.relabel(filepath.Dir("/" + f.Node.Path)) ++ s.relabel(filepath.Dir(relabelPath)) + relabeledDropinDir = true + } + } +@@ -106,13 +116,21 @@ func (s *stage) writeSystemdUnit(unit types.Unit, runtime bool) error { + s.Logger.Crit("error converting unit: %v", err) + return err + } ++ relabelPath := f.Node.Path ++ if !runtime { ++ // trim off prefix since this needs to be relative to the sysroot ++ if !strings.HasPrefix(f.Node.Path, s.DestDir) { ++ panic(fmt.Sprintf("Unit path %s isn't under prefix %s", f.Node.Path, s.DestDir)) ++ } ++ relabelPath = f.Node.Path[len(s.DestDir):] ++ } + if err := s.Logger.LogOp( + func() error { return u.PerformFetch(f) }, + "writing unit %q at %q", unit.Name, f.Node.Path, + ); err != nil { + return err + } +- s.relabel("/" + f.Node.Path) ++ s.relabel(relabelPath) + + return nil + }, "processing unit %q", unit.Name) +-- +2.20.1 + diff --git a/ignition.spec b/ignition.spec index 8f8cde8..b33a2b5 100644 --- a/ignition.spec +++ b/ignition.spec @@ -73,13 +73,15 @@ Name: ignition Version: 2.0.0 -Release: alpha.1.git%{shortcommit}%{?dist} +Release: alpha.2.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz Source1: https://%{dracutprovider_prefix}/archive/%{dracutcommit}/%{dracutrepo}-%{dracutshortcommit}.tar.gz +Patch0: 0001-stages-files-fix-unit-relabeling-to-exclude-DestDir.patch + # For RHEL7 we'll want to specify gopath and list of arches since there is no # gopath or go_arches macro. We'll also want to make sure we pull in golang # 1.10 require golang >= 1.10 @@ -339,6 +341,7 @@ This package contains a tool for validating Ignition configurations. # setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html # unpack source0 and apply patches %setup -T -b 0 -q -n %{repo}-%{commit} +%patch0 -p1 # unpack source1 (dracut modules) %setup -T -D -a 1 -q -n %{repo}-%{commit} @@ -485,6 +488,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Wed Mar 27 2019 Benjamin Gilbert - 2.0.0-alpha.2.git906cf04 +- Backport fix for SELinux relabeling of systemd units + * Wed Mar 27 2019 Jonathan Lebon - 2.0.0-alpha.1.git906cf04 - New release 2.0.0-alpha - ignition-dracut: Go back to master branch From 25e842489a243ca54aec50ef5d48848ee652e694 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Wed, 27 Mar 2019 18:27:36 -0400 Subject: [PATCH 047/172] Drop obsolete override of chroot path --- ignition.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ignition.spec b/ignition.spec index b33a2b5..5abc8a9 100644 --- a/ignition.spec +++ b/ignition.spec @@ -354,8 +354,6 @@ mkdir -p src/%{provider}.%{provider_tld}/%{project} ln -s ../../../ src/%{import_path} export LDFLAGS=%{ldflags} -# Tell ignition where to find chroot binary -export LDFLAGS+=' -X github.com/coreos/ignition/internal/distro.chrootCmd=%{_sbindir}/chroot ' # Enable SELinux relabeling export LDFLAGS+=' -X github.com/coreos/ignition/internal/distro.selinuxRelabel=true ' @@ -490,6 +488,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %changelog * Wed Mar 27 2019 Benjamin Gilbert - 2.0.0-alpha.2.git906cf04 - Backport fix for SELinux relabeling of systemd units +- Drop obsolete override of chroot path * Wed Mar 27 2019 Jonathan Lebon - 2.0.0-alpha.1.git906cf04 - New release 2.0.0-alpha From 6e12473d8ff8fa4f8aef9578e56d3a8317ca9e73 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Mon, 8 Apr 2019 16:28:36 -0400 Subject: [PATCH 048/172] Bump to ignition-dracut 85f2e65 There's lots of important fixes in there that we should get in. --- .gitignore | 1 + ignition.spec | 14 ++++++++++++-- sources | 2 +- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index b2f7ea0..5fbac46 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,4 @@ /ignition-dracut-73ec3fc.tar.gz /ignition-dracut-ec9a492.tar.gz /ignition-906cf04.tar.gz +/ignition-dracut-85f2e65.tar.gz diff --git a/ignition.spec b/ignition.spec index 5abc8a9..8d3ef04 100644 --- a/ignition.spec +++ b/ignition.spec @@ -67,13 +67,13 @@ # https://github.com/coreos/ignition-dracut spec2x branch %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit ec9a492ad250cb713c1580c2e8825fe5bb48864b +%global dracutcommit 85f2e6558c5e1651e2934849b8ad1d74a5c7ad74 %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 2.0.0 -Release: alpha.2.git%{shortcommit}%{?dist} +Release: alpha.3.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -486,6 +486,16 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Mon Apr 08 2019 Jonathan Lebon - 2.0.0-alpha.3.git906cf04 +- ignition-dracut: update to latest + * dracut/30ignition: link to RHBZ in ignition-complete + * dracut/30ignition: add OnFailure= for ExecStop= services + * dracut/30ignition: order ExecStop= units before initrd-switch-root.target + * dracut/30ignition: re-order directives in remount-sysroot + * dracut/30ignition: add missing Before= for mount unit + * dracut/30ignition: order ignition-complete.target before initrd.target + * module_setup: include cdrom rules for openstack + * Wed Mar 27 2019 Benjamin Gilbert - 2.0.0-alpha.2.git906cf04 - Backport fix for SELinux relabeling of systemd units - Drop obsolete override of chroot path diff --git a/sources b/sources index 95de5e2..094c778 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-dracut-ec9a492.tar.gz) = 5875816d02061f1b43f267aaed8fee22c177ddb94ae6cf5bbf2588b55eab1198dcaf9d028733c4d48735e68929b5029844886e38d092426c34867da2dc6b2017 +SHA512 (ignition-dracut-85f2e65.tar.gz) = b3bbfcc79c26154466cc472eab84b46b90d1847156616e3b2f85e5144b45836eb263f5e3d659ad590a43f949bad38f3760114c9f556274a76a7abf46e976a294 SHA512 (ignition-906cf04.tar.gz) = df203ac05a06089b9b5db52627e139c8a0a5b54e60fc67a4d6eeac869a5170ae710f5e7fa3a92ccea8e440a1b1d88da6202d7d4910572d0e747b0cce695eaa60 From cbc266db72fe955dc19deb450a28fc4840d4672d Mon Sep 17 00:00:00 2001 From: Andrew Jeddeloh Date: Mon, 29 Apr 2019 15:07:55 -0700 Subject: [PATCH 049/172] go-mods-to-bundled: use /usr/bin/env python Do not assume a python is /bin/python --- go-mods-to-bundled-provides.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go-mods-to-bundled-provides.py b/go-mods-to-bundled-provides.py index ad4e380..3de621a 100755 --- a/go-mods-to-bundled-provides.py +++ b/go-mods-to-bundled-provides.py @@ -1,4 +1,4 @@ -#!/bin/python3 +#!/usr/bin/env python3 ''' Tiny dumb script that generates virtual bundled `Provides` from a repo that From e25383b0a1d7e7b021d4a36d60ef8ce873d47959 Mon Sep 17 00:00:00 2001 From: Andrew Jeddeloh Date: Mon, 29 Apr 2019 14:07:18 -0700 Subject: [PATCH 050/172] *: update to 2.0.0-beta --- .gitignore | 1 + ...x-unit-relabeling-to-exclude-DestDir.patch | 77 ---------- ignition.spec | 139 ++++++++++-------- sources | 2 +- 4 files changed, 82 insertions(+), 137 deletions(-) delete mode 100644 0001-stages-files-fix-unit-relabeling-to-exclude-DestDir.patch diff --git a/.gitignore b/.gitignore index 5fbac46..bb7ae31 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ /ignition-dracut-ec9a492.tar.gz /ignition-906cf04.tar.gz /ignition-dracut-85f2e65.tar.gz +/ignition-910e6c6.tar.gz diff --git a/0001-stages-files-fix-unit-relabeling-to-exclude-DestDir.patch b/0001-stages-files-fix-unit-relabeling-to-exclude-DestDir.patch deleted file mode 100644 index 8aaab11..0000000 --- a/0001-stages-files-fix-unit-relabeling-to-exclude-DestDir.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 5d57d6107a56fecfe9b6c8bb1a06f2dd1889a7e0 Mon Sep 17 00:00:00 2001 -From: Benjamin Gilbert -Date: Wed, 27 Mar 2019 17:29:15 -0400 -Subject: [PATCH] stages/files: fix unit relabeling to exclude DestDir - -Non-runtime units and dropins need to be relabeled relative to DestDir, -since relabeling happens in the real root. - -e42ecb08f9b5 addressed this for files. ---- - internal/exec/stages/files/units.go | 22 ++++++++++++++++++++-- - 1 file changed, 20 insertions(+), 2 deletions(-) - -diff --git a/internal/exec/stages/files/units.go b/internal/exec/stages/files/units.go -index 98c0797..c73141c 100644 ---- a/internal/exec/stages/files/units.go -+++ b/internal/exec/stages/files/units.go -@@ -15,7 +15,9 @@ - package files - - import ( -+ "fmt" - "path/filepath" -+ "strings" - - "github.com/coreos/ignition/config/v3_0/types" - "github.com/coreos/ignition/internal/distro" -@@ -85,6 +87,14 @@ func (s *stage) writeSystemdUnit(unit types.Unit, runtime bool) error { - s.Logger.Crit("error converting systemd dropin: %v", err) - return err - } -+ relabelPath := f.Node.Path -+ if !runtime { -+ // trim off prefix since this needs to be relative to the sysroot -+ if !strings.HasPrefix(f.Node.Path, s.DestDir) { -+ panic(fmt.Sprintf("Dropin path %s isn't under prefix %s", f.Node.Path, s.DestDir)) -+ } -+ relabelPath = f.Node.Path[len(s.DestDir):] -+ } - if err := s.Logger.LogOp( - func() error { return u.PerformFetch(f) }, - "writing systemd drop-in %q at %q", dropin.Name, f.Node.Path, -@@ -92,7 +102,7 @@ func (s *stage) writeSystemdUnit(unit types.Unit, runtime bool) error { - return err - } - if !relabeledDropinDir { -- s.relabel(filepath.Dir("/" + f.Node.Path)) -+ s.relabel(filepath.Dir(relabelPath)) - relabeledDropinDir = true - } - } -@@ -106,13 +116,21 @@ func (s *stage) writeSystemdUnit(unit types.Unit, runtime bool) error { - s.Logger.Crit("error converting unit: %v", err) - return err - } -+ relabelPath := f.Node.Path -+ if !runtime { -+ // trim off prefix since this needs to be relative to the sysroot -+ if !strings.HasPrefix(f.Node.Path, s.DestDir) { -+ panic(fmt.Sprintf("Unit path %s isn't under prefix %s", f.Node.Path, s.DestDir)) -+ } -+ relabelPath = f.Node.Path[len(s.DestDir):] -+ } - if err := s.Logger.LogOp( - func() error { return u.PerformFetch(f) }, - "writing unit %q at %q", unit.Name, f.Node.Path, - ); err != nil { - return err - } -- s.relabel("/" + f.Node.Path) -+ s.relabel(relabelPath) - - return nil - }, "processing unit %q", unit.Name) --- -2.20.1 - diff --git a/ignition.spec b/ignition.spec index 8d3ef04..de5497d 100644 --- a/ignition.spec +++ b/ignition.spec @@ -48,13 +48,14 @@ %global repo ignition # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit 906cf047ba84638088391a9e3badeea0743626a7 +%global import_path %{provider_prefix}/v2 +%global commit 910e6c66b5f5c8f45ac0f4846af846f4715ae8e1 %global shortcommit %(c=%{commit}; echo ${c:0:7}) # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these # for consistency -%global ldflags ' -X github.com/coreos/ignition/internal/version.Raw=%{version} ' +# TODO remove -beta when stablizing +%global ldflags ' -X github.com/coreos/ignition/v2/internal/version.Raw=%{version}-beta ' %global buildflags %nil %global testflags %nil @@ -73,15 +74,13 @@ Name: ignition Version: 2.0.0 -Release: alpha.3.git%{shortcommit}%{?dist} +Release: beta.1.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz Source1: https://%{dracutprovider_prefix}/archive/%{dracutcommit}/%{dracutrepo}-%{dracutshortcommit}.tar.gz -Patch0: 0001-stages-files-fix-unit-relabeling-to-exclude-DestDir.patch - # For RHEL7 we'll want to specify gopath and list of arches since there is no # gopath or go_arches macro. We'll also want to make sure we pull in golang # 1.10 require golang >= 1.10 @@ -125,62 +124,75 @@ BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) BuildRequires: golang(github.com/coreos/go-semver/semver) BuildRequires: golang(github.com/coreos/go-systemd/dbus) BuildRequires: golang(github.com/coreos/go-systemd/unit) -BuildRequires: golang(github.com/pborman/uuid) +BuildRequires: golang(github.com/google/uuid) BuildRequires: golang(github.com/pin/tftp) -BuildRequires: golang(github.com/sigma/vmw-guestinfo/rpcvmx) -BuildRequires: golang(github.com/sigma/vmw-guestinfo/vmcheck) BuildRequires: golang(github.com/vincent-petithory/dataurl) +BuildRequires: golang(github.com/vmware/vmw-guestinfo/rpcvmx) +BuildRequires: golang(github.com/vmware/vmw-guestinfo/vmcheck) BuildRequires: golang(github.com/vmware/vmw-ovflib) +BuildRequires: golang(golang.org/x/net/http/httpproxy) %endif # Main package Provides (generated with go-mods-to-bundled-provides.py | sort) %if 0%{?with_bundled} Provides: bundled(golang(github.com/ajeddeloh/go-json)) = 0.0.0-20160803184958.git73d058cf8437 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.8.39 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.8.39 -Provides: bundled(golang(github.com/coreos/go-semver/semver)) = 0.1.0 -Provides: bundled(golang(github.com/coreos/go-systemd/dbus)) = 0.0.0-20181031085051.git9002847aa142 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/processcreds)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/csm)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3err)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.19.11 +Provides: bundled(golang(github.com/coreos/go-semver/semver)) = 0.3.0 Provides: bundled(golang(github.com/coreos/go-systemd/unit)) = 0.0.0-20181031085051.git9002847aa142 +Provides: bundled(golang(github.com/coreos/go-systemd/dbus)) = 0.0.0-20181031085051.git9002847aa142 Provides: bundled(golang(github.com/godbus/dbus)) = 0.0.0-20181025153459.git66d97aec3384 -Provides: bundled(golang(github.com/go-ini/ini)) = 1.25.4 -Provides: bundled(golang(github.com/jmespath/go-jmespath)) = 0.0.0-20160202185014.git0b12d6b521d8 -Provides: bundled(golang(github.com/pborman/uuid)) = 0.0.0-20170612153648.gite790cca94e6c +Provides: bundled(golang(github.com/google/uuid)) = 1.1.1 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/sigma/bdoor)) = 0.0.0-20160202064022.gitbabf2a4017b0 -Provides: bundled(golang(github.com/sigma/vmw-guestinfo/rpcvmx)) = 0.0.0-20160204083807.git95dd4126d6e8 -Provides: bundled(golang(github.com/sigma/vmw-guestinfo/vmcheck)) = 0.0.0-20160204083807.git95dd4126d6e8 Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.3.0 Provides: bundled(golang(github.com/vincent-petithory/dataurl)) = 0.0.0-20160330182126.git9a301d65acbb +Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcvmx)) = 0.0.0-20170707015358.git25eff159a728 +Provides: bundled(golang(github.com/vmware/vmw-guestinfo/vmcheck)) = 0.0.0-20170707015358.git25eff159a728 +Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcout)) = 0.0.0-20170707015358.git25eff159a728 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/bdoor)) = 0.0.0-20170707015358.git25eff159a728 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/message)) = 0.0.0-20170707015358.git25eff159a728 -Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcout)) = 0.0.0-20170707015358.git25eff159a728 Provides: bundled(golang(github.com/vmware/vmw-ovflib)) = 0.0.0-20170608004843.git1f217b9dc714 +Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.0.0-20190228165749.git92fc7df08ae7 +Provides: bundled(golang(golang.org/x/net/idna)) = 0.0.0-20190228165749.git92fc7df08ae7 +Provides: bundled(golang(golang.org/x/text/secure/bidirule)) = 0.3.0 +Provides: bundled(golang(golang.org/x/text/unicode/bidi)) = 0.3.0 +Provides: bundled(golang(golang.org/x/text/unicode/norm)) = 0.3.0 +Provides: bundled(golang(golang.org/x/text/transform)) = 0.3.0 %endif @@ -215,12 +227,13 @@ BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) BuildRequires: golang(github.com/coreos/go-semver/semver) BuildRequires: golang(github.com/coreos/go-systemd/dbus) BuildRequires: golang(github.com/coreos/go-systemd/unit) -BuildRequires: golang(github.com/pborman/uuid) +BuildRequires: golang(github.com/google/uuid) BuildRequires: golang(github.com/pin/tftp) -BuildRequires: golang(github.com/sigma/vmw-guestinfo/rpcvmx) -BuildRequires: golang(github.com/sigma/vmw-guestinfo/vmcheck) BuildRequires: golang(github.com/vincent-petithory/dataurl) +BuildRequires: golang(github.com/vmware/vmw-guestinfo/rpcvmx) +BuildRequires: golang(github.com/vmware/vmw-guestinfo/vmcheck) BuildRequires: golang(github.com/vmware/vmw-ovflib) +BuildRequires: golang(golang.org/x/net/http/httpproxy) %endif # devel subpackage Requires. This is basically the source code from @@ -237,34 +250,40 @@ Requires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) Requires: golang(github.com/coreos/go-semver/semver) Requires: golang(github.com/coreos/go-systemd/dbus) Requires: golang(github.com/coreos/go-systemd/unit) -Requires: golang(github.com/pborman/uuid) +Requires: golang(github.com/google/uuid) Requires: golang(github.com/pin/tftp) -Requires: golang(github.com/sigma/vmw-guestinfo/rpcvmx) -Requires: golang(github.com/sigma/vmw-guestinfo/vmcheck) Requires: golang(github.com/vincent-petithory/dataurl) +Requires: golang(github.com/vmware/vmw-guestinfo/rpcvmx) +Requires: golang(github.com/vmware/vmw-guestinfo/vmcheck) Requires: golang(github.com/vmware/vmw-ovflib) +Requires: golang(golang.org/x/net/http/httpproxy) # devel subpackage Provides (sorted) +Provides: golang(%{import_path}/config) = %{version}-%{release} Provides: golang(%{import_path}/config/merge) = %{version}-%{release} +Provides: golang(%{import_path}/config/shared) = %{version}-%{release} Provides: golang(%{import_path}/config/shared/errors) = %{version}-%{release} Provides: golang(%{import_path}/config/shared/validations) = %{version}-%{release} -Provides: golang(%{import_path}/config/shared) = %{version}-%{release} +Provides: golang(%{import_path}/config/translate) = %{version}-%{release} Provides: golang(%{import_path}/config/translate/tests/pkga) = %{version}-%{release} Provides: golang(%{import_path}/config/translate/tests/pkgb) = %{version}-%{release} -Provides: golang(%{import_path}/config/translate) = %{version}-%{release} Provides: golang(%{import_path}/config/util) = %{version}-%{release} -Provides: golang(%{import_path}/config/v3_0/types) = %{version}-%{release} Provides: golang(%{import_path}/config/v3_0) = %{version}-%{release} +Provides: golang(%{import_path}/config/v3_0/types) = %{version}-%{release} +Provides: golang(%{import_path}/config/v3_1_experimental) = %{version}-%{release} +Provides: golang(%{import_path}/config/v3_1_experimental/translate) = %{version}-%{release} +Provides: golang(%{import_path}/config/v3_1_experimental/types) = %{version}-%{release} +Provides: golang(%{import_path}/config/validate) = %{version}-%{release} Provides: golang(%{import_path}/config/validate/astjson) = %{version}-%{release} Provides: golang(%{import_path}/config/validate/astnode) = %{version}-%{release} Provides: golang(%{import_path}/config/validate/report) = %{version}-%{release} Provides: golang(%{import_path}/config/validate/util) = %{version}-%{release} -Provides: golang(%{import_path}/config/validate) = %{version}-%{release} -Provides: golang(%{import_path}/config) = %{version}-%{release} +Provides: golang(%{import_path}/tests) = %{version}-%{release} Provides: golang(%{import_path}/tests/negative/files) = %{version}-%{release} Provides: golang(%{import_path}/tests/negative/filesystems) = %{version}-%{release} Provides: golang(%{import_path}/tests/negative/general) = %{version}-%{release} Provides: golang(%{import_path}/tests/negative/partitions) = %{version}-%{release} +Provides: golang(%{import_path}/tests/negative/proxy) = %{version}-%{release} Provides: golang(%{import_path}/tests/negative/regression) = %{version}-%{release} Provides: golang(%{import_path}/tests/negative/security) = %{version}-%{release} Provides: golang(%{import_path}/tests/negative/timeouts) = %{version}-%{release} @@ -273,6 +292,7 @@ Provides: golang(%{import_path}/tests/positive/filesystems) = %{version}-%{ Provides: golang(%{import_path}/tests/positive/general) = %{version}-%{release} Provides: golang(%{import_path}/tests/positive/partitions) = %{version}-%{release} Provides: golang(%{import_path}/tests/positive/passwd) = %{version}-%{release} +Provides: golang(%{import_path}/tests/positive/proxy) = %{version}-%{release} Provides: golang(%{import_path}/tests/positive/regression) = %{version}-%{release} Provides: golang(%{import_path}/tests/positive/security) = %{version}-%{release} Provides: golang(%{import_path}/tests/positive/systemd) = %{version}-%{release} @@ -281,7 +301,6 @@ Provides: golang(%{import_path}/tests/register) = %{version}-%{release} Provides: golang(%{import_path}/tests/registry) = %{version}-%{release} Provides: golang(%{import_path}/tests/servers) = %{version}-%{release} Provides: golang(%{import_path}/tests/types) = %{version}-%{release} -Provides: golang(%{import_path}/tests) = %{version}-%{release} %description devel %{summary} @@ -341,7 +360,6 @@ This package contains a tool for validating Ignition configurations. # setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html # unpack source0 and apply patches %setup -T -b 0 -q -n %{repo}-%{commit} -%patch0 -p1 # unpack source1 (dracut modules) %setup -T -D -a 1 -q -n %{repo}-%{commit} @@ -351,7 +369,7 @@ mv LICENSE ../LICENSE.dracut %build # Set up PWD as a proper import path for go mkdir -p src/%{provider}.%{provider_tld}/%{project} -ln -s ../../../ src/%{import_path} +ln -s ../../../ src/%{provider_prefix} export LDFLAGS=%{ldflags} # Enable SELinux relabeling @@ -486,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Mon Apr 29 2019 Andrew Jeddeloh - 2.0.0-beta.1.git910e6c6 +- New release 2.0.0-beta + * Mon Apr 08 2019 Jonathan Lebon - 2.0.0-alpha.3.git906cf04 - ignition-dracut: update to latest * dracut/30ignition: link to RHBZ in ignition-complete diff --git a/sources b/sources index 094c778..22d325d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ignition-dracut-85f2e65.tar.gz) = b3bbfcc79c26154466cc472eab84b46b90d1847156616e3b2f85e5144b45836eb263f5e3d659ad590a43f949bad38f3760114c9f556274a76a7abf46e976a294 -SHA512 (ignition-906cf04.tar.gz) = df203ac05a06089b9b5db52627e139c8a0a5b54e60fc67a4d6eeac869a5170ae710f5e7fa3a92ccea8e440a1b1d88da6202d7d4910572d0e747b0cce695eaa60 +SHA512 (ignition-910e6c6.tar.gz) = cd9366db193051f97e0e6ca549e24244d706eab0f188448b2e3ceda3206f23a1902e644ec27e7420237bfab8941fb19a9ccd9ca9e655317ec9c3a6d5d9af2261 From 5df9bc031d8f05f5587496e7d2b7feca7c7fb426 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 3 May 2019 14:05:38 -0400 Subject: [PATCH 051/172] Bump to ignition-dracut df88988 For https://github.com/coreos/ignition-dracut/pull/76. --- .gitignore | 1 + ignition.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bb7ae31..efda753 100644 --- a/.gitignore +++ b/.gitignore @@ -21,3 +21,4 @@ /ignition-906cf04.tar.gz /ignition-dracut-85f2e65.tar.gz /ignition-910e6c6.tar.gz +/ignition-dracut-df88988.tar.gz diff --git a/ignition.spec b/ignition.spec index de5497d..c92c364 100644 --- a/ignition.spec +++ b/ignition.spec @@ -68,13 +68,13 @@ # https://github.com/coreos/ignition-dracut spec2x branch %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit 85f2e6558c5e1651e2934849b8ad1d74a5c7ad74 +%global dracutcommit df88988f2f0791ca9ea1e14298c8523501d980c5 %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 2.0.0 -Release: beta.1.git%{shortcommit}%{?dist} +Release: beta.2.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri May 03 2019 Jonathan Lebon - 2.0.0-beta.2.git910e6c6 +- Bump ignition-dracut dropping CoreOS integration files + * Mon Apr 29 2019 Andrew Jeddeloh - 2.0.0-beta.1.git910e6c6 - New release 2.0.0-beta diff --git a/sources b/sources index 22d325d..bbac7cb 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-dracut-85f2e65.tar.gz) = b3bbfcc79c26154466cc472eab84b46b90d1847156616e3b2f85e5144b45836eb263f5e3d659ad590a43f949bad38f3760114c9f556274a76a7abf46e976a294 +SHA512 (ignition-dracut-df88988.tar.gz) = cf94230ff6edd4bd0a817ad518d5cc2a08217a842ab47f391b78b1d75baa2803f076b4f3dbab04b86a653c69caf0eb7d8db4f101bbccdc8537d4f82c0c54a855 SHA512 (ignition-910e6c6.tar.gz) = cd9366db193051f97e0e6ca549e24244d706eab0f188448b2e3ceda3206f23a1902e644ec27e7420237bfab8941fb19a9ccd9ca9e655317ec9c3a6d5d9af2261 From cfcfe34c3607e9f5a0b1dfcc76be0c4d3f4621d1 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 3 May 2019 15:51:20 -0400 Subject: [PATCH 052/172] Adapt distro.selinuxRelabel flag path for v2/ move I.e. https://github.com/coreos/ignition/pull/791. Otherwise, this whole illusion of happy coexistence with SELinux all comes crashing down. --- ignition.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ignition.spec b/ignition.spec index c92c364..89d351c 100644 --- a/ignition.spec +++ b/ignition.spec @@ -74,7 +74,7 @@ Name: ignition Version: 2.0.0 -Release: beta.2.git%{shortcommit}%{?dist} +Release: beta.3.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -373,7 +373,7 @@ ln -s ../../../ src/%{provider_prefix} export LDFLAGS=%{ldflags} # Enable SELinux relabeling -export LDFLAGS+=' -X github.com/coreos/ignition/internal/distro.selinuxRelabel=true ' +export LDFLAGS+=' -X github.com/coreos/ignition/v2/internal/distro.selinuxRelabel=true ' # Modules, baby! export GO111MODULE=on @@ -504,6 +504,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri May 03 2019 Jonathan Lebon - 2.0.0-beta.3.git910e6c6 +- Adapt distro.selinuxRelabel flag path for v2/ move + * Fri May 03 2019 Jonathan Lebon - 2.0.0-beta.2.git910e6c6 - Bump ignition-dracut dropping CoreOS integration files From 5048cceb49d2852033a8b9cd54950c67f75e6749 Mon Sep 17 00:00:00 2001 From: Andrew Jeddeloh Date: Mon, 10 Jun 2019 12:57:15 -0700 Subject: [PATCH 053/172] spec: change non-generated bits --- ignition.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/ignition.spec b/ignition.spec index 89d351c..c173ec0 100644 --- a/ignition.spec +++ b/ignition.spec @@ -49,13 +49,12 @@ # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix}/v2 -%global commit 910e6c66b5f5c8f45ac0f4846af846f4715ae8e1 +%global commit 0c1da80127dcfcae86487929aea971a1442477d5 %global shortcommit %(c=%{commit}; echo ${c:0:7}) # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these # for consistency -# TODO remove -beta when stablizing -%global ldflags ' -X github.com/coreos/ignition/v2/internal/version.Raw=%{version}-beta ' +%global ldflags ' -X github.com/coreos/ignition/v2/internal/version.Raw=%{version} ' %global buildflags %nil %global testflags %nil @@ -74,7 +73,7 @@ Name: ignition Version: 2.0.0 -Release: beta.3.git%{shortcommit}%{?dist} +Release: 1.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -504,6 +503,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Mon Jun 10 2019 Andrew Jeddeloh - 2.0.0-1.git0c1da80 +- New release 2.0.0 + * Fri May 03 2019 Jonathan Lebon - 2.0.0-beta.3.git910e6c6 - Adapt distro.selinuxRelabel flag path for v2/ move From b3b10ac7e4832f0bd2c63637f7b5aadd3d75bbe9 Mon Sep 17 00:00:00 2001 From: Andrew Jeddeloh Date: Mon, 10 Jun 2019 13:42:54 -0700 Subject: [PATCH 054/172] spec: update generated bits of the spec --- ignition.spec | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/ignition.spec b/ignition.spec index c173ec0..41c2ae6 100644 --- a/ignition.spec +++ b/ignition.spec @@ -111,7 +111,6 @@ Obsoletes: ignition-dracut < 0.31.0-3 # Main rpm package BuildRequires %if ! 0%{?with_bundled} # Remaining dependencies not included in main packages (sorted) -BuildRequires: golang(github.com/ajeddeloh/go-json) BuildRequires: golang(github.com/aws/aws-sdk-go/aws) BuildRequires: golang(github.com/aws/aws-sdk-go/aws/awserr) BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials) @@ -123,6 +122,11 @@ BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) BuildRequires: golang(github.com/coreos/go-semver/semver) BuildRequires: golang(github.com/coreos/go-systemd/dbus) BuildRequires: golang(github.com/coreos/go-systemd/unit) +BuildRequires: golang(github.com/coreos/vcontext/json) +BuildRequires: golang(github.com/coreos/vcontext/path) +BuildRequires: golang(github.com/coreos/vcontext/report) +BuildRequires: golang(github.com/coreos/vcontext/tree) +BuildRequires: golang(github.com/coreos/vcontext/validate) BuildRequires: golang(github.com/google/uuid) BuildRequires: golang(github.com/pin/tftp) BuildRequires: golang(github.com/vincent-petithory/dataurl) @@ -134,7 +138,6 @@ BuildRequires: golang(golang.org/x/net/http/httpproxy) # Main package Provides (generated with go-mods-to-bundled-provides.py | sort) %if 0%{?with_bundled} -Provides: bundled(golang(github.com/ajeddeloh/go-json)) = 0.0.0-20160803184958.git73d058cf8437 Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.19.11 Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.19.11 Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.19.11 @@ -174,6 +177,11 @@ Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryu Provides: bundled(golang(github.com/coreos/go-semver/semver)) = 0.3.0 Provides: bundled(golang(github.com/coreos/go-systemd/unit)) = 0.0.0-20181031085051.git9002847aa142 Provides: bundled(golang(github.com/coreos/go-systemd/dbus)) = 0.0.0-20181031085051.git9002847aa142 +Provides: bundled(golang(github.com/coreos/vcontext/report)) = 0.0.0-20190529201340.git22b159166068 +Provides: bundled(golang(github.com/coreos/vcontext/path)) = 0.0.0-20190529201340.git22b159166068 +Provides: bundled(golang(github.com/coreos/vcontext/tree)) = 0.0.0-20190529201340.git22b159166068 +Provides: bundled(golang(github.com/coreos/vcontext/json)) = 0.0.0-20190529201340.git22b159166068 +Provides: bundled(golang(github.com/coreos/vcontext/validate)) = 0.0.0-20190529201340.git22b159166068 Provides: bundled(golang(github.com/godbus/dbus)) = 0.0.0-20181025153459.git66d97aec3384 Provides: bundled(golang(github.com/google/uuid)) = 1.1.1 Provides: bundled(golang(github.com/pin/tftp)) = 2.1.0 @@ -214,7 +222,6 @@ License: ASL 2.0 # devel subpackage BuildRequires %if 0%{?with_check} && ! 0%{?with_bundled} # These buildrequires are only for our tests (check) (sorted) -BuildRequires: golang(github.com/ajeddeloh/go-json) BuildRequires: golang(github.com/aws/aws-sdk-go/aws) BuildRequires: golang(github.com/aws/aws-sdk-go/aws/awserr) BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials) @@ -226,6 +233,11 @@ BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) BuildRequires: golang(github.com/coreos/go-semver/semver) BuildRequires: golang(github.com/coreos/go-systemd/dbus) BuildRequires: golang(github.com/coreos/go-systemd/unit) +BuildRequires: golang(github.com/coreos/vcontext/json) +BuildRequires: golang(github.com/coreos/vcontext/path) +BuildRequires: golang(github.com/coreos/vcontext/report) +BuildRequires: golang(github.com/coreos/vcontext/tree) +BuildRequires: golang(github.com/coreos/vcontext/validate) BuildRequires: golang(github.com/google/uuid) BuildRequires: golang(github.com/pin/tftp) BuildRequires: golang(github.com/vincent-petithory/dataurl) @@ -237,7 +249,6 @@ BuildRequires: golang(golang.org/x/net/http/httpproxy) # devel subpackage Requires. This is basically the source code from # all of the libraries that ignition imports during build. (sorted) -Requires: golang(github.com/ajeddeloh/go-json) Requires: golang(github.com/aws/aws-sdk-go/aws) Requires: golang(github.com/aws/aws-sdk-go/aws/awserr) Requires: golang(github.com/aws/aws-sdk-go/aws/credentials) @@ -249,6 +260,11 @@ Requires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) Requires: golang(github.com/coreos/go-semver/semver) Requires: golang(github.com/coreos/go-systemd/dbus) Requires: golang(github.com/coreos/go-systemd/unit) +Requires: golang(github.com/coreos/vcontext/json) +Requires: golang(github.com/coreos/vcontext/path) +Requires: golang(github.com/coreos/vcontext/report) +Requires: golang(github.com/coreos/vcontext/tree) +Requires: golang(github.com/coreos/vcontext/validate) Requires: golang(github.com/google/uuid) Requires: golang(github.com/pin/tftp) Requires: golang(github.com/vincent-petithory/dataurl) @@ -273,10 +289,6 @@ Provides: golang(%{import_path}/config/v3_1_experimental) = %{version}-%{re Provides: golang(%{import_path}/config/v3_1_experimental/translate) = %{version}-%{release} Provides: golang(%{import_path}/config/v3_1_experimental/types) = %{version}-%{release} Provides: golang(%{import_path}/config/validate) = %{version}-%{release} -Provides: golang(%{import_path}/config/validate/astjson) = %{version}-%{release} -Provides: golang(%{import_path}/config/validate/astnode) = %{version}-%{release} -Provides: golang(%{import_path}/config/validate/report) = %{version}-%{release} -Provides: golang(%{import_path}/config/validate/util) = %{version}-%{release} Provides: golang(%{import_path}/tests) = %{version}-%{release} Provides: golang(%{import_path}/tests/negative/files) = %{version}-%{release} Provides: golang(%{import_path}/tests/negative/filesystems) = %{version}-%{release} From a614d3e5a05cbc2788b0cba592a5ee96c9f4cd0a Mon Sep 17 00:00:00 2001 From: Andrew Jeddeloh Date: Mon, 10 Jun 2019 14:06:39 -0700 Subject: [PATCH 055/172] sources: add new sources for 2.0.0 --- .gitignore | 1 + sources | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index efda753..ba23c04 100644 --- a/.gitignore +++ b/.gitignore @@ -22,3 +22,4 @@ /ignition-dracut-85f2e65.tar.gz /ignition-910e6c6.tar.gz /ignition-dracut-df88988.tar.gz +/ignition-0c1da80.tar.gz diff --git a/sources b/sources index bbac7cb..11a96e4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ignition-dracut-df88988.tar.gz) = cf94230ff6edd4bd0a817ad518d5cc2a08217a842ab47f391b78b1d75baa2803f076b4f3dbab04b86a653c69caf0eb7d8db4f101bbccdc8537d4f82c0c54a855 -SHA512 (ignition-910e6c6.tar.gz) = cd9366db193051f97e0e6ca549e24244d706eab0f188448b2e3ceda3206f23a1902e644ec27e7420237bfab8941fb19a9ccd9ca9e655317ec9c3a6d5d9af2261 +SHA512 (ignition-0c1da80.tar.gz) = 7a40b03d3092fc9726be709729649e3de0ededbedee76da95f935bd51b568c0dfd833072217b2b0cce58d1502e51b55388acd8f176787ad73315bc30fa60e4c1 From 127a4b1ca3ab89e9ff58226b53021081928bbdd3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 09:23:03 +0000 Subject: [PATCH 056/172] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ignition.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index 41c2ae6..a7e3792 100644 --- a/ignition.spec +++ b/ignition.spec @@ -73,7 +73,7 @@ Name: ignition Version: 2.0.0 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -515,6 +515,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 2.0.0-2.git0c1da80 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Mon Jun 10 2019 Andrew Jeddeloh - 2.0.0-1.git0c1da80 - New release 2.0.0 From 6ebb45a48e830255604d1d37072b687c4e5b2e8b Mon Sep 17 00:00:00 2001 From: Andrew Jeddeloh Date: Wed, 24 Jul 2019 14:52:23 -0700 Subject: [PATCH 057/172] *: bump to Ignition 2.0.1 --- .gitignore | 1 + ignition.spec | 10 +++++++--- sources | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index ba23c04..200716e 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ /ignition-910e6c6.tar.gz /ignition-dracut-df88988.tar.gz /ignition-0c1da80.tar.gz +/ignition-e75cf24.tar.gz diff --git a/ignition.spec b/ignition.spec index a7e3792..3b7c8c0 100644 --- a/ignition.spec +++ b/ignition.spec @@ -49,7 +49,7 @@ # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix}/v2 -%global commit 0c1da80127dcfcae86487929aea971a1442477d5 +%global commit e75cf24183d7ebb86babf517e69fda6f3ca8f13d %global shortcommit %(c=%{commit}; echo ${c:0:7}) # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these @@ -72,8 +72,8 @@ Name: ignition -Version: 2.0.0 -Release: 2.git%{shortcommit}%{?dist} +Version: 2.0.1 +Release: 1.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -515,6 +515,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +======= +* Thu Jul 25 2019 Andrew Jeddeloh - 2.0.1-1.gite75cf24 +- New release 2.0.1 + * Thu Jul 25 2019 Fedora Release Engineering - 2.0.0-2.git0c1da80 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 11a96e4..9b559f5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ignition-dracut-df88988.tar.gz) = cf94230ff6edd4bd0a817ad518d5cc2a08217a842ab47f391b78b1d75baa2803f076b4f3dbab04b86a653c69caf0eb7d8db4f101bbccdc8537d4f82c0c54a855 -SHA512 (ignition-0c1da80.tar.gz) = 7a40b03d3092fc9726be709729649e3de0ededbedee76da95f935bd51b568c0dfd833072217b2b0cce58d1502e51b55388acd8f176787ad73315bc30fa60e4c1 +SHA512 (ignition-e75cf24.tar.gz) = 218359576953b886c87035ec3421c37b272ee68ecc2f210c5fb8e5b3a1bfb2dabafdeae9cf6259c064ed538d99ca3dbdfbc6f6a39df600dbe1844c02e9a69430 From 422cf8579bb6996ae5a16ae8f4bb4c969a1716ba Mon Sep 17 00:00:00 2001 From: Andrew Jeddeloh Date: Thu, 25 Jul 2019 11:08:49 -0700 Subject: [PATCH 058/172] ignition.spec: fix changelog This was causing fedpkg build to fail. --- ignition.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index 3b7c8c0..608a1ef 100644 --- a/ignition.spec +++ b/ignition.spec @@ -515,7 +515,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog -======= * Thu Jul 25 2019 Andrew Jeddeloh - 2.0.1-1.gite75cf24 - New release 2.0.1 From f83f249db4a391df96c6a1786488b2a402b96d75 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 16 Aug 2019 13:55:42 +0000 Subject: [PATCH 059/172] Update dracut for gpt fixes --- .gitignore | 1 + ignition.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 200716e..1a1934a 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /ignition-dracut-df88988.tar.gz /ignition-0c1da80.tar.gz /ignition-e75cf24.tar.gz +/ignition-dracut-343b886.tar.gz diff --git a/ignition.spec b/ignition.spec index 608a1ef..4febbbd 100644 --- a/ignition.spec +++ b/ignition.spec @@ -67,13 +67,13 @@ # https://github.com/coreos/ignition-dracut spec2x branch %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit df88988f2f0791ca9ea1e14298c8523501d980c5 +%global dracutcommit 343b886954fe8be02755d3690f627920e6123afd %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 2.0.1 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -515,6 +515,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Aug 16 2019 Colin Walters - 2.0.1-2.gite75cf24 +- Update dracut for gpt fixes + * Thu Jul 25 2019 Andrew Jeddeloh - 2.0.1-1.gite75cf24 - New release 2.0.1 diff --git a/sources b/sources index 9b559f5..99ceb2e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-dracut-df88988.tar.gz) = cf94230ff6edd4bd0a817ad518d5cc2a08217a842ab47f391b78b1d75baa2803f076b4f3dbab04b86a653c69caf0eb7d8db4f101bbccdc8537d4f82c0c54a855 SHA512 (ignition-e75cf24.tar.gz) = 218359576953b886c87035ec3421c37b272ee68ecc2f210c5fb8e5b3a1bfb2dabafdeae9cf6259c064ed538d99ca3dbdfbc6f6a39df600dbe1844c02e9a69430 +SHA512 (ignition-dracut-343b886.tar.gz) = d6bdf7c8cacd8cc20d82a4b0c50996bbe9821bce69ce1bd05433c5c470a7422aac4d4664446a39df654e14c915262e987b17031dae9150d5bd1eadf81fa5ad64 From a08755a3b9feb7d75b567fcdc7660003d72b95e8 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Fri, 16 Aug 2019 14:06:53 +0000 Subject: [PATCH 060/172] Fix files list --- ignition.spec | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ignition.spec b/ignition.spec index 4febbbd..1180c75 100644 --- a/ignition.spec +++ b/ignition.spec @@ -491,8 +491,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %files %license LICENSE LICENSE.dracut %doc README.md doc/ -%{dracutlibdir}/modules.d/30ignition -%{dracutlibdir}/modules.d/99journald-conf +%{dracutlibdir}/modules.d/* %{_sysconfdir}/grub.d/* %{_prefix}/lib/systemd/system/*.service From eb718b540d9b917592eb80dae9d412facb2b4e6d Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Sat, 21 Sep 2019 11:47:00 +0100 Subject: [PATCH 061/172] fix up arch deps for latest golang specs so all the right arches get built --- ignition.spec | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/ignition.spec b/ignition.spec index 1180c75..0964b64 100644 --- a/ignition.spec +++ b/ignition.spec @@ -73,27 +73,16 @@ Name: ignition Version: 2.0.1 -Release: 2.git%{shortcommit}%{?dist} +Release: 3.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz Source1: https://%{dracutprovider_prefix}/archive/%{dracutcommit}/%{dracutrepo}-%{dracutshortcommit}.tar.gz -# For RHEL7 we'll want to specify gopath and list of arches since there is no -# gopath or go_arches macro. We'll also want to make sure we pull in golang -# 1.10 require golang >= 1.10 -%if 0%{?rhel} <= 7 && 0%{?centos} == 0 %define gopath %{_datadir}/gocode -ExclusiveArch: x86_64 ppc64le aarch64 s390x +ExcludeArch: ppc64 BuildRequires: golang >= 1.10 -%else -# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} -# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} -%endif - # add non golang BuildRequires that weren't detected BuildRequires: libblkid-devel @@ -514,6 +503,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Sat Sep 21 2019 Peter Robinson 2.0.1-3.gite75cf24 +- Fix up arch dependencies for new golang specs + * Fri Aug 16 2019 Colin Walters - 2.0.1-2.gite75cf24 - Update dracut for gpt fixes From 3b622206f61756da9b60e3be679e7da006e5fc48 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 25 Sep 2019 20:38:39 +0000 Subject: [PATCH 062/172] Bump to latest in prep for rootfs redeploy work --- .gitignore | 2 ++ ignition.spec | 9 ++++++--- sources | 4 ++-- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 1a1934a..85cd434 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,5 @@ /ignition-0c1da80.tar.gz /ignition-e75cf24.tar.gz /ignition-dracut-343b886.tar.gz +/ignition-dracut-d63f76f.tar.gz +/ignition-641ec6a.tar.gz diff --git a/ignition.spec b/ignition.spec index 0964b64..3f804ac 100644 --- a/ignition.spec +++ b/ignition.spec @@ -49,7 +49,7 @@ # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix}/v2 -%global commit e75cf24183d7ebb86babf517e69fda6f3ca8f13d +%global commit 641ec6a44062f956bf1d46cf10824032a1996590 %global shortcommit %(c=%{commit}; echo ${c:0:7}) # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these @@ -67,13 +67,13 @@ # https://github.com/coreos/ignition-dracut spec2x branch %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit 343b886954fe8be02755d3690f627920e6123afd +%global dracutcommit d63f76f958fabe44474f207c41ca8da1e8ffcf2d %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 2.0.1 -Release: 3.git%{shortcommit}%{?dist} +Release: 4.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -503,6 +503,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Wed Sep 25 2019 Colin Walters - 2.0.1-4.git641ec6a +- Bump to latest in prep for rootfs redeploy work + * Sat Sep 21 2019 Peter Robinson 2.0.1-3.gite75cf24 - Fix up arch dependencies for new golang specs diff --git a/sources b/sources index 99ceb2e..70648f5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-e75cf24.tar.gz) = 218359576953b886c87035ec3421c37b272ee68ecc2f210c5fb8e5b3a1bfb2dabafdeae9cf6259c064ed538d99ca3dbdfbc6f6a39df600dbe1844c02e9a69430 -SHA512 (ignition-dracut-343b886.tar.gz) = d6bdf7c8cacd8cc20d82a4b0c50996bbe9821bce69ce1bd05433c5c470a7422aac4d4664446a39df654e14c915262e987b17031dae9150d5bd1eadf81fa5ad64 +SHA512 (ignition-dracut-d63f76f.tar.gz) = db0956f4cb5d18083e773a3762a05439da8f641616ba8a311bcaa75f35744caf068039d9190851aa7081ef6683a878f8e2d59e727f760203fb645576454add5d +SHA512 (ignition-641ec6a.tar.gz) = e5fb7e4f0977ea5c40f721401951c35753b03f7b076435b2ff56f6dd16c1cecfd874872294967d8a2b61ff934e46fd363b27d90d4aa143519d717262e43f16bd From 3c6023281c3bd115f899b2a03f932f4275e12bf3 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 31 Oct 2019 16:40:47 +0000 Subject: [PATCH 063/172] Update dracut --- .gitignore | 1 + ignition.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 85cd434..75caad6 100644 --- a/.gitignore +++ b/.gitignore @@ -27,3 +27,4 @@ /ignition-dracut-343b886.tar.gz /ignition-dracut-d63f76f.tar.gz /ignition-641ec6a.tar.gz +/ignition-dracut-3d08487.tar.gz diff --git a/ignition.spec b/ignition.spec index 3f804ac..3e668ac 100644 --- a/ignition.spec +++ b/ignition.spec @@ -67,13 +67,13 @@ # https://github.com/coreos/ignition-dracut spec2x branch %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit d63f76f958fabe44474f207c41ca8da1e8ffcf2d +%global dracutcommit 3d08487b6173d4e1ce875dc47fd7fd6fb3eaa628 %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 2.0.1 -Release: 4.git%{shortcommit}%{?dist} +Release: 5.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -503,6 +503,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Thu Oct 31 2019 Colin Walters - 2.0.1-5.git641ec6a +- Update dracut + * Wed Sep 25 2019 Colin Walters - 2.0.1-4.git641ec6a - Bump to latest in prep for rootfs redeploy work diff --git a/sources b/sources index 70648f5..6445fa0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-dracut-d63f76f.tar.gz) = db0956f4cb5d18083e773a3762a05439da8f641616ba8a311bcaa75f35744caf068039d9190851aa7081ef6683a878f8e2d59e727f760203fb645576454add5d +SHA512 (ignition-dracut-3d08487.tar.gz) = bdbda1185f60328c6957a3b4cce47e5999e8bf59d88b954abf0b811c4836d1654cae627b3067382806e7406262babc3805d9fb8dbabfb7b0548ecdf084cfa307 SHA512 (ignition-641ec6a.tar.gz) = e5fb7e4f0977ea5c40f721401951c35753b03f7b076435b2ff56f6dd16c1cecfd874872294967d8a2b61ff934e46fd363b27d90d4aa143519d717262e43f16bd From 3c5c0bc444096384ecb52e0da33e7529f16826c8 Mon Sep 17 00:00:00 2001 From: Allen Bai Date: Wed, 4 Dec 2019 17:09:36 -0500 Subject: [PATCH 064/172] Update dracut to latest spec2x Signed-off-by: Allen Bai --- .gitignore | 1 + ignition.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 75caad6..daf70ed 100644 --- a/.gitignore +++ b/.gitignore @@ -28,3 +28,4 @@ /ignition-dracut-d63f76f.tar.gz /ignition-641ec6a.tar.gz /ignition-dracut-3d08487.tar.gz +/ignition-dracut-8bf2cbd.tar.gz diff --git a/ignition.spec b/ignition.spec index 3e668ac..4bf924b 100644 --- a/ignition.spec +++ b/ignition.spec @@ -67,13 +67,13 @@ # https://github.com/coreos/ignition-dracut spec2x branch %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit 3d08487b6173d4e1ce875dc47fd7fd6fb3eaa628 +%global dracutcommit 8bf2cbd513f9ad496980abbe9c265683d15f23f1 %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 2.0.1 -Release: 5.git%{shortcommit}%{?dist} +Release: 6.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -503,6 +503,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Wed Dec 04 2019 Allen Bai - 2.0.1-6.git641ec6a +- Update dracut to latest spec2x + * firstboot-complete: tell zipl to run + * Thu Oct 31 2019 Colin Walters - 2.0.1-5.git641ec6a - Update dracut diff --git a/sources b/sources index 6445fa0..c3122d5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-dracut-3d08487.tar.gz) = bdbda1185f60328c6957a3b4cce47e5999e8bf59d88b954abf0b811c4836d1654cae627b3067382806e7406262babc3805d9fb8dbabfb7b0548ecdf084cfa307 +SHA512 (ignition-dracut-8bf2cbd.tar.gz) = 8f581c6558cb1680d6edceddd3aad02c2288824ff7c2de77645461820a71ecf6bff16738ccbb74528337a920c82889736b52a375dfb4d70cd1360fd8ca862d0a SHA512 (ignition-641ec6a.tar.gz) = e5fb7e4f0977ea5c40f721401951c35753b03f7b076435b2ff56f6dd16c1cecfd874872294967d8a2b61ff934e46fd363b27d90d4aa143519d717262e43f16bd From 368a09bf737f9ace946f75ffb65b6c0b688ca6ad Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Thu, 5 Dec 2019 16:00:17 -0500 Subject: [PATCH 065/172] Don't require btrfs-progs, just recommend it Some variants may not want to support btrfs at all: https://github.com/coreos/fedora-coreos-tracker/issues/323 --- ignition.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/ignition.spec b/ignition.spec index 4bf924b..ef3e415 100644 --- a/ignition.spec +++ b/ignition.spec @@ -73,7 +73,7 @@ Name: ignition Version: 2.0.1 -Release: 6.git%{shortcommit}%{?dist} +Release: 7.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -88,7 +88,7 @@ BuildRequires: libblkid-devel # Requires for 'disks' stage %if 0%{?fedora} -Requires: btrfs-progs +Recommends: btrfs-progs %endif Requires: dosfstools Requires: gdisk @@ -503,6 +503,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Thu Dec 05 2019 Jonathan Lebon - 2.0.1-7.git641ec6a +- Don't require btrfs-progs, just recommend it + https://github.com/coreos/fedora-coreos-tracker/issues/323 + * Wed Dec 04 2019 Allen Bai - 2.0.1-6.git641ec6a - Update dracut to latest spec2x * firstboot-complete: tell zipl to run From 37b7c93f07f605e4b8ecf3b008810b9fbcc732d4 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 6 Dec 2019 17:27:27 -0500 Subject: [PATCH 066/172] Bump Ignition for better SELinux labeling https://github.com/coreos/ignition/pull/846 --- .gitignore | 1 + ignition.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index daf70ed..780d572 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ /ignition-641ec6a.tar.gz /ignition-dracut-3d08487.tar.gz /ignition-dracut-8bf2cbd.tar.gz +/ignition-a8f91fa.tar.gz diff --git a/ignition.spec b/ignition.spec index ef3e415..675c3e7 100644 --- a/ignition.spec +++ b/ignition.spec @@ -49,7 +49,7 @@ # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix}/v2 -%global commit 641ec6a44062f956bf1d46cf10824032a1996590 +%global commit a8f91fa826247c0a82deac359065ff453e30c79a %global shortcommit %(c=%{commit}; echo ${c:0:7}) # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these @@ -73,7 +73,7 @@ Name: ignition Version: 2.0.1 -Release: 7.git%{shortcommit}%{?dist} +Release: 8.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -503,6 +503,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Dec 06 2019 Jonathan Lebon - 2.0.1-8.gita8f91fa +- Bump Ignition for that sweet SELinux labeling: + https://github.com/coreos/ignition/pull/846 + * Thu Dec 05 2019 Jonathan Lebon - 2.0.1-7.git641ec6a - Don't require btrfs-progs, just recommend it https://github.com/coreos/fedora-coreos-tracker/issues/323 diff --git a/sources b/sources index c3122d5..55bbed4 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ignition-dracut-8bf2cbd.tar.gz) = 8f581c6558cb1680d6edceddd3aad02c2288824ff7c2de77645461820a71ecf6bff16738ccbb74528337a920c82889736b52a375dfb4d70cd1360fd8ca862d0a -SHA512 (ignition-641ec6a.tar.gz) = e5fb7e4f0977ea5c40f721401951c35753b03f7b076435b2ff56f6dd16c1cecfd874872294967d8a2b61ff934e46fd363b27d90d4aa143519d717262e43f16bd +SHA512 (ignition-a8f91fa.tar.gz) = b40e4e2ca65fefb6d0a1ed41c5caef28759384b8faf7e5f84c2b4c542024edbce6f073dc001948c190ffd7f80332f9a9167932ed40811b8329f827aa82aa93bd From a995f0230b09e0c203f68bdc4d70244abd9a3bd5 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Mon, 9 Dec 2019 15:59:14 -0500 Subject: [PATCH 067/172] Use the master branch of ignition-dracut, not spec2x It was accidentally changed to spec2x in: https://src.fedoraproject.org/rpms/ignition/pull-request/42 --- .gitignore | 1 + ignition.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 780d572..aa7da1b 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ /ignition-dracut-3d08487.tar.gz /ignition-dracut-8bf2cbd.tar.gz /ignition-a8f91fa.tar.gz +/ignition-dracut-736459e.tar.gz diff --git a/ignition.spec b/ignition.spec index 675c3e7..cd18e58 100644 --- a/ignition.spec +++ b/ignition.spec @@ -67,13 +67,13 @@ # https://github.com/coreos/ignition-dracut spec2x branch %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit 8bf2cbd513f9ad496980abbe9c265683d15f23f1 +%global dracutcommit 736459e788b73ba62b8a04d0395519c033ddbcf5 %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 2.0.1 -Release: 8.git%{shortcommit}%{?dist} +Release: 9.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -503,6 +503,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Mon Dec 09 2019 Jonathan Lebon - 2.0.1-9.gita8f91fa +- Use the master branch of ignition-dracut, not spec2x + * Fri Dec 06 2019 Jonathan Lebon - 2.0.1-8.gita8f91fa - Bump Ignition for that sweet SELinux labeling: https://github.com/coreos/ignition/pull/846 diff --git a/sources b/sources index 55bbed4..5ddabac 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-dracut-8bf2cbd.tar.gz) = 8f581c6558cb1680d6edceddd3aad02c2288824ff7c2de77645461820a71ecf6bff16738ccbb74528337a920c82889736b52a375dfb4d70cd1360fd8ca862d0a +SHA512 (ignition-dracut-736459e.tar.gz) = e76b97d77fe8efc0a190d43f0eb22a9d5f29d2bd49fd77d744cf386b69e354ac3ead61393d161874a8703dac352e99d37d97a10b3d2ecf33638ebdc733cb0730 SHA512 (ignition-a8f91fa.tar.gz) = b40e4e2ca65fefb6d0a1ed41c5caef28759384b8faf7e5f84c2b4c542024edbce6f073dc001948c190ffd7f80332f9a9167932ed40811b8329f827aa82aa93bd From 6201cd37bf03b8e730c7e70b95af47d088feb9ae Mon Sep 17 00:00:00 2001 From: Andrew Jeddeloh Date: Fri, 13 Dec 2019 15:00:58 -0800 Subject: [PATCH 068/172] spec: update spec for 2.1.1 --- .gitignore | 1 + ignition.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index aa7da1b..f3f9fc8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ +/ignition-40c0b57.tar.gz /ignition-7610725.tar.gz /ignition-dracut-d664657.tar.gz /ignition-cc7ebe0.tar.gz diff --git a/ignition.spec b/ignition.spec index cd18e58..c4b1b15 100644 --- a/ignition.spec +++ b/ignition.spec @@ -49,7 +49,7 @@ # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix}/v2 -%global commit a8f91fa826247c0a82deac359065ff453e30c79a +%global commit 40c0b57b7606bd23210059c5554f151776a1d64b %global shortcommit %(c=%{commit}; echo ${c:0:7}) # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these @@ -72,8 +72,8 @@ Name: ignition -Version: 2.0.1 -Release: 9.git%{shortcommit}%{?dist} +Version: 2.1.1 +Release: 1.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -503,6 +503,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Dec 12 2019 Andrew Jeddeloh - 2.1.1-1.git40c0b57 +- New release 2.1.1 + * Mon Dec 09 2019 Jonathan Lebon - 2.0.1-9.gita8f91fa - Use the master branch of ignition-dracut, not spec2x diff --git a/sources b/sources index 5ddabac..33615dd 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ignition-dracut-736459e.tar.gz) = e76b97d77fe8efc0a190d43f0eb22a9d5f29d2bd49fd77d744cf386b69e354ac3ead61393d161874a8703dac352e99d37d97a10b3d2ecf33638ebdc733cb0730 -SHA512 (ignition-a8f91fa.tar.gz) = b40e4e2ca65fefb6d0a1ed41c5caef28759384b8faf7e5f84c2b4c542024edbce6f073dc001948c190ffd7f80332f9a9167932ed40811b8329f827aa82aa93bd +SHA512 (ignition-40c0b57.tar.gz) = aeb195281378c2f531c442214cb4fe735e4ac91d5cd9ac1ae0b9f41ea7d9b5d78a9be85d77399152c863ebf8ad246d53753153eee6ebf1d9aae80fc6f65299d9 From 367cb35982613922c968a9f448870634d72e10b3 Mon Sep 17 00:00:00 2001 From: Andrew Jeddeloh Date: Tue, 17 Dec 2019 15:33:34 -0800 Subject: [PATCH 069/172] spec: add ignition-validate-nonlinux subpackage This will be used to create official release binaries to include on the upstream project's releases page. --- ignition.spec | 49 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/ignition.spec b/ignition.spec index c4b1b15..dd3eaa4 100644 --- a/ignition.spec +++ b/ignition.spec @@ -73,7 +73,7 @@ Name: ignition Version: 2.1.1 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -355,6 +355,21 @@ and applies the configuration. This package contains a tool for validating Ignition configurations. +%ifarch x86_64 +############## validate-nonlinux subpackage ############## +%package validate-nonlinux + +Summary: Validation tool for Ignition configs for MacOS and Windows. +License: ASL 2.0 + +Conflicts: ignition < 0.31.0-3 + +%description validate-nonlinux +This package is used to build the MacOS and windows ignition-validate binaries +through cross-compilation and should not be installed. It is only used for +building binaries to sign by Fedora release engineering and include on the +Ignition project's Github releases page. +%endif %prep # setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html @@ -385,6 +400,18 @@ echo "Building ignition..." echo "Building ignition-validate..." %gobuild -o ./ignition-validate %{import_path}/validate +%ifarch x86_64 +echo "Building MacOS ignition-validate" +export GOOS=darwin +%gobuild -o ./ignition-validate-darwin %{import_path}/validate + +echo "Building Windows ignition-validate" +export GOOS=windows +%gobuild -o ./ignition-validate-windows %{import_path}/validate + +# Set this back, just in case +export GOOS=linux +%endif %install # ignition-dracut @@ -400,6 +427,12 @@ popd >/dev/null # ignition install -d -p %{buildroot}%{_bindir} install -p -m 0755 ./ignition-validate %{buildroot}%{_bindir} + +%ifarch x86_64 +install -p -m 0755 ./ignition-validate-darwin %{buildroot}%{_bindir} +install -p -m 0755 ./ignition-validate-windows %{buildroot}%{_bindir} +%endif + # The ignition binary is only for dracut, and is dangerous to run from # the command line. Install directly into the dracut module dir. install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition @@ -489,6 +522,13 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %license LICENSE %{_bindir}/%{name}-validate +%ifarch x86_64 +%files validate-nonlinux +%license LICENSE +%{_bindir}/%{name}-validate-darwin +%{_bindir}/%{name}-validate-windows +%endif + %if 0%{?with_devel} %files devel -f devel.file-list %license LICENSE @@ -503,7 +543,12 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog -* Fri Dec 12 2019 Andrew Jeddeloh - 2.1.1-1.git40c0b57 +* Tue Dec 17 2019 Andrew Jeddeloh - 2.1.1-2.git40c0b57 +- Add ignition-validate-nonlinux subpackage. This should not be installed. It + is only used for building binaries to sign by Fedora release engineering and + include on the Ignition project's Github releases page. + +* Fri Dec 13 2019 Andrew Jeddeloh - 2.1.1-1.git40c0b57 - New release 2.1.1 * Mon Dec 09 2019 Jonathan Lebon - 2.0.1-9.gita8f91fa From 101766593574977513231b1465c13fb248077c85 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Fri, 20 Dec 2019 14:59:31 -0500 Subject: [PATCH 070/172] Backport upstream patch to workaround problem booting on live systems - https://github.com/coreos/fedora-coreos-tracker/issues/339 - https://github.com/coreos/ignition/pull/907 --- ...don-t-relabel-home-and-root-symlinks.patch | 44 +++++++++++++++++++ ignition.spec | 10 ++++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 0001-stages-files-don-t-relabel-home-and-root-symlinks.patch diff --git a/0001-stages-files-don-t-relabel-home-and-root-symlinks.patch b/0001-stages-files-don-t-relabel-home-and-root-symlinks.patch new file mode 100644 index 0000000..8dbc001 --- /dev/null +++ b/0001-stages-files-don-t-relabel-home-and-root-symlinks.patch @@ -0,0 +1,44 @@ +From 5028460bba73b7580cb9198474358cb65afcbe0e Mon Sep 17 00:00:00 2001 +From: Jonathan Lebon +Date: Thu, 19 Dec 2019 16:21:19 -0500 +Subject: [PATCH] stages/files: don't relabel /home and /root symlinks + +On OSTree systems, those are just symlinks in the deployment root. If +they're not labeled correctly already, it signals an issue with the disk +creation process itself (and might also signal that the next time a +deployment root is created, it'll also be mislabeled). + +Anyway, even on non-OSTree systems, it seems reasonable to expect that +`/home` and `/root` at least already exist and don't need to be created +(and thus don't need to be relabeld). + +It's possible that [fixing `getxattr` without a policy +loaded](https://github.com/coreos/fedora-coreos-config/pull/245#issuecomment-560578750) +would also fix this, since `setfiles` would see that the symlinks were +already correctly labeled. + +In effect, this is completing what #632 started. + +Closes: https://github.com/coreos/fedora-coreos-tracker/issues/339 +--- + internal/exec/stages/files/passwd.go | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/internal/exec/stages/files/passwd.go b/internal/exec/stages/files/passwd.go +index 8ba6cb1..c3d4737 100644 +--- a/internal/exec/stages/files/passwd.go ++++ b/internal/exec/stages/files/passwd.go +@@ -68,9 +68,7 @@ func (s *stage) createPasswd(config types.Config) error { + s.relabel(deglobbed...) + s.relabel( + "/etc/.pwd.lock", +- "/home", +- "/root", +- // for OSTree-based systems (newer restorecon doesn't follow symlinks) ++ // for OSTree-based systems + "/var/home", + "/var/roothome", + ) +-- +2.20.1 + diff --git a/ignition.spec b/ignition.spec index dd3eaa4..861f219 100644 --- a/ignition.spec +++ b/ignition.spec @@ -73,13 +73,15 @@ Name: ignition Version: 2.1.1 -Release: 2.git%{shortcommit}%{?dist} +Release: 3.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz Source1: https://%{dracutprovider_prefix}/archive/%{dracutcommit}/%{dracutrepo}-%{dracutshortcommit}.tar.gz +Patch0: 0001-stages-files-don-t-relabel-home-and-root-symlinks.patch + %define gopath %{_datadir}/gocode ExcludeArch: ppc64 BuildRequires: golang >= 1.10 @@ -375,6 +377,7 @@ Ignition project's Github releases page. # setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html # unpack source0 and apply patches %setup -T -b 0 -q -n %{repo}-%{commit} +%patch0 -p1 # unpack source1 (dracut modules) %setup -T -D -a 1 -q -n %{repo}-%{commit} @@ -543,6 +546,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Dec 20 2019 Dusty Mabe - 2.1.1-3.git40c0b57 +- Backport upstream patch to workaround problem booting on live systems + - https://github.com/coreos/fedora-coreos-tracker/issues/339 + - https://github.com/coreos/ignition/pull/907 + * Tue Dec 17 2019 Andrew Jeddeloh - 2.1.1-2.git40c0b57 - Add ignition-validate-nonlinux subpackage. This should not be installed. It is only used for building binaries to sign by Fedora release engineering and From 895ede441f0fe65d2701483a39ada243d27b4f9e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 05:18:38 +0000 Subject: [PATCH 071/172] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ignition.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index 861f219..d126933 100644 --- a/ignition.spec +++ b/ignition.spec @@ -73,7 +73,7 @@ Name: ignition Version: 2.1.1 -Release: 3.git%{shortcommit}%{?dist} +Release: 4.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -546,6 +546,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 2.1.1-4.git40c0b57 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Dec 20 2019 Dusty Mabe - 2.1.1-3.git40c0b57 - Backport upstream patch to workaround problem booting on live systems - https://github.com/coreos/fedora-coreos-tracker/issues/339 From 12436a71806289bb891977db2efc418fee095216 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 31 Jan 2020 10:08:49 -0500 Subject: [PATCH 072/172] Bump ignition-dracut for ignition-diskful-subsequent target https://github.com/coreos/ignition-dracut/pull/151 While we're here, tweak the `download-*` scripts to use `curl` instead of `wget` since the former is installed by default but not the latter. Also adapt spec file for not packaging any GRUB dropins anymore. --- .gitignore | 1 + download-ignition-dracut.sh | 2 +- download-ignition.sh | 2 +- ignition.spec | 13 ++++++++----- sources | 2 +- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index f3f9fc8..6461815 100644 --- a/.gitignore +++ b/.gitignore @@ -32,3 +32,4 @@ /ignition-dracut-8bf2cbd.tar.gz /ignition-a8f91fa.tar.gz /ignition-dracut-736459e.tar.gz +/ignition-dracut-14808e2.tar.gz diff --git a/download-ignition-dracut.sh b/download-ignition-dracut.sh index 38c76af..ff9b4fc 100755 --- a/download-ignition-dracut.sh +++ b/download-ignition-dracut.sh @@ -1,3 +1,3 @@ #!/bin/bash set -xeuo pipefail -rpmspec -P ignition.spec | grep 'Source1:' | tr -s ' ' | cut -d ' ' -f 2 | xargs wget +rpmspec -P ignition.spec | grep 'Source1:' | tr -s ' ' | cut -d ' ' -f 2 | xargs curl -LO diff --git a/download-ignition.sh b/download-ignition.sh index 02ff383..68a6115 100755 --- a/download-ignition.sh +++ b/download-ignition.sh @@ -1,3 +1,3 @@ #!/bin/bash set -xeuo pipefail -rpmspec -P ignition.spec | grep 'Source0:' | tr -s ' ' | cut -d ' ' -f 2 | xargs wget +rpmspec -P ignition.spec | grep 'Source0:' | tr -s ' ' | cut -d ' ' -f 2 | xargs curl -LO diff --git a/ignition.spec b/ignition.spec index d126933..5e55245 100644 --- a/ignition.spec +++ b/ignition.spec @@ -67,13 +67,13 @@ # https://github.com/coreos/ignition-dracut spec2x branch %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit 736459e788b73ba62b8a04d0395519c033ddbcf5 +%global dracutcommit 14808e25d77681d252cd0bac18803cce51758a93 %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 2.1.1 -Release: 4.git%{shortcommit}%{?dist} +Release: 5.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -420,11 +420,9 @@ export GOOS=linux # ignition-dracut install -d -p %{buildroot}/%{dracutlibdir}/modules.d install -d -p %{buildroot}/%{_prefix}/lib/systemd/system -install -d -p %{buildroot}/%{_sysconfdir}/grub.d pushd %{dracutrepo}-%{dracutcommit} >/dev/null cp -r dracut/* %{buildroot}/%{dracutlibdir}/modules.d/ install -m 0644 -t %{buildroot}/%{_prefix}/lib/systemd/system/ systemd/* -install -m 0755 -t %{buildroot}/%{_sysconfdir}/grub.d/ grub/* popd >/dev/null # ignition @@ -517,7 +515,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %license LICENSE LICENSE.dracut %doc README.md doc/ %{dracutlibdir}/modules.d/* -%{_sysconfdir}/grub.d/* %{_prefix}/lib/systemd/system/*.service %files validate @@ -546,6 +543,12 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Jan 31 2020 Jonathan Lebon - 2.1.1-5.git40c0b57 +- Bump ignition-dracut for ignition-diskful-subsequent target + https://github.com/coreos/ignition-dracut/pull/151 +- Kill grub dropin + https://github.com/coreos/ignition-dracut/pull/91 + * Wed Jan 29 2020 Fedora Release Engineering - 2.1.1-4.git40c0b57 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild diff --git a/sources b/sources index 33615dd..7c2a1a0 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-dracut-736459e.tar.gz) = e76b97d77fe8efc0a190d43f0eb22a9d5f29d2bd49fd77d744cf386b69e354ac3ead61393d161874a8703dac352e99d37d97a10b3d2ecf33638ebdc733cb0730 +SHA512 (ignition-dracut-14808e2.tar.gz) = 9376730777a4859d1d60f99aacd59bbcb0c8194cf120bea40015a0d8451946ddcf5c7ec2043227c0c57a0e4f8c89445f20656ab2de6bc03f07f8bf8fea3a7df3 SHA512 (ignition-40c0b57.tar.gz) = aeb195281378c2f531c442214cb4fe735e4ac91d5cd9ac1ae0b9f41ea7d9b5d78a9be85d77399152c863ebf8ad246d53753153eee6ebf1d9aae80fc6f65299d9 From 1e620a001f97ec07ee052c688c8c84cf43d8a693 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Sat, 1 Feb 2020 15:35:20 -0500 Subject: [PATCH 073/172] Improve -validate-nonlinux descriptive text --- ignition.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ignition.spec b/ignition.spec index 5e55245..5c109cd 100644 --- a/ignition.spec +++ b/ignition.spec @@ -73,7 +73,7 @@ Name: ignition Version: 2.1.1 -Release: 5.git%{shortcommit}%{?dist} +Release: 6.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -361,14 +361,14 @@ This package contains a tool for validating Ignition configurations. ############## validate-nonlinux subpackage ############## %package validate-nonlinux -Summary: Validation tool for Ignition configs for MacOS and Windows. +Summary: Validation tool for Ignition configs for macOS and Windows License: ASL 2.0 Conflicts: ignition < 0.31.0-3 %description validate-nonlinux -This package is used to build the MacOS and windows ignition-validate binaries -through cross-compilation and should not be installed. It is only used for +This package contains macOS and Windows ignition-validate binaries built +through cross-compilation. Do not install it. It is only used for building binaries to sign by Fedora release engineering and include on the Ignition project's Github releases page. %endif @@ -404,7 +404,7 @@ echo "Building ignition-validate..." %gobuild -o ./ignition-validate %{import_path}/validate %ifarch x86_64 -echo "Building MacOS ignition-validate" +echo "Building macOS ignition-validate" export GOOS=darwin %gobuild -o ./ignition-validate-darwin %{import_path}/validate @@ -543,6 +543,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Sat Feb 01 2020 Benjamin Gilbert - 2.1.1-6.git40c0b57 +- Improve -validate-nonlinux descriptive text + * Fri Jan 31 2020 Jonathan Lebon - 2.1.1-5.git40c0b57 - Bump ignition-dracut for ignition-diskful-subsequent target https://github.com/coreos/ignition-dracut/pull/151 From 1b6d133ca1f80a35a6df9df51f4805ff051a2030 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Sat, 1 Feb 2020 15:47:00 -0500 Subject: [PATCH 074/172] Switch -validate-nonlinux to noarch; move files to /usr/share/ignition We shouldn't put non-Linux binaries in /usr/bin. They're opaque data as far as Linux is concerned, and we can build them on any arch. Switch the subpackage to noarch, move the binaries to /usr/share/ignition, and make them non-executable. Rename files to include architecture triples, and in the Windows case, the necessary .exe suffix. These names match the ones used for FCCT binaries. For macOS the name now matches the actual name used on the GitHub releases page; for Windows this is a change. --- ignition.spec | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/ignition.spec b/ignition.spec index 5c109cd..7d3e221 100644 --- a/ignition.spec +++ b/ignition.spec @@ -357,12 +357,12 @@ and applies the configuration. This package contains a tool for validating Ignition configurations. -%ifarch x86_64 ############## validate-nonlinux subpackage ############## %package validate-nonlinux -Summary: Validation tool for Ignition configs for macOS and Windows -License: ASL 2.0 +Summary: Validation tool for Ignition configs for macOS and Windows +License: ASL 2.0 +BuildArch: noarch Conflicts: ignition < 0.31.0-3 @@ -371,7 +371,6 @@ This package contains macOS and Windows ignition-validate binaries built through cross-compilation. Do not install it. It is only used for building binaries to sign by Fedora release engineering and include on the Ignition project's Github releases page. -%endif %prep # setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html @@ -403,18 +402,19 @@ echo "Building ignition..." echo "Building ignition-validate..." %gobuild -o ./ignition-validate %{import_path}/validate -%ifarch x86_64 echo "Building macOS ignition-validate" +export GOARCH=amd64 export GOOS=darwin -%gobuild -o ./ignition-validate-darwin %{import_path}/validate +%gobuild -o ./ignition-validate-x86_64-apple-darwin %{import_path}/validate echo "Building Windows ignition-validate" +export GOARCH=amd64 export GOOS=windows -%gobuild -o ./ignition-validate-windows %{import_path}/validate +%gobuild -o ./ignition-validate-x86_64-pc-windows-gnu.exe %{import_path}/validate # Set this back, just in case +export GOARCH= export GOOS=linux -%endif %install # ignition-dracut @@ -429,10 +429,9 @@ popd >/dev/null install -d -p %{buildroot}%{_bindir} install -p -m 0755 ./ignition-validate %{buildroot}%{_bindir} -%ifarch x86_64 -install -p -m 0755 ./ignition-validate-darwin %{buildroot}%{_bindir} -install -p -m 0755 ./ignition-validate-windows %{buildroot}%{_bindir} -%endif +install -d -p %{buildroot}%{_datadir}/ignition +install -p -m 0644 ./ignition-validate-x86_64-apple-darwin %{buildroot}%{_datadir}/ignition +install -p -m 0644 ./ignition-validate-x86_64-pc-windows-gnu.exe %{buildroot}%{_datadir}/ignition # The ignition binary is only for dracut, and is dangerous to run from # the command line. Install directly into the dracut module dir. @@ -522,12 +521,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %license LICENSE %{_bindir}/%{name}-validate -%ifarch x86_64 %files validate-nonlinux %license LICENSE -%{_bindir}/%{name}-validate-darwin -%{_bindir}/%{name}-validate-windows -%endif +%dir %{_datadir}/ignition +%{_datadir}/ignition/ignition-validate-x86_64-apple-darwin +%{_datadir}/ignition/ignition-validate-x86_64-pc-windows-gnu.exe %if 0%{?with_devel} %files devel -f devel.file-list @@ -544,6 +542,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %changelog * Sat Feb 01 2020 Benjamin Gilbert - 2.1.1-6.git40c0b57 +- Switch -validate-nonlinux to noarch; move files to /usr/share/ignition - Improve -validate-nonlinux descriptive text * Fri Jan 31 2020 Jonathan Lebon - 2.1.1-5.git40c0b57 From 6ab21c400a5b1477ff64ab250eeb21c7e13b1ae2 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Mon, 23 Mar 2020 18:45:43 -0400 Subject: [PATCH 075/172] Ignition 2.2.1 --- .gitignore | 2 + ...don-t-relabel-home-and-root-symlinks.patch | 44 ------------------- ignition.spec | 17 ++++--- sources | 4 +- 4 files changed, 14 insertions(+), 53 deletions(-) delete mode 100644 0001-stages-files-don-t-relabel-home-and-root-symlinks.patch diff --git a/.gitignore b/.gitignore index 6461815..8f83a95 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,5 @@ /ignition-a8f91fa.tar.gz /ignition-dracut-736459e.tar.gz /ignition-dracut-14808e2.tar.gz +/ignition-2d3ff58.tar.gz +/ignition-dracut-f67d587.tar.gz diff --git a/0001-stages-files-don-t-relabel-home-and-root-symlinks.patch b/0001-stages-files-don-t-relabel-home-and-root-symlinks.patch deleted file mode 100644 index 8dbc001..0000000 --- a/0001-stages-files-don-t-relabel-home-and-root-symlinks.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 5028460bba73b7580cb9198474358cb65afcbe0e Mon Sep 17 00:00:00 2001 -From: Jonathan Lebon -Date: Thu, 19 Dec 2019 16:21:19 -0500 -Subject: [PATCH] stages/files: don't relabel /home and /root symlinks - -On OSTree systems, those are just symlinks in the deployment root. If -they're not labeled correctly already, it signals an issue with the disk -creation process itself (and might also signal that the next time a -deployment root is created, it'll also be mislabeled). - -Anyway, even on non-OSTree systems, it seems reasonable to expect that -`/home` and `/root` at least already exist and don't need to be created -(and thus don't need to be relabeld). - -It's possible that [fixing `getxattr` without a policy -loaded](https://github.com/coreos/fedora-coreos-config/pull/245#issuecomment-560578750) -would also fix this, since `setfiles` would see that the symlinks were -already correctly labeled. - -In effect, this is completing what #632 started. - -Closes: https://github.com/coreos/fedora-coreos-tracker/issues/339 ---- - internal/exec/stages/files/passwd.go | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/internal/exec/stages/files/passwd.go b/internal/exec/stages/files/passwd.go -index 8ba6cb1..c3d4737 100644 ---- a/internal/exec/stages/files/passwd.go -+++ b/internal/exec/stages/files/passwd.go -@@ -68,9 +68,7 @@ func (s *stage) createPasswd(config types.Config) error { - s.relabel(deglobbed...) - s.relabel( - "/etc/.pwd.lock", -- "/home", -- "/root", -- // for OSTree-based systems (newer restorecon doesn't follow symlinks) -+ // for OSTree-based systems - "/var/home", - "/var/roothome", - ) --- -2.20.1 - diff --git a/ignition.spec b/ignition.spec index 7d3e221..fc5112e 100644 --- a/ignition.spec +++ b/ignition.spec @@ -49,7 +49,7 @@ # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix}/v2 -%global commit 40c0b57b7606bd23210059c5554f151776a1d64b +%global commit 2d3ff5862dc9c1dd0cc78e797f42a19964ac1f4c %global shortcommit %(c=%{commit}; echo ${c:0:7}) # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these @@ -67,21 +67,19 @@ # https://github.com/coreos/ignition-dracut spec2x branch %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit 14808e25d77681d252cd0bac18803cce51758a93 +%global dracutcommit f67d5876b48652ab09b36d57d51d9f57f1a863b1 %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition -Version: 2.1.1 -Release: 6.git%{shortcommit}%{?dist} +Version: 2.2.1 +Release: 1.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz Source1: https://%{dracutprovider_prefix}/archive/%{dracutcommit}/%{dracutrepo}-%{dracutshortcommit}.tar.gz -Patch0: 0001-stages-files-don-t-relabel-home-and-root-symlinks.patch - %define gopath %{_datadir}/gocode ExcludeArch: ppc64 BuildRequires: golang >= 1.10 @@ -174,6 +172,7 @@ Provides: bundled(golang(github.com/coreos/vcontext/tree)) = 0.0.0-2019052920134 Provides: bundled(golang(github.com/coreos/vcontext/json)) = 0.0.0-20190529201340.git22b159166068 Provides: bundled(golang(github.com/coreos/vcontext/validate)) = 0.0.0-20190529201340.git22b159166068 Provides: bundled(golang(github.com/godbus/dbus)) = 0.0.0-20181025153459.git66d97aec3384 +Provides: bundled(golang(github.com/google/renameio)) = 0.1.0 Provides: bundled(golang(github.com/google/uuid)) = 1.1.1 Provides: bundled(golang(github.com/pin/tftp)) = 2.1.0 Provides: bundled(golang(github.com/pin/tftp/netascii)) = 2.1.0 @@ -187,6 +186,7 @@ Provides: bundled(golang(github.com/vmware/vmw-guestinfo/message)) = 0.0.0-20170 Provides: bundled(golang(github.com/vmware/vmw-ovflib)) = 0.0.0-20170608004843.git1f217b9dc714 Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.0.0-20190228165749.git92fc7df08ae7 Provides: bundled(golang(golang.org/x/net/idna)) = 0.0.0-20190228165749.git92fc7df08ae7 +Provides: bundled(golang(golang.org/x/sys/unix)) = 0.0.0-20191110163157.gitd32e6e3b99c4 Provides: bundled(golang(golang.org/x/text/secure/bidirule)) = 0.3.0 Provides: bundled(golang(golang.org/x/text/unicode/bidi)) = 0.3.0 Provides: bundled(golang(golang.org/x/text/unicode/norm)) = 0.3.0 @@ -376,7 +376,6 @@ Ignition project's Github releases page. # setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html # unpack source0 and apply patches %setup -T -b 0 -q -n %{repo}-%{commit} -%patch0 -p1 # unpack source1 (dracut modules) %setup -T -D -a 1 -q -n %{repo}-%{commit} @@ -541,6 +540,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Tue Mar 24 2020 Benjamin Gilbert - 2.2.1-1.git2d3ff58 +- New release +- Bump ignition-dracut for initramfs network teardown + * Sat Feb 01 2020 Benjamin Gilbert - 2.1.1-6.git40c0b57 - Switch -validate-nonlinux to noarch; move files to /usr/share/ignition - Improve -validate-nonlinux descriptive text diff --git a/sources b/sources index 7c2a1a0..2d74cc7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-dracut-14808e2.tar.gz) = 9376730777a4859d1d60f99aacd59bbcb0c8194cf120bea40015a0d8451946ddcf5c7ec2043227c0c57a0e4f8c89445f20656ab2de6bc03f07f8bf8fea3a7df3 -SHA512 (ignition-40c0b57.tar.gz) = aeb195281378c2f531c442214cb4fe735e4ac91d5cd9ac1ae0b9f41ea7d9b5d78a9be85d77399152c863ebf8ad246d53753153eee6ebf1d9aae80fc6f65299d9 +SHA512 (ignition-2d3ff58.tar.gz) = 116450e0a4afb8a38fa0c0e925f7ee56ec6bab42b43cc5e314c882d74d44065be35bbf224cd45177ae788eb4be98181c0c19b3987a488d5d8ad6048e952ecbd1 +SHA512 (ignition-dracut-f67d587.tar.gz) = 5cc95dd665b211316217c864f0e9fad921c6a7cfd621ee5ee77a922d59b9207e9ab80340f7aa862aec393e2e8537002f91540beea20558f8c6654e618c8821f0 From e27930463358d27b6faf5dc7aa4fd4a9a1638a5d Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Sat, 28 Mar 2020 10:13:49 -0400 Subject: [PATCH 076/172] Fix userdata/metadata fetch on Packet --- ignition.spec | 11 ++++++++- packet-fix-metadata-fetch.patch | 33 ++++++++++++++++++++++++++ packet-fix-userdata-fetch.patch | 41 +++++++++++++++++++++++++++++++++ 3 files changed, 84 insertions(+), 1 deletion(-) create mode 100644 packet-fix-metadata-fetch.patch create mode 100644 packet-fix-userdata-fetch.patch diff --git a/ignition.spec b/ignition.spec index fc5112e..64d5513 100644 --- a/ignition.spec +++ b/ignition.spec @@ -73,12 +73,16 @@ Name: ignition Version: 2.2.1 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz Source1: https://%{dracutprovider_prefix}/archive/%{dracutcommit}/%{dracutrepo}-%{dracutshortcommit}.tar.gz +# Upstream 73cbfa847e4319a202c360bd8cd447712d2067bc +Patch0: packet-fix-userdata-fetch.patch +# Upstream 4c2dcd547b01b2f13ced8d35263ded5fd67fa645 +Patch1: packet-fix-metadata-fetch.patch %define gopath %{_datadir}/gocode ExcludeArch: ppc64 @@ -376,6 +380,8 @@ Ignition project's Github releases page. # setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html # unpack source0 and apply patches %setup -T -b 0 -q -n %{repo}-%{commit} +%patch0 -p1 +%patch1 -p1 # unpack source1 (dracut modules) %setup -T -D -a 1 -q -n %{repo}-%{commit} @@ -540,6 +546,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Sat Mar 28 2020 Benjamin Gilbert - 2.2.1-2.git2d3ff58 +- Fix userdata/metadata fetch on Packet + * Tue Mar 24 2020 Benjamin Gilbert - 2.2.1-1.git2d3ff58 - New release - Bump ignition-dracut for initramfs network teardown diff --git a/packet-fix-metadata-fetch.patch b/packet-fix-metadata-fetch.patch new file mode 100644 index 0000000..33c88f9 --- /dev/null +++ b/packet-fix-metadata-fetch.patch @@ -0,0 +1,33 @@ +From 4c2dcd547b01b2f13ced8d35263ded5fd67fa645 Mon Sep 17 00:00:00 2001 +From: Benjamin Gilbert +Date: Sat, 28 Mar 2020 01:15:32 -0400 +Subject: [PATCH 2/2] providers/packet: override Accept header fetching + instance metadata + +Passing nil Headers is no longer sufficient to avoid the default Accept +header; we need to override it. Fixes 406 Not Acceptable error. + +Fixes: 75d3e2da74ae ("Rework fetch/resource to automatically append required headers") +--- + internal/providers/packet/packet.go | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/internal/providers/packet/packet.go b/internal/providers/packet/packet.go +index 8771734..613a6ba 100644 +--- a/internal/providers/packet/packet.go ++++ b/internal/providers/packet/packet.go +@@ -71,8 +71,10 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { + func PostStatus(stageName string, f resource.Fetcher, errMsg error) error { + f.Logger.Info("POST message to Packet Timeline") + // fetch JSON from https://metadata.packet.net/metadata ++ headers := make(http.Header) ++ headers.Set("Accept", "*/*") + data, err := f.FetchToBuffer(metadataUrl, resource.FetchOptions{ +- Headers: nil, ++ Headers: headers, + }) + if err != nil { + return err +-- +2.24.1 + diff --git a/packet-fix-userdata-fetch.patch b/packet-fix-userdata-fetch.patch new file mode 100644 index 0000000..468b5bc --- /dev/null +++ b/packet-fix-userdata-fetch.patch @@ -0,0 +1,41 @@ +From 73cbfa847e4319a202c360bd8cd447712d2067bc Mon Sep 17 00:00:00 2001 +From: Benjamin Gilbert +Date: Sat, 28 Mar 2020 01:07:54 -0400 +Subject: [PATCH 1/2] resource/url: allow caller-specified headers to override + defaults + +Set defaults first, then override them with caller-specified headers. +Fixes default Accept header causing 406 Not Acceptable when fetching +userdata on Packet. + +Fixes: 75d3e2da74ae ("Rework fetch/resource to automatically append required headers") +--- + internal/resource/url.go | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/internal/resource/url.go b/internal/resource/url.go +index c304758..d08964a 100644 +--- a/internal/resource/url.go ++++ b/internal/resource/url.go +@@ -257,14 +257,14 @@ func (f *Fetcher) fetchFromHTTP(u url.URL, dest io.Writer, opts FetchOptions) er + // TODO use .Clone() when we have a new enough golang + // (With Rust, we'd have immutability and wouldn't need to defensively clone) + headers := make(http.Header) +- for k, va := range opts.Headers { ++ for k, va := range configHeaders { + for _, v := range va { +- headers.Add(k, v) ++ headers.Set(k, v) + } + } +- for k, va := range configHeaders { ++ for k, va := range opts.Headers { + for _, v := range va { +- headers.Add(k, v) ++ headers.Set(k, v) + } + } + +-- +2.24.1 + From 820aa5ae5f1d29cf6f8a1bd5feddb394fc65cbe7 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Mon, 30 Mar 2020 14:36:00 -0400 Subject: [PATCH 077/172] Bump ignition-dracut to fix umount stage network access --- .gitignore | 1 + ignition.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 8f83a95..cb63f4a 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,4 @@ /ignition-dracut-14808e2.tar.gz /ignition-2d3ff58.tar.gz /ignition-dracut-f67d587.tar.gz +/ignition-dracut-793d0ef.tar.gz diff --git a/ignition.spec b/ignition.spec index 64d5513..4fa16b4 100644 --- a/ignition.spec +++ b/ignition.spec @@ -67,13 +67,13 @@ # https://github.com/coreos/ignition-dracut spec2x branch %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit f67d5876b48652ab09b36d57d51d9f57f1a863b1 +%global dracutcommit 793d0ef43874f1a0a5c3a6182173efd6d2336ef3 %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 2.2.1 -Release: 2.git%{shortcommit}%{?dist} +Release: 3.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -546,6 +546,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Mon Mar 30 2020 Benjamin Gilbert - 2.2.1-3.git2d3ff58 +- Bump ignition-dracut to fix umount stage network access + * Sat Mar 28 2020 Benjamin Gilbert - 2.2.1-2.git2d3ff58 - Fix userdata/metadata fetch on Packet diff --git a/sources b/sources index 2d74cc7..65e6530 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ignition-2d3ff58.tar.gz) = 116450e0a4afb8a38fa0c0e925f7ee56ec6bab42b43cc5e314c882d74d44065be35bbf224cd45177ae788eb4be98181c0c19b3987a488d5d8ad6048e952ecbd1 -SHA512 (ignition-dracut-f67d587.tar.gz) = 5cc95dd665b211316217c864f0e9fad921c6a7cfd621ee5ee77a922d59b9207e9ab80340f7aa862aec393e2e8537002f91540beea20558f8c6654e618c8821f0 +SHA512 (ignition-dracut-793d0ef.tar.gz) = 34193e3b07aa490d64f39608adf62ed6c9ffc35e67ccbe38b1faf74d4629c5867def543cc535f90c2df774b6460b64f114fcc2e73fcaf349d520ba4c6563f297 From 4307eea205889b742d1eafb23cd8bac1c9139422 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Thu, 16 Apr 2020 15:06:46 +0000 Subject: [PATCH 078/172] Update to latest ignition-dracut for virtio dump --- .gitignore | 1 + ignition.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index cb63f4a..6eaecab 100644 --- a/.gitignore +++ b/.gitignore @@ -36,3 +36,4 @@ /ignition-2d3ff58.tar.gz /ignition-dracut-f67d587.tar.gz /ignition-dracut-793d0ef.tar.gz +/ignition-dracut-6136be3.tar.gz diff --git a/ignition.spec b/ignition.spec index 4fa16b4..83cd684 100644 --- a/ignition.spec +++ b/ignition.spec @@ -67,13 +67,13 @@ # https://github.com/coreos/ignition-dracut spec2x branch %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit 793d0ef43874f1a0a5c3a6182173efd6d2336ef3 +%global dracutcommit 6136be3d9d38d7926a61cd4d1b4ba5f9baf0892f %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 2.2.1 -Release: 3.git%{shortcommit}%{?dist} +Release: 4.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -546,6 +546,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Thu Apr 16 2020 Colin Walters - 2.2.1-4.git2d3ff58 +- Update to latest ignition-dracut for virtio dump + * Mon Mar 30 2020 Benjamin Gilbert - 2.2.1-3.git2d3ff58 - Bump ignition-dracut to fix umount stage network access diff --git a/sources b/sources index 65e6530..6253601 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ignition-2d3ff58.tar.gz) = 116450e0a4afb8a38fa0c0e925f7ee56ec6bab42b43cc5e314c882d74d44065be35bbf224cd45177ae788eb4be98181c0c19b3987a488d5d8ad6048e952ecbd1 -SHA512 (ignition-dracut-793d0ef.tar.gz) = 34193e3b07aa490d64f39608adf62ed6c9ffc35e67ccbe38b1faf74d4629c5867def543cc535f90c2df774b6460b64f114fcc2e73fcaf349d520ba4c6563f297 +SHA512 (ignition-dracut-6136be3.tar.gz) = 1d95b9c125c1792877831c04464ffcda4f31ff3e754a18923a6689d180c62d995d170e3e1e614a72092e42b4e7131b5350334e38ea2f39078fa4919c308efbba From c6f0f376edf2a68f1764052e2244563303c34860 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: Sun, 26 Apr 2020 01:47:08 -0400 Subject: [PATCH 079/172] Update to latest ignition-dracut for network fixes https://github.com/coreos/ignition-dracut/pull/174 --- .gitignore | 1 + ignition.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 6eaecab..b257cfe 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ /ignition-dracut-f67d587.tar.gz /ignition-dracut-793d0ef.tar.gz /ignition-dracut-6136be3.tar.gz +/ignition-dracut-390779d.tar.gz diff --git a/ignition.spec b/ignition.spec index 83cd684..497c437 100644 --- a/ignition.spec +++ b/ignition.spec @@ -67,13 +67,13 @@ # https://github.com/coreos/ignition-dracut spec2x branch %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit 6136be3d9d38d7926a61cd4d1b4ba5f9baf0892f +%global dracutcommit 390779da2c5b7595882a8426e2c9ec9c073c6da4 %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 2.2.1 -Release: 4.git%{shortcommit}%{?dist} +Release: 5.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -546,6 +546,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Sun Apr 26 2020 Dusty Mabe - 2.2.1-5.git2d3ff58 +- Update to latest ignition-dracut for network fixes + https://github.com/coreos/ignition-dracut/pull/174 + * Thu Apr 16 2020 Colin Walters - 2.2.1-4.git2d3ff58 - Update to latest ignition-dracut for virtio dump diff --git a/sources b/sources index 6253601..78dd1d5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ignition-2d3ff58.tar.gz) = 116450e0a4afb8a38fa0c0e925f7ee56ec6bab42b43cc5e314c882d74d44065be35bbf224cd45177ae788eb4be98181c0c19b3987a488d5d8ad6048e952ecbd1 -SHA512 (ignition-dracut-6136be3.tar.gz) = 1d95b9c125c1792877831c04464ffcda4f31ff3e754a18923a6689d180c62d995d170e3e1e614a72092e42b4e7131b5350334e38ea2f39078fa4919c308efbba +SHA512 (ignition-dracut-390779d.tar.gz) = a282b21e094b6660e52d0c7843f53426a76838907c5cb36508e4d7616d66eb519a8a7480bff69f2e2f17b973321a563b8fa9ec1565292b892973e9f07019c4cc From 8010f806711be86b1c34dc3c38bc647ec0b693c4 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Tue, 5 May 2020 19:22:03 -0400 Subject: [PATCH 080/172] Ignition 2.3.0 --- .gitignore | 2 + ignition.spec | 76 ++++++++++++++++----------------- packet-fix-metadata-fetch.patch | 33 -------------- packet-fix-userdata-fetch.patch | 41 ------------------ sources | 4 +- 5 files changed, 41 insertions(+), 115 deletions(-) delete mode 100644 packet-fix-metadata-fetch.patch delete mode 100644 packet-fix-userdata-fetch.patch diff --git a/.gitignore b/.gitignore index b257cfe..f430b45 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,5 @@ /ignition-dracut-793d0ef.tar.gz /ignition-dracut-6136be3.tar.gz /ignition-dracut-390779d.tar.gz +/ignition-ee616d5.tar.gz +/ignition-dracut-7ff38d9.tar.gz diff --git a/ignition.spec b/ignition.spec index 497c437..4b508e8 100644 --- a/ignition.spec +++ b/ignition.spec @@ -49,7 +49,7 @@ # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix}/v2 -%global commit 2d3ff5862dc9c1dd0cc78e797f42a19964ac1f4c +%global commit ee616d5fb3d21babe288877e842ea137f3e68d0d %global shortcommit %(c=%{commit}; echo ${c:0:7}) # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these @@ -67,22 +67,18 @@ # https://github.com/coreos/ignition-dracut spec2x branch %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit 390779da2c5b7595882a8426e2c9ec9c073c6da4 +%global dracutcommit 7ff38d9716bf982e3f6495d85c6ce91aab72e88d %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition -Version: 2.2.1 -Release: 5.git%{shortcommit}%{?dist} +Version: 2.3.0 +Release: 1.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz Source1: https://%{dracutprovider_prefix}/archive/%{dracutcommit}/%{dracutrepo}-%{dracutshortcommit}.tar.gz -# Upstream 73cbfa847e4319a202c360bd8cd447712d2067bc -Patch0: packet-fix-userdata-fetch.patch -# Upstream 4c2dcd547b01b2f13ced8d35263ded5fd67fa645 -Patch1: packet-fix-metadata-fetch.patch %define gopath %{_datadir}/gocode ExcludeArch: ppc64 @@ -132,69 +128,69 @@ BuildRequires: golang(golang.org/x/net/http/httpproxy) # Main package Provides (generated with go-mods-to-bundled-provides.py | sort) %if 0%{?with_bundled} Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.19.11 Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.19.11 Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.19.11 Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.19.11 Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.19.11 Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/processcreds)) = 1.19.11 Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.19.11 Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/csm)) = 1.19.11 Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.19.11 Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) = 1.19.11 Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3err)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.19.11 Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.19.11 Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream)) = 1.19.11 Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.19.11 Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.19.11 Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.19.11 Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.19.11 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.19.11 Provides: bundled(golang(github.com/coreos/go-semver/semver)) = 0.3.0 -Provides: bundled(golang(github.com/coreos/go-systemd/unit)) = 0.0.0-20181031085051.git9002847aa142 -Provides: bundled(golang(github.com/coreos/go-systemd/dbus)) = 0.0.0-20181031085051.git9002847aa142 -Provides: bundled(golang(github.com/coreos/vcontext/report)) = 0.0.0-20190529201340.git22b159166068 -Provides: bundled(golang(github.com/coreos/vcontext/path)) = 0.0.0-20190529201340.git22b159166068 -Provides: bundled(golang(github.com/coreos/vcontext/tree)) = 0.0.0-20190529201340.git22b159166068 +Provides: bundled(golang(github.com/coreos/go-systemd/v22/dbus)) = 22.0.0 +Provides: bundled(golang(github.com/coreos/go-systemd/v22/journal)) = 22.0.0 +Provides: bundled(golang(github.com/coreos/go-systemd/v22/unit)) = 22.0.0 Provides: bundled(golang(github.com/coreos/vcontext/json)) = 0.0.0-20190529201340.git22b159166068 +Provides: bundled(golang(github.com/coreos/vcontext/path)) = 0.0.0-20190529201340.git22b159166068 +Provides: bundled(golang(github.com/coreos/vcontext/report)) = 0.0.0-20190529201340.git22b159166068 +Provides: bundled(golang(github.com/coreos/vcontext/tree)) = 0.0.0-20190529201340.git22b159166068 Provides: bundled(golang(github.com/coreos/vcontext/validate)) = 0.0.0-20190529201340.git22b159166068 -Provides: bundled(golang(github.com/godbus/dbus)) = 0.0.0-20181025153459.git66d97aec3384 Provides: bundled(golang(github.com/google/renameio)) = 0.1.0 Provides: bundled(golang(github.com/google/uuid)) = 1.1.1 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/stretchr/testify/assert)) = 1.3.0 Provides: bundled(golang(github.com/vincent-petithory/dataurl)) = 0.0.0-20160330182126.git9a301d65acbb -Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcvmx)) = 0.0.0-20170707015358.git25eff159a728 -Provides: bundled(golang(github.com/vmware/vmw-guestinfo/vmcheck)) = 0.0.0-20170707015358.git25eff159a728 -Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcout)) = 0.0.0-20170707015358.git25eff159a728 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/bdoor)) = 0.0.0-20170707015358.git25eff159a728 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/message)) = 0.0.0-20170707015358.git25eff159a728 +Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcout)) = 0.0.0-20170707015358.git25eff159a728 +Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcvmx)) = 0.0.0-20170707015358.git25eff159a728 +Provides: bundled(golang(github.com/vmware/vmw-guestinfo/vmcheck)) = 0.0.0-20170707015358.git25eff159a728 Provides: bundled(golang(github.com/vmware/vmw-ovflib)) = 0.0.0-20170608004843.git1f217b9dc714 Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.0.0-20190228165749.git92fc7df08ae7 Provides: bundled(golang(golang.org/x/net/idna)) = 0.0.0-20190228165749.git92fc7df08ae7 Provides: bundled(golang(golang.org/x/sys/unix)) = 0.0.0-20191110163157.gitd32e6e3b99c4 Provides: bundled(golang(golang.org/x/text/secure/bidirule)) = 0.3.0 +Provides: bundled(golang(golang.org/x/text/transform)) = 0.3.0 Provides: bundled(golang(golang.org/x/text/unicode/bidi)) = 0.3.0 Provides: bundled(golang(golang.org/x/text/unicode/norm)) = 0.3.0 -Provides: bundled(golang(golang.org/x/text/transform)) = 0.3.0 %endif @@ -380,8 +376,6 @@ Ignition project's Github releases page. # setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html # unpack source0 and apply patches %setup -T -b 0 -q -n %{repo}-%{commit} -%patch0 -p1 -%patch1 -p1 # unpack source1 (dracut modules) %setup -T -D -a 1 -q -n %{repo}-%{commit} @@ -546,6 +540,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Tue May 05 2020 Benjamin Gilbert - 2.3.0-1.gitee616d5 +- New release +- Bump ignition-dracut + * Sun Apr 26 2020 Dusty Mabe - 2.2.1-5.git2d3ff58 - Update to latest ignition-dracut for network fixes https://github.com/coreos/ignition-dracut/pull/174 diff --git a/packet-fix-metadata-fetch.patch b/packet-fix-metadata-fetch.patch deleted file mode 100644 index 33c88f9..0000000 --- a/packet-fix-metadata-fetch.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 4c2dcd547b01b2f13ced8d35263ded5fd67fa645 Mon Sep 17 00:00:00 2001 -From: Benjamin Gilbert -Date: Sat, 28 Mar 2020 01:15:32 -0400 -Subject: [PATCH 2/2] providers/packet: override Accept header fetching - instance metadata - -Passing nil Headers is no longer sufficient to avoid the default Accept -header; we need to override it. Fixes 406 Not Acceptable error. - -Fixes: 75d3e2da74ae ("Rework fetch/resource to automatically append required headers") ---- - internal/providers/packet/packet.go | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/internal/providers/packet/packet.go b/internal/providers/packet/packet.go -index 8771734..613a6ba 100644 ---- a/internal/providers/packet/packet.go -+++ b/internal/providers/packet/packet.go -@@ -71,8 +71,10 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { - func PostStatus(stageName string, f resource.Fetcher, errMsg error) error { - f.Logger.Info("POST message to Packet Timeline") - // fetch JSON from https://metadata.packet.net/metadata -+ headers := make(http.Header) -+ headers.Set("Accept", "*/*") - data, err := f.FetchToBuffer(metadataUrl, resource.FetchOptions{ -- Headers: nil, -+ Headers: headers, - }) - if err != nil { - return err --- -2.24.1 - diff --git a/packet-fix-userdata-fetch.patch b/packet-fix-userdata-fetch.patch deleted file mode 100644 index 468b5bc..0000000 --- a/packet-fix-userdata-fetch.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 73cbfa847e4319a202c360bd8cd447712d2067bc Mon Sep 17 00:00:00 2001 -From: Benjamin Gilbert -Date: Sat, 28 Mar 2020 01:07:54 -0400 -Subject: [PATCH 1/2] resource/url: allow caller-specified headers to override - defaults - -Set defaults first, then override them with caller-specified headers. -Fixes default Accept header causing 406 Not Acceptable when fetching -userdata on Packet. - -Fixes: 75d3e2da74ae ("Rework fetch/resource to automatically append required headers") ---- - internal/resource/url.go | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/internal/resource/url.go b/internal/resource/url.go -index c304758..d08964a 100644 ---- a/internal/resource/url.go -+++ b/internal/resource/url.go -@@ -257,14 +257,14 @@ func (f *Fetcher) fetchFromHTTP(u url.URL, dest io.Writer, opts FetchOptions) er - // TODO use .Clone() when we have a new enough golang - // (With Rust, we'd have immutability and wouldn't need to defensively clone) - headers := make(http.Header) -- for k, va := range opts.Headers { -+ for k, va := range configHeaders { - for _, v := range va { -- headers.Add(k, v) -+ headers.Set(k, v) - } - } -- for k, va := range configHeaders { -+ for k, va := range opts.Headers { - for _, v := range va { -- headers.Add(k, v) -+ headers.Set(k, v) - } - } - --- -2.24.1 - diff --git a/sources b/sources index 78dd1d5..a8e4bf7 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-2d3ff58.tar.gz) = 116450e0a4afb8a38fa0c0e925f7ee56ec6bab42b43cc5e314c882d74d44065be35bbf224cd45177ae788eb4be98181c0c19b3987a488d5d8ad6048e952ecbd1 -SHA512 (ignition-dracut-390779d.tar.gz) = a282b21e094b6660e52d0c7843f53426a76838907c5cb36508e4d7616d66eb519a8a7480bff69f2e2f17b973321a563b8fa9ec1565292b892973e9f07019c4cc +SHA512 (ignition-ee616d5.tar.gz) = 179e916ff97b3a6cd98c49cde7f2fbb213afbca29c33a3e58d2ca9c52dd6f51129bb47c72aec82911f251d6c3e43867109dcf6f4b97429b8383f5fc81be04e3f +SHA512 (ignition-dracut-7ff38d9.tar.gz) = acbee4af287ec03b2044d0bf4592ace2f9e36d6daf66251dc1d9214f7f2aa93b92afe11142d0311d7c4b3292e01303ce87111a377f0b83b4116715ec23b31332 From de97bc03b2c1bc5e40369a99ed8d2b488d63370f Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Mon, 1 Jun 2020 14:28:40 -0400 Subject: [PATCH 081/172] Update to latest ignition-dracut to fix error handling https://github.com/coreos/ignition-dracut/pull/188 --- .gitignore | 1 + ignition.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f430b45..f383056 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ /ignition-dracut-390779d.tar.gz /ignition-ee616d5.tar.gz /ignition-dracut-7ff38d9.tar.gz +/ignition-dracut-8f5d1ec.tar.gz diff --git a/ignition.spec b/ignition.spec index 4b508e8..084c416 100644 --- a/ignition.spec +++ b/ignition.spec @@ -67,13 +67,13 @@ # https://github.com/coreos/ignition-dracut spec2x branch %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit 7ff38d9716bf982e3f6495d85c6ce91aab72e88d +%global dracutcommit 8f5d1ec1189342bfcc896794ba875cc6ad6c7a5c %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 2.3.0 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -540,6 +540,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Mon Jun 01 2020 Jonathan Lebon - 2.3.0-2.gitee616d5 +- Update to latest ignition-dracut to fix error handling + https://github.com/coreos/ignition-dracut/pull/188 + * Tue May 05 2020 Benjamin Gilbert - 2.3.0-1.gitee616d5 - New release - Bump ignition-dracut diff --git a/sources b/sources index a8e4bf7..e9492df 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ignition-ee616d5.tar.gz) = 179e916ff97b3a6cd98c49cde7f2fbb213afbca29c33a3e58d2ca9c52dd6f51129bb47c72aec82911f251d6c3e43867109dcf6f4b97429b8383f5fc81be04e3f -SHA512 (ignition-dracut-7ff38d9.tar.gz) = acbee4af287ec03b2044d0bf4592ace2f9e36d6daf66251dc1d9214f7f2aa93b92afe11142d0311d7c4b3292e01303ce87111a377f0b83b4116715ec23b31332 +SHA512 (ignition-dracut-8f5d1ec.tar.gz) = 5d71851ae4794a4a87564548f1bf6eafed31f1e5776bea829780e48fff7cc5046b90eeda0ee756c6d6a9140df03aed0fd1c30a55c3c8200f22f5dbfff2920d80 From 6dedd4b44185b185d6b203eeed136596c31825ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Mon, 15 Jun 2020 17:11:45 +0200 Subject: [PATCH 082/172] Update to latest ignition-dracut to fix coreos-gpt-setup unit https://github.com/coreos/ignition-dracut/pull/191 --- .gitignore | 1 + ignition.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f383056..ad55c0f 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,4 @@ /ignition-ee616d5.tar.gz /ignition-dracut-7ff38d9.tar.gz /ignition-dracut-8f5d1ec.tar.gz +/ignition-dracut-bdf0a65.tar.gz diff --git a/ignition.spec b/ignition.spec index 084c416..998d915 100644 --- a/ignition.spec +++ b/ignition.spec @@ -67,13 +67,13 @@ # https://github.com/coreos/ignition-dracut spec2x branch %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit 8f5d1ec1189342bfcc896794ba875cc6ad6c7a5c +%global dracutcommit bdf0a653584eb07b3ea87078ff427473821bdc2c %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition Version: 2.3.0 -Release: 2.git%{shortcommit}%{?dist} +Release: 3.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -540,6 +540,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Mon Jun 15 2020 Timothée Ravier - 2.3.0-3.gitee616d5 +- Update to latest ignition-dracut to fix coreos-gpt-setup unit + https://github.com/coreos/ignition-dracut/pull/191 + * Mon Jun 01 2020 Jonathan Lebon - 2.3.0-2.gitee616d5 - Update to latest ignition-dracut to fix error handling https://github.com/coreos/ignition-dracut/pull/188 diff --git a/sources b/sources index e9492df..8230405 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ignition-ee616d5.tar.gz) = 179e916ff97b3a6cd98c49cde7f2fbb213afbca29c33a3e58d2ca9c52dd6f51129bb47c72aec82911f251d6c3e43867109dcf6f4b97429b8383f5fc81be04e3f -SHA512 (ignition-dracut-8f5d1ec.tar.gz) = 5d71851ae4794a4a87564548f1bf6eafed31f1e5776bea829780e48fff7cc5046b90eeda0ee756c6d6a9140df03aed0fd1c30a55c3c8200f22f5dbfff2920d80 +SHA512 (ignition-dracut-bdf0a65.tar.gz) = 284f077df975efb6a3afef445a1db66d2c688c8d831b56790738d566e19c4f457ea27e99083099e1d2c066675e7ea2d39b23e714056d3c4892d53155322d1372 From 480b997359f379eb26c07c98a5d122aac24e9118 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Mon, 13 Jul 2020 18:46:38 -0400 Subject: [PATCH 083/172] Ignition 2.4.0 --- .gitignore | 2 + ignition.spec | 166 +++++++++++++++++++++++++++++++++++--------------- sources | 4 +- 3 files changed, 122 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index ad55c0f..036b47c 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,5 @@ /ignition-dracut-7ff38d9.tar.gz /ignition-dracut-8f5d1ec.tar.gz /ignition-dracut-bdf0a65.tar.gz +/ignition-d18bf90.tar.gz +/ignition-dracut-e75fef0.tar.gz diff --git a/ignition.spec b/ignition.spec index 998d915..214a208 100644 --- a/ignition.spec +++ b/ignition.spec @@ -49,7 +49,7 @@ # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix}/v2 -%global commit ee616d5fb3d21babe288877e842ea137f3e68d0d +%global commit d18bf905455ba53c4363d2adbfb1d6777a1be315 %global shortcommit %(c=%{commit}; echo ${c:0:7}) # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these @@ -67,13 +67,13 @@ # https://github.com/coreos/ignition-dracut spec2x branch %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit bdf0a653584eb07b3ea87078ff427473821bdc2c +%global dracutcommit e75fef0aad283f052d0344884cbaa08025aca5e0 %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition -Version: 2.3.0 -Release: 3.git%{shortcommit}%{?dist} +Version: 2.4.0 +Release: 1.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} @@ -127,42 +127,58 @@ BuildRequires: golang(golang.org/x/net/http/httpproxy) # Main package Provides (generated with go-mods-to-bundled-provides.py | sort) %if 0%{?with_bundled} -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/processcreds)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/csm)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3err)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.19.11 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.19.11 +Provides: bundled(golang(cloud.google.com/go)) = 0.58.0 +Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.58.0 +Provides: bundled(golang(cloud.google.com/go/iam)) = 0.58.0 +Provides: bundled(golang(cloud.google.com/go/internal)) = 0.58.0 +Provides: bundled(golang(cloud.google.com/go/internal/optional)) = 0.58.0 +Provides: bundled(golang(cloud.google.com/go/internal/trace)) = 0.58.0 +Provides: bundled(golang(cloud.google.com/go/internal/version)) = 0.58.0 +Provides: bundled(golang(cloud.google.com/go/storage)) = 0.58.0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/arn)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/processcreds)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/csm)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/context)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3err)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkmath)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/strings)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sync/singleflight)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/json/jsonutil)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/internal/arn)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.30.28 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts/stsiface)) = 1.30.28 Provides: bundled(golang(github.com/coreos/go-semver/semver)) = 0.3.0 Provides: bundled(golang(github.com/coreos/go-systemd/v22/dbus)) = 22.0.0 Provides: bundled(golang(github.com/coreos/go-systemd/v22/journal)) = 22.0.0 @@ -176,7 +192,7 @@ Provides: bundled(golang(github.com/google/renameio)) = 0.1.0 Provides: bundled(golang(github.com/google/uuid)) = 1.1.1 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/stretchr/testify/assert)) = 1.3.0 +Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.5.1 Provides: bundled(golang(github.com/vincent-petithory/dataurl)) = 0.0.0-20160330182126.git9a301d65acbb Provides: bundled(golang(github.com/vmware/vmw-guestinfo/bdoor)) = 0.0.0-20170707015358.git25eff159a728 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/message)) = 0.0.0-20170707015358.git25eff159a728 @@ -184,13 +200,63 @@ Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcout)) = 0.0.0-201707 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcvmx)) = 0.0.0-20170707015358.git25eff159a728 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/vmcheck)) = 0.0.0-20170707015358.git25eff159a728 Provides: bundled(golang(github.com/vmware/vmw-ovflib)) = 0.0.0-20170608004843.git1f217b9dc714 -Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.0.0-20190228165749.git92fc7df08ae7 -Provides: bundled(golang(golang.org/x/net/idna)) = 0.0.0-20190228165749.git92fc7df08ae7 -Provides: bundled(golang(golang.org/x/sys/unix)) = 0.0.0-20191110163157.gitd32e6e3b99c4 -Provides: bundled(golang(golang.org/x/text/secure/bidirule)) = 0.3.0 -Provides: bundled(golang(golang.org/x/text/transform)) = 0.3.0 -Provides: bundled(golang(golang.org/x/text/unicode/bidi)) = 0.3.0 -Provides: bundled(golang(golang.org/x/text/unicode/norm)) = 0.3.0 +Provides: bundled(golang(golang.org/x/net/context)) = 0.0.0-20200602114024.git627f9648deb9 +Provides: bundled(golang(golang.org/x/net/context/ctxhttp)) = 0.0.0-20200602114024.git627f9648deb9 +Provides: bundled(golang(golang.org/x/net/http2)) = 0.0.0-20200602114024.git627f9648deb9 +Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.0.0-20200602114024.git627f9648deb9 +Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.0.0-20200602114024.git627f9648deb9 +Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.0.0-20200602114024.git627f9648deb9 +Provides: bundled(golang(golang.org/x/net/idna)) = 0.0.0-20200602114024.git627f9648deb9 +Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.0.0-20200602114024.git627f9648deb9 +Provides: bundled(golang(golang.org/x/net/trace)) = 0.0.0-20200602114024.git627f9648deb9 +Provides: bundled(golang(golang.org/x/oauth2)) = 0.0.0-20200107190931.gitbf48bf16ab8d +Provides: bundled(golang(golang.org/x/oauth2/google)) = 0.0.0-20200107190931.gitbf48bf16ab8d +Provides: bundled(golang(golang.org/x/oauth2/internal)) = 0.0.0-20200107190931.gitbf48bf16ab8d +Provides: bundled(golang(golang.org/x/oauth2/jws)) = 0.0.0-20200107190931.gitbf48bf16ab8d +Provides: bundled(golang(golang.org/x/oauth2/jwt)) = 0.0.0-20200107190931.gitbf48bf16ab8d +Provides: bundled(golang(golang.org/x/sys/internal/unsafeheader)) = 0.0.0-20200610111108.git226ff32320da +Provides: bundled(golang(golang.org/x/sys/unix)) = 0.0.0-20200610111108.git226ff32320da +Provides: bundled(golang(golang.org/x/tools/cmd/goimports)) = 0.0.0-20200610160956.git3e83d1e96d0e +Provides: bundled(golang(golang.org/x/tools/go/analysis)) = 0.0.0-20200610160956.git3e83d1e96d0e +Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/inspect)) = 0.0.0-20200610160956.git3e83d1e96d0e +Provides: bundled(golang(golang.org/x/tools/go/ast/astutil)) = 0.0.0-20200610160956.git3e83d1e96d0e +Provides: bundled(golang(golang.org/x/tools/go/ast/inspector)) = 0.0.0-20200610160956.git3e83d1e96d0e +Provides: bundled(golang(golang.org/x/tools/go/buildutil)) = 0.0.0-20200610160956.git3e83d1e96d0e +Provides: bundled(golang(golang.org/x/tools/go/gcexportdata)) = 0.0.0-20200610160956.git3e83d1e96d0e +Provides: bundled(golang(golang.org/x/tools/go/internal/cgo)) = 0.0.0-20200610160956.git3e83d1e96d0e +Provides: bundled(golang(golang.org/x/tools/go/internal/gcimporter)) = 0.0.0-20200610160956.git3e83d1e96d0e +Provides: bundled(golang(golang.org/x/tools/go/internal/packagesdriver)) = 0.0.0-20200610160956.git3e83d1e96d0e +Provides: bundled(golang(golang.org/x/tools/go/loader)) = 0.0.0-20200610160956.git3e83d1e96d0e +Provides: bundled(golang(golang.org/x/tools/go/packages)) = 0.0.0-20200610160956.git3e83d1e96d0e +Provides: bundled(golang(golang.org/x/tools/go/types/objectpath)) = 0.0.0-20200610160956.git3e83d1e96d0e +Provides: bundled(golang(golang.org/x/tools/go/types/typeutil)) = 0.0.0-20200610160956.git3e83d1e96d0e +Provides: bundled(golang(golang.org/x/tools/internal/analysisinternal)) = 0.0.0-20200610160956.git3e83d1e96d0e +Provides: bundled(golang(golang.org/x/tools/internal/event)) = 0.0.0-20200610160956.git3e83d1e96d0e +Provides: bundled(golang(golang.org/x/tools/internal/event/core)) = 0.0.0-20200610160956.git3e83d1e96d0e +Provides: bundled(golang(golang.org/x/tools/internal/event/keys)) = 0.0.0-20200610160956.git3e83d1e96d0e +Provides: bundled(golang(golang.org/x/tools/internal/event/label)) = 0.0.0-20200610160956.git3e83d1e96d0e +Provides: bundled(golang(golang.org/x/tools/internal/fastwalk)) = 0.0.0-20200610160956.git3e83d1e96d0e +Provides: bundled(golang(golang.org/x/tools/internal/gocommand)) = 0.0.0-20200610160956.git3e83d1e96d0e +Provides: bundled(golang(golang.org/x/tools/internal/gopathwalk)) = 0.0.0-20200610160956.git3e83d1e96d0e +Provides: bundled(golang(golang.org/x/tools/internal/imports)) = 0.0.0-20200610160956.git3e83d1e96d0e +Provides: bundled(golang(golang.org/x/tools/internal/packagesinternal)) = 0.0.0-20200610160956.git3e83d1e96d0e +Provides: bundled(golang(google.golang.org/api/googleapi)) = 0.26.0 +Provides: bundled(golang(google.golang.org/api/googleapi/transport)) = 0.26.0 +Provides: bundled(golang(google.golang.org/api/internal)) = 0.26.0 +Provides: bundled(golang(google.golang.org/api/internal/gensupport)) = 0.26.0 +Provides: bundled(golang(google.golang.org/api/internal/third_party/uritemplates)) = 0.26.0 +Provides: bundled(golang(google.golang.org/api/iterator)) = 0.26.0 +Provides: bundled(golang(google.golang.org/api/option)) = 0.26.0 +Provides: bundled(golang(google.golang.org/api/option/internaloption)) = 0.26.0 +Provides: bundled(golang(google.golang.org/api/storage/v1)) = 0.26.0 +Provides: bundled(golang(google.golang.org/api/transport/cert)) = 0.26.0 +Provides: bundled(golang(google.golang.org/api/transport/http)) = 0.26.0 +Provides: bundled(golang(google.golang.org/api/transport/http/internal/propagation)) = 0.26.0 +Provides: bundled(golang(google.golang.org/genproto/googleapis/api/annotations)) = 0.0.0-20200610104632.gita5b850bcf112 +Provides: bundled(golang(google.golang.org/genproto/googleapis/iam/v1)) = 0.0.0-20200610104632.gita5b850bcf112 +Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc/code)) = 0.0.0-20200610104632.gita5b850bcf112 +Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc/status)) = 0.0.0-20200610104632.gita5b850bcf112 +Provides: bundled(golang(google.golang.org/genproto/googleapis/type/expr)) = 0.0.0-20200610104632.gita5b850bcf112 %endif @@ -540,6 +606,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Mon Jul 13 2020 Benjamin Gilbert - 2.4.0-1.gitd18bf90 +- New release +- Bump ignition-dracut + * Mon Jun 15 2020 Timothée Ravier - 2.3.0-3.gitee616d5 - Update to latest ignition-dracut to fix coreos-gpt-setup unit https://github.com/coreos/ignition-dracut/pull/191 diff --git a/sources b/sources index 8230405..7762359 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-ee616d5.tar.gz) = 179e916ff97b3a6cd98c49cde7f2fbb213afbca29c33a3e58d2ca9c52dd6f51129bb47c72aec82911f251d6c3e43867109dcf6f4b97429b8383f5fc81be04e3f -SHA512 (ignition-dracut-bdf0a65.tar.gz) = 284f077df975efb6a3afef445a1db66d2c688c8d831b56790738d566e19c4f457ea27e99083099e1d2c066675e7ea2d39b23e714056d3c4892d53155322d1372 +SHA512 (ignition-d18bf90.tar.gz) = 8621fa1ae5ac74f6cb285f8e86efd094a705f3508ac5aeebbf5304c694d28ea823a542d1e44e56fbdc66ebe0b7ce49d521f2dd9cb4695cf485a0dfa533dcca1e +SHA512 (ignition-dracut-e75fef0.tar.gz) = 43402225387ac10a70ed36b3fa813d380bc3cc17ba4b4ec16d4f0b50fed84145a0b30bf26610a64181d94934c671b2a85faf861fe5ee964a7e693f89a4677a5a From 64c18a989ec38fed0de3a5654d4909bc5fda2c03 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 15 Jul 2020 13:35:57 -0400 Subject: [PATCH 084/172] Backport root homedir relabeling fix Need https://github.com/coreos/ignition/pull/1029 for https://github.com/coreos/fedora-coreos-config/pull/426#issuecomment-658867731. --- ...-relabel-homedir-symlinks-themselves.patch | 51 +++++++++++++++++++ ignition.spec | 10 +++- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 0001-files-don-t-relabel-homedir-symlinks-themselves.patch diff --git a/0001-files-don-t-relabel-homedir-symlinks-themselves.patch b/0001-files-don-t-relabel-homedir-symlinks-themselves.patch new file mode 100644 index 0000000..0264b6a --- /dev/null +++ b/0001-files-don-t-relabel-homedir-symlinks-themselves.patch @@ -0,0 +1,51 @@ +From 6be9319720458c8c52dd0f5b760f5c6449775d14 Mon Sep 17 00:00:00 2001 +From: Jonathan Lebon +Date: Wed, 15 Jul 2020 12:13:12 -0400 +Subject: [PATCH] files: don't relabel homedir symlinks themselves + +Regression from #996. If the home directory is a symlink, then just +relabel the referent, not the symlink itself. Since the symlink already +existed, we assume that it's properly labeled. + +This causes an error on the FCOS live ISO, where `/sysroot` is mounted +from the squashfs, and so is read-only. But even on non-live, we should +just assume that whatever created the `/root -> /var/roothome` symlink +labeled it correctly. + +This would normally be a no-op because `setfiles` would see that it's +properly labeled and not even attempt a `setxattr`. But because we can't +yet read SELinux labels from the initrd, it thinks it's unlabeled. (That +will be fixed by https://bugzilla.redhat.com/show_bug.cgi?id=1845210). +--- + internal/exec/stages/files/passwd.go | 9 ++++++--- + 1 file changed, 6 insertions(+), 3 deletions(-) + +diff --git a/internal/exec/stages/files/passwd.go b/internal/exec/stages/files/passwd.go +index 3ef4b00..7e4263f 100644 +--- a/internal/exec/stages/files/passwd.go ++++ b/internal/exec/stages/files/passwd.go +@@ -75,15 +75,18 @@ func (s *stage) createPasswd(config types.Config) error { + if err != nil { + return err + } +- s.relabel(homedir) + + // Check if the homedir is actually a symlink, and make sure we +- // relabel the target too. This is relevant on OSTree-based +- // platforms, where /root is a link to /var/roothome. ++ // relabel the target instead in that case. This is relevant on ++ // OSTree-based platforms, where /root is a link to /var/roothome. + if resolved, err := s.ResolveSymlink(homedir); err != nil { + return err + } else if resolved != "" { ++ // note we don't relabel the symlink itself; we assume it's ++ // already properly labeled + s.relabel(resolved) ++ } else { ++ s.relabel(homedir) + } + } + } +-- +2.26.2 + diff --git a/ignition.spec b/ignition.spec index 214a208..49d65bc 100644 --- a/ignition.spec +++ b/ignition.spec @@ -73,13 +73,15 @@ Name: ignition Version: 2.4.0 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz Source1: https://%{dracutprovider_prefix}/archive/%{dracutcommit}/%{dracutrepo}-%{dracutshortcommit}.tar.gz +Patch0: 0001-files-don-t-relabel-homedir-symlinks-themselves.patch + %define gopath %{_datadir}/gocode ExcludeArch: ppc64 BuildRequires: golang >= 1.10 @@ -442,6 +444,7 @@ Ignition project's Github releases page. # setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html # unpack source0 and apply patches %setup -T -b 0 -q -n %{repo}-%{commit} +%patch0 -p1 # unpack source1 (dracut modules) %setup -T -D -a 1 -q -n %{repo}-%{commit} @@ -606,6 +609,11 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Wed Jul 15 2020 Jonathan Lebon - 2.4.0-2.gitd18bf90 +- Backport root homedir relabeling fix + https://github.com/coreos/ignition/pull/1029 for + https://github.com/coreos/fedora-coreos-config/pull/426#issuecomment-658867731. + * Mon Jul 13 2020 Benjamin Gilbert - 2.4.0-1.gitd18bf90 - New release - Bump ignition-dracut From 64396e2988889c5634e4c8ebcb18527706693a75 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 16 Jul 2020 12:25:54 -0400 Subject: [PATCH 085/172] Ignition 2.4.1 --- .gitignore | 2 + ...-relabel-homedir-symlinks-themselves.patch | 51 ------------------- ignition.spec | 15 +++--- sources | 4 +- 4 files changed, 12 insertions(+), 60 deletions(-) delete mode 100644 0001-files-don-t-relabel-homedir-symlinks-themselves.patch diff --git a/.gitignore b/.gitignore index 036b47c..3db55ef 100644 --- a/.gitignore +++ b/.gitignore @@ -44,3 +44,5 @@ /ignition-dracut-bdf0a65.tar.gz /ignition-d18bf90.tar.gz /ignition-dracut-e75fef0.tar.gz +/ignition-5260a5b.tar.gz +/ignition-dracut-6b1d128.tar.gz diff --git a/0001-files-don-t-relabel-homedir-symlinks-themselves.patch b/0001-files-don-t-relabel-homedir-symlinks-themselves.patch deleted file mode 100644 index 0264b6a..0000000 --- a/0001-files-don-t-relabel-homedir-symlinks-themselves.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 6be9319720458c8c52dd0f5b760f5c6449775d14 Mon Sep 17 00:00:00 2001 -From: Jonathan Lebon -Date: Wed, 15 Jul 2020 12:13:12 -0400 -Subject: [PATCH] files: don't relabel homedir symlinks themselves - -Regression from #996. If the home directory is a symlink, then just -relabel the referent, not the symlink itself. Since the symlink already -existed, we assume that it's properly labeled. - -This causes an error on the FCOS live ISO, where `/sysroot` is mounted -from the squashfs, and so is read-only. But even on non-live, we should -just assume that whatever created the `/root -> /var/roothome` symlink -labeled it correctly. - -This would normally be a no-op because `setfiles` would see that it's -properly labeled and not even attempt a `setxattr`. But because we can't -yet read SELinux labels from the initrd, it thinks it's unlabeled. (That -will be fixed by https://bugzilla.redhat.com/show_bug.cgi?id=1845210). ---- - internal/exec/stages/files/passwd.go | 9 ++++++--- - 1 file changed, 6 insertions(+), 3 deletions(-) - -diff --git a/internal/exec/stages/files/passwd.go b/internal/exec/stages/files/passwd.go -index 3ef4b00..7e4263f 100644 ---- a/internal/exec/stages/files/passwd.go -+++ b/internal/exec/stages/files/passwd.go -@@ -75,15 +75,18 @@ func (s *stage) createPasswd(config types.Config) error { - if err != nil { - return err - } -- s.relabel(homedir) - - // Check if the homedir is actually a symlink, and make sure we -- // relabel the target too. This is relevant on OSTree-based -- // platforms, where /root is a link to /var/roothome. -+ // relabel the target instead in that case. This is relevant on -+ // OSTree-based platforms, where /root is a link to /var/roothome. - if resolved, err := s.ResolveSymlink(homedir); err != nil { - return err - } else if resolved != "" { -+ // note we don't relabel the symlink itself; we assume it's -+ // already properly labeled - s.relabel(resolved) -+ } else { -+ s.relabel(homedir) - } - } - } --- -2.26.2 - diff --git a/ignition.spec b/ignition.spec index 49d65bc..f2c4c57 100644 --- a/ignition.spec +++ b/ignition.spec @@ -49,7 +49,7 @@ # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix}/v2 -%global commit d18bf905455ba53c4363d2adbfb1d6777a1be315 +%global commit 5260a5b355e287bbd4f4830d7c13ccbb87bd48b3 %global shortcommit %(c=%{commit}; echo ${c:0:7}) # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these @@ -67,21 +67,19 @@ # https://github.com/coreos/ignition-dracut spec2x branch %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit e75fef0aad283f052d0344884cbaa08025aca5e0 +%global dracutcommit 6b1d128c6ba2d77825d214ada238a4826e420d40 %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) Name: ignition -Version: 2.4.0 -Release: 2.git%{shortcommit}%{?dist} +Version: 2.4.1 +Release: 1.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 and BSD URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz Source1: https://%{dracutprovider_prefix}/archive/%{dracutcommit}/%{dracutrepo}-%{dracutshortcommit}.tar.gz -Patch0: 0001-files-don-t-relabel-homedir-symlinks-themselves.patch - %define gopath %{_datadir}/gocode ExcludeArch: ppc64 BuildRequires: golang >= 1.10 @@ -444,7 +442,6 @@ Ignition project's Github releases page. # setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html # unpack source0 and apply patches %setup -T -b 0 -q -n %{repo}-%{commit} -%patch0 -p1 # unpack source1 (dracut modules) %setup -T -D -a 1 -q -n %{repo}-%{commit} @@ -609,6 +606,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Thu Jul 16 2020 Benjamin Gilbert - 2.4.1-1.git5260a5b +- New release +- Bump ignition-dracut to fix warning in udev rule + * Wed Jul 15 2020 Jonathan Lebon - 2.4.0-2.gitd18bf90 - Backport root homedir relabeling fix https://github.com/coreos/ignition/pull/1029 for diff --git a/sources b/sources index 7762359..f42ce7d 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-d18bf90.tar.gz) = 8621fa1ae5ac74f6cb285f8e86efd094a705f3508ac5aeebbf5304c694d28ea823a542d1e44e56fbdc66ebe0b7ce49d521f2dd9cb4695cf485a0dfa533dcca1e -SHA512 (ignition-dracut-e75fef0.tar.gz) = 43402225387ac10a70ed36b3fa813d380bc3cc17ba4b4ec16d4f0b50fed84145a0b30bf26610a64181d94934c671b2a85faf861fe5ee964a7e693f89a4677a5a +SHA512 (ignition-5260a5b.tar.gz) = 6e3491fa1a95f1356bec7a04d5d41a4e92416a8776122ae863c152e2297e8ba6519eea6da253dfae37c54d62ae217d74084bd9214a58ed1b4a19fd221a9fbfa9 +SHA512 (ignition-dracut-6b1d128.tar.gz) = 23eb67a8cb03168dca3f21a8a4e16fc1e735bc8d9291ab9a02790d78da41109c6ec68cb4714b56086da9cd7b771aa2899dd85b73948a44b294362e5f497ce877 From b66caa20dbc68cd79787e7790c59cd222d92bbc8 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 23 Jul 2020 22:05:36 -0400 Subject: [PATCH 086/172] Ignition 2.5.0 Co-authored-by: Ben Howard --- .gitignore | 1 + download-ignition-dracut.sh | 3 --- ignition.spec | 40 +++++++++++-------------------------- sources | 3 +-- 4 files changed, 14 insertions(+), 33 deletions(-) delete mode 100755 download-ignition-dracut.sh diff --git a/.gitignore b/.gitignore index 3db55ef..ad9b51d 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ /ignition-dracut-e75fef0.tar.gz /ignition-5260a5b.tar.gz /ignition-dracut-6b1d128.tar.gz +/ignition-0d6f3e5.tar.gz diff --git a/download-ignition-dracut.sh b/download-ignition-dracut.sh deleted file mode 100755 index ff9b4fc..0000000 --- a/download-ignition-dracut.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -set -xeuo pipefail -rpmspec -P ignition.spec | grep 'Source1:' | tr -s ' ' | cut -d ' ' -f 2 | xargs curl -LO diff --git a/ignition.spec b/ignition.spec index f2c4c57..a964896 100644 --- a/ignition.spec +++ b/ignition.spec @@ -18,7 +18,7 @@ # rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition. # (Don't forget to replace double percentage symbol with single one in order to apply a condition) -# Not all devel deps exist in Fedora so you can't install the devel rpm +# Not all devel deps exist in Fedora so you can't install the devel rpm # so we need to build without devel for now # Generate devel rpm %global with_devel 0 @@ -49,7 +49,7 @@ # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix}/v2 -%global commit 5260a5b355e287bbd4f4830d7c13ccbb87bd48b3 +%global commit 0d6f3e5e859821134cd04fcaf47c2488c25aff0d %global shortcommit %(c=%{commit}; echo ${c:0:7}) # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these @@ -57,28 +57,15 @@ %global ldflags ' -X github.com/coreos/ignition/v2/internal/version.Raw=%{version} ' %global buildflags %nil %global testflags %nil - -# macros for ignition-dracut -%global dracutlibdir %{_prefix}/lib/dracut -%global dracutprovider github -%global dracutprovider_tld com -%global dracutproject coreos -%global dracutrepo ignition-dracut -# https://github.com/coreos/ignition-dracut spec2x branch -%global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} -%global dracutimport_path %{dracutprovider_prefix} -%global dracutcommit 6b1d128c6ba2d77825d214ada238a4826e420d40 -%global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) - +%global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Version: 2.4.1 +Version: 2.5.0 Release: 1.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool -License: ASL 2.0 and BSD +License: ASL 2.0 URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz -Source1: https://%{dracutprovider_prefix}/archive/%{dracutcommit}/%{dracutrepo}-%{dracutshortcommit}.tar.gz %define gopath %{_datadir}/gocode ExcludeArch: ppc64 @@ -443,11 +430,6 @@ Ignition project's Github releases page. # unpack source0 and apply patches %setup -T -b 0 -q -n %{repo}-%{commit} -# unpack source1 (dracut modules) -%setup -T -D -a 1 -q -n %{repo}-%{commit} -cd %{dracutrepo}-%{dracutcommit} -mv LICENSE ../LICENSE.dracut - %build # Set up PWD as a proper import path for go mkdir -p src/%{provider}.%{provider_tld}/%{project} @@ -482,13 +464,11 @@ export GOARCH= export GOOS=linux %install -# ignition-dracut +# dracut modules install -d -p %{buildroot}/%{dracutlibdir}/modules.d install -d -p %{buildroot}/%{_prefix}/lib/systemd/system -pushd %{dracutrepo}-%{dracutcommit} >/dev/null cp -r dracut/* %{buildroot}/%{dracutlibdir}/modules.d/ install -m 0644 -t %{buildroot}/%{_prefix}/lib/systemd/system/ systemd/* -popd >/dev/null # ignition install -d -p %{buildroot}%{_bindir} @@ -576,7 +556,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %{!?_licensedir:%global license %doc} %files -%license LICENSE LICENSE.dracut +%license LICENSE %doc README.md doc/ %{dracutlibdir}/modules.d/* %{_prefix}/lib/systemd/system/*.service @@ -606,6 +586,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Thu Jul 23 2020 Benjamin Gilbert - 2.5.0-1.git0d6f3e5 +- New release +- Ship support code from Ignition tarball instead of ignition-dracut + * Thu Jul 16 2020 Benjamin Gilbert - 2.4.1-1.git5260a5b - New release - Bump ignition-dracut to fix warning in udev rule @@ -807,7 +791,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} * Thu Oct 25 2018 Dusty Mabe - 0.28.0-10.gitf707912 - Bump to ignition-dracut decf63f - * 03d8438 30ignition: only instmods if module available - + * Thu Oct 25 2018 Dusty Mabe - 0.28.0-9.gitf707912 - Bump to ignition-dracut 7ee64ca - * 3ec0b39 remove ignition-remount-sysroot.service files diff --git a/sources b/sources index f42ce7d..decac9b 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (ignition-5260a5b.tar.gz) = 6e3491fa1a95f1356bec7a04d5d41a4e92416a8776122ae863c152e2297e8ba6519eea6da253dfae37c54d62ae217d74084bd9214a58ed1b4a19fd221a9fbfa9 -SHA512 (ignition-dracut-6b1d128.tar.gz) = 23eb67a8cb03168dca3f21a8a4e16fc1e735bc8d9291ab9a02790d78da41109c6ec68cb4714b56086da9cd7b771aa2899dd85b73948a44b294362e5f497ce877 +SHA512 (ignition-0d6f3e5.tar.gz) = 63bdb02ad34bf1826fd12c1cc93122b603df67a5d168a0f443b4d091b468bbb66dc8f8d920666b5d89d89adbb7e40a716acf367da7b2e81bea6c1aeaa795ef00 From 3fba3554eca35a3ab450bcb310496fe8d0b363bc Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 01:41:10 +0000 Subject: [PATCH 087/172] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ignition.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index a964896..5fc7bf6 100644 --- a/ignition.spec +++ b/ignition.spec @@ -61,7 +61,7 @@ Name: ignition Version: 2.5.0 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} @@ -586,6 +586,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 2.5.0-2.git0d6f3e5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Thu Jul 23 2020 Benjamin Gilbert - 2.5.0-1.git0d6f3e5 - New release - Ship support code from Ignition tarball instead of ignition-dracut From fd1940c70ee23a94cf7113c16abe712cc2d2e5f5 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Fri, 7 Aug 2020 09:44:02 -0400 Subject: [PATCH 088/172] Backport conditional networking fix for OpenStack and CloudStack https://github.com/coreos/ignition/pull/1057 --- ...stack-openstack-propagate-ErrNeedNet.patch | 97 +++++++++++++++++++ ignition.spec | 9 +- 2 files changed, 105 insertions(+), 1 deletion(-) create mode 100644 0001-cloudstack-openstack-propagate-ErrNeedNet.patch diff --git a/0001-cloudstack-openstack-propagate-ErrNeedNet.patch b/0001-cloudstack-openstack-propagate-ErrNeedNet.patch new file mode 100644 index 0000000..ec82663 --- /dev/null +++ b/0001-cloudstack-openstack-propagate-ErrNeedNet.patch @@ -0,0 +1,97 @@ +From 96cb2f3776d453c50e55185a50c980ff210b1719 Mon Sep 17 00:00:00 2001 +From: Jonathan Lebon +Date: Fri, 31 Jul 2020 09:24:33 -0400 +Subject: [PATCH] cloudstack|openstack: propagate ErrNeedNet + +On CloudStack/OpenStack, we fetch from three different sources +simultaneously: two config drives, and the metadata service. +Error-handling for these goroutines was causing `ErrNeedNet` from the +latter to be ignored and so we weren't correctly propagating it back to +the caller (which keys off of it to signal to the OS that networking is +needed). + +Do a simple hack where we check if `ErrNeedNet` was hit and if none of +the fetchers succeed, then we return that instead. (The better fix of +course is to not try to parallel guess the metadata source like this, +but that's a much bigger issue.) + +Fixes: #956 +Fixes: #1056 +--- + internal/providers/cloudstack/cloudstack.go | 10 ++++++++++ + internal/providers/openstack/openstack.go | 10 ++++++++++ + 2 files changed, 20 insertions(+) + +diff --git a/internal/providers/cloudstack/cloudstack.go b/internal/providers/cloudstack/cloudstack.go +index d4cc440c..83ed3700 100644 +--- a/internal/providers/cloudstack/cloudstack.go ++++ b/internal/providers/cloudstack/cloudstack.go +@@ -50,6 +50,8 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { + var data []byte + ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) + ++ sawErrNeedNet := false ++ + dispatch := func(name string, fn func() ([]byte, error)) { + raw, err := fn() + if err != nil { +@@ -57,6 +59,9 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { + case context.Canceled: + case context.DeadlineExceeded: + f.Logger.Err("timed out while fetching config from %s", name) ++ case resource.ErrNeedNet: ++ sawErrNeedNet = true ++ fallthrough + default: + f.Logger.Err("failed to fetch config from %s: %v", name, err) + } +@@ -81,6 +86,11 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { + + <-ctx.Done() + if ctx.Err() == context.DeadlineExceeded { ++ // Did we hit neednet? If so, propagate that up instead. The OS should ++ // retry fetching again once networking is up. ++ if sawErrNeedNet { ++ return types.Config{}, report.Report{}, resource.ErrNeedNet ++ } + f.Logger.Info("neither config drive nor metadata service were available in time. Continuing without a config...") + } + +diff --git a/internal/providers/openstack/openstack.go b/internal/providers/openstack/openstack.go +index d511bda2..41699515 100644 +--- a/internal/providers/openstack/openstack.go ++++ b/internal/providers/openstack/openstack.go +@@ -55,6 +55,8 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { + var data []byte + ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) + ++ sawErrNeedNet := false ++ + dispatch := func(name string, fn func() ([]byte, error)) { + raw, err := fn() + if err != nil { +@@ -62,6 +64,9 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { + case context.Canceled: + case context.DeadlineExceeded: + f.Logger.Err("timed out while fetching config from %s", name) ++ case resource.ErrNeedNet: ++ sawErrNeedNet = true ++ fallthrough + default: + f.Logger.Err("failed to fetch config from %s: %v", name, err) + } +@@ -86,6 +91,11 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { + + <-ctx.Done() + if ctx.Err() == context.DeadlineExceeded { ++ // Did we hit neednet? If so, propagate that up instead. The OS should ++ // retry fetching again once networking is up. ++ if sawErrNeedNet { ++ return types.Config{}, report.Report{}, resource.ErrNeedNet ++ } + f.Logger.Info("neither config drive nor metadata service were available in time. Continuing without a config...") + } + +-- +2.26.2 + diff --git a/ignition.spec b/ignition.spec index 5fc7bf6..f196acc 100644 --- a/ignition.spec +++ b/ignition.spec @@ -61,12 +61,14 @@ Name: ignition Version: 2.5.0 -Release: 2.git%{shortcommit}%{?dist} +Release: 3.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +Patch0: 0001-cloudstack-openstack-propagate-ErrNeedNet.patch + %define gopath %{_datadir}/gocode ExcludeArch: ppc64 BuildRequires: golang >= 1.10 @@ -429,6 +431,7 @@ Ignition project's Github releases page. # setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html # unpack source0 and apply patches %setup -T -b 0 -q -n %{repo}-%{commit} +%patch0 -p1 %build # Set up PWD as a proper import path for go @@ -586,6 +589,10 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Aug 07 2020 Jonathan Lebon - 2.5.0-3.git0d6f3e5 +- Backport conditional networking fix for OpenStack and CloudStack + https://github.com/coreos/ignition/pull/1057 + * Tue Jul 28 2020 Fedora Release Engineering - 2.5.0-2.git0d6f3e5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 0e08b0f288dca863c2dfb590b822833b8a3b5749 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 7 Aug 2020 23:50:33 -0400 Subject: [PATCH 089/172] Ignition 2.6.0 --- .gitignore | 1 + ...stack-openstack-propagate-ErrNeedNet.patch | 97 ------------------- ignition.spec | 14 +-- sources | 2 +- 4 files changed, 10 insertions(+), 104 deletions(-) delete mode 100644 0001-cloudstack-openstack-propagate-ErrNeedNet.patch diff --git a/.gitignore b/.gitignore index ad9b51d..e84aee3 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,4 @@ /ignition-5260a5b.tar.gz /ignition-dracut-6b1d128.tar.gz /ignition-0d6f3e5.tar.gz +/ignition-947598e.tar.gz diff --git a/0001-cloudstack-openstack-propagate-ErrNeedNet.patch b/0001-cloudstack-openstack-propagate-ErrNeedNet.patch deleted file mode 100644 index ec82663..0000000 --- a/0001-cloudstack-openstack-propagate-ErrNeedNet.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 96cb2f3776d453c50e55185a50c980ff210b1719 Mon Sep 17 00:00:00 2001 -From: Jonathan Lebon -Date: Fri, 31 Jul 2020 09:24:33 -0400 -Subject: [PATCH] cloudstack|openstack: propagate ErrNeedNet - -On CloudStack/OpenStack, we fetch from three different sources -simultaneously: two config drives, and the metadata service. -Error-handling for these goroutines was causing `ErrNeedNet` from the -latter to be ignored and so we weren't correctly propagating it back to -the caller (which keys off of it to signal to the OS that networking is -needed). - -Do a simple hack where we check if `ErrNeedNet` was hit and if none of -the fetchers succeed, then we return that instead. (The better fix of -course is to not try to parallel guess the metadata source like this, -but that's a much bigger issue.) - -Fixes: #956 -Fixes: #1056 ---- - internal/providers/cloudstack/cloudstack.go | 10 ++++++++++ - internal/providers/openstack/openstack.go | 10 ++++++++++ - 2 files changed, 20 insertions(+) - -diff --git a/internal/providers/cloudstack/cloudstack.go b/internal/providers/cloudstack/cloudstack.go -index d4cc440c..83ed3700 100644 ---- a/internal/providers/cloudstack/cloudstack.go -+++ b/internal/providers/cloudstack/cloudstack.go -@@ -50,6 +50,8 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { - var data []byte - ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) - -+ sawErrNeedNet := false -+ - dispatch := func(name string, fn func() ([]byte, error)) { - raw, err := fn() - if err != nil { -@@ -57,6 +59,9 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { - case context.Canceled: - case context.DeadlineExceeded: - f.Logger.Err("timed out while fetching config from %s", name) -+ case resource.ErrNeedNet: -+ sawErrNeedNet = true -+ fallthrough - default: - f.Logger.Err("failed to fetch config from %s: %v", name, err) - } -@@ -81,6 +86,11 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { - - <-ctx.Done() - if ctx.Err() == context.DeadlineExceeded { -+ // Did we hit neednet? If so, propagate that up instead. The OS should -+ // retry fetching again once networking is up. -+ if sawErrNeedNet { -+ return types.Config{}, report.Report{}, resource.ErrNeedNet -+ } - f.Logger.Info("neither config drive nor metadata service were available in time. Continuing without a config...") - } - -diff --git a/internal/providers/openstack/openstack.go b/internal/providers/openstack/openstack.go -index d511bda2..41699515 100644 ---- a/internal/providers/openstack/openstack.go -+++ b/internal/providers/openstack/openstack.go -@@ -55,6 +55,8 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { - var data []byte - ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) - -+ sawErrNeedNet := false -+ - dispatch := func(name string, fn func() ([]byte, error)) { - raw, err := fn() - if err != nil { -@@ -62,6 +64,9 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { - case context.Canceled: - case context.DeadlineExceeded: - f.Logger.Err("timed out while fetching config from %s", name) -+ case resource.ErrNeedNet: -+ sawErrNeedNet = true -+ fallthrough - default: - f.Logger.Err("failed to fetch config from %s: %v", name, err) - } -@@ -86,6 +91,11 @@ func FetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { - - <-ctx.Done() - if ctx.Err() == context.DeadlineExceeded { -+ // Did we hit neednet? If so, propagate that up instead. The OS should -+ // retry fetching again once networking is up. -+ if sawErrNeedNet { -+ return types.Config{}, report.Report{}, resource.ErrNeedNet -+ } - f.Logger.Info("neither config drive nor metadata service were available in time. Continuing without a config...") - } - --- -2.26.2 - diff --git a/ignition.spec b/ignition.spec index f196acc..477d06a 100644 --- a/ignition.spec +++ b/ignition.spec @@ -49,7 +49,7 @@ # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix}/v2 -%global commit 0d6f3e5e859821134cd04fcaf47c2488c25aff0d +%global commit 947598ed908b374c50028f260eb52da9795a4ba4 %global shortcommit %(c=%{commit}; echo ${c:0:7}) # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these @@ -60,15 +60,13 @@ %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Version: 2.5.0 -Release: 3.git%{shortcommit}%{?dist} +Version: 2.6.0 +Release: 1.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz -Patch0: 0001-cloudstack-openstack-propagate-ErrNeedNet.patch - %define gopath %{_datadir}/gocode ExcludeArch: ppc64 BuildRequires: golang >= 1.10 @@ -431,7 +429,6 @@ Ignition project's Github releases page. # setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html # unpack source0 and apply patches %setup -T -b 0 -q -n %{repo}-%{commit} -%patch0 -p1 %build # Set up PWD as a proper import path for go @@ -547,6 +544,8 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %gotest %{import_path}/config/translate %gotest %{import_path}/config/v3_0 %gotest %{import_path}/config/v3_0/types +%gotest %{import_path}/config/v3_1 +%gotest %{import_path}/config/v3_1/types %gotest %{import_path}/config/validate %gotest %{import_path}/internal/exec/stages/files %gotest %{import_path}/internal/exec/util @@ -589,6 +588,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Aug 07 2020 Benjamin Gilbert - 2.6.0-1.git947598e +- New release + * Fri Aug 07 2020 Jonathan Lebon - 2.5.0-3.git0d6f3e5 - Backport conditional networking fix for OpenStack and CloudStack https://github.com/coreos/ignition/pull/1057 diff --git a/sources b/sources index decac9b..11e2c3c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ignition-0d6f3e5.tar.gz) = 63bdb02ad34bf1826fd12c1cc93122b603df67a5d168a0f443b4d091b468bbb66dc8f8d920666b5d89d89adbb7e40a716acf367da7b2e81bea6c1aeaa795ef00 +SHA512 (ignition-947598e.tar.gz) = ffdaab6d3ab25c1d95515b14ba54c7ca5c6adcc98cb73e74b911caf6f082d8648dc35eddeb4886b8f87dd884b80084f1432b4707362e20e5ebe9bd498aeb4edd From e0fdfe16ef7fa976db050de2bc4a8f1129786b68 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Wed, 12 Aug 2020 10:55:51 -0400 Subject: [PATCH 090/172] Fix sector size detection on s390x --- ...fix-invalid-pointer-cast-in-DumpDisk.patch | 42 +++++++++++++++++++ ignition.spec | 9 +++- 2 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 blkid-fix-invalid-pointer-cast-in-DumpDisk.patch diff --git a/blkid-fix-invalid-pointer-cast-in-DumpDisk.patch b/blkid-fix-invalid-pointer-cast-in-DumpDisk.patch new file mode 100644 index 0000000..a9e7b89 --- /dev/null +++ b/blkid-fix-invalid-pointer-cast-in-DumpDisk.patch @@ -0,0 +1,42 @@ +From 34e18b247876eb9b42417ca2702b047f29670fca Mon Sep 17 00:00:00 2001 +From: Benjamin Gilbert +Date: Tue, 11 Aug 2020 08:11:58 -0400 +Subject: [PATCH] blkid: fix invalid pointer cast in DumpDisk() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +LogicalSectorSize is a Go int (64 bits on 64-bit systems) and the +argument to blkid_get_logical_sector_size() is a C int * (pointer to +32 bits). The value fits in 32 bits and the field is initialized to +zero, so we get away with this on little-endian systems, but not on +s390x. + +See also 76a71f08d3c1. + +Reported-by: Jakub Čajka +--- + internal/exec/util/blkid.go | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/internal/exec/util/blkid.go b/internal/exec/util/blkid.go +index 8e53e26c..3888ce54 100644 +--- a/internal/exec/util/blkid.go ++++ b/internal/exec/util/blkid.go +@@ -147,10 +147,11 @@ func DumpDisk(device string) (DiskInfo, error) { + cDevice := C.CString(device) + defer C.free(unsafe.Pointer(cDevice)) + +- cSectorSizeRef := (*C.int)(unsafe.Pointer(&output.LogicalSectorSize)) +- if err := cResultToErr(C.blkid_get_logical_sector_size(cDevice, cSectorSizeRef), device); err != nil { ++ var sectorSize C.int ++ if err := cResultToErr(C.blkid_get_logical_sector_size(cDevice, §orSize), device); err != nil { + return DiskInfo{}, err + } ++ output.LogicalSectorSize = int(sectorSize) + + numParts := C.int(0) + cNumPartsRef := (*C.int)(unsafe.Pointer(&numParts)) +-- +2.25.4 + diff --git a/ignition.spec b/ignition.spec index 477d06a..520c55c 100644 --- a/ignition.spec +++ b/ignition.spec @@ -61,11 +61,14 @@ Name: ignition Version: 2.6.0 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +# Fix sector size detection on s390x +# https://github.com/coreos/ignition/pull/1070 +Patch0: blkid-fix-invalid-pointer-cast-in-DumpDisk.patch %define gopath %{_datadir}/gocode ExcludeArch: ppc64 @@ -429,6 +432,7 @@ Ignition project's Github releases page. # setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html # unpack source0 and apply patches %setup -T -b 0 -q -n %{repo}-%{commit} +%patch0 -p1 %build # Set up PWD as a proper import path for go @@ -588,6 +592,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Wed Aug 12 2020 Benjamin Gilbert - 2.6.0-2.git947598e +- Fix sector size detection on s390x + * Fri Aug 07 2020 Benjamin Gilbert - 2.6.0-1.git947598e - New release From 2c158893d7617700b1fad728ab55ec26c086597d Mon Sep 17 00:00:00 2001 From: Stephen Lowrie Date: Wed, 14 Oct 2020 00:57:15 -0500 Subject: [PATCH 091/172] Ignition 2.7.0 --- .gitignore | 1 + ...fix-invalid-pointer-cast-in-DumpDisk.patch | 42 ------------------- ignition.spec | 33 +++++++++++---- sources | 2 +- 4 files changed, 27 insertions(+), 51 deletions(-) delete mode 100644 blkid-fix-invalid-pointer-cast-in-DumpDisk.patch diff --git a/.gitignore b/.gitignore index e84aee3..80b1be9 100644 --- a/.gitignore +++ b/.gitignore @@ -48,3 +48,4 @@ /ignition-dracut-6b1d128.tar.gz /ignition-0d6f3e5.tar.gz /ignition-947598e.tar.gz +/ignition-5be43fd.tar.gz diff --git a/blkid-fix-invalid-pointer-cast-in-DumpDisk.patch b/blkid-fix-invalid-pointer-cast-in-DumpDisk.patch deleted file mode 100644 index a9e7b89..0000000 --- a/blkid-fix-invalid-pointer-cast-in-DumpDisk.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 34e18b247876eb9b42417ca2702b047f29670fca Mon Sep 17 00:00:00 2001 -From: Benjamin Gilbert -Date: Tue, 11 Aug 2020 08:11:58 -0400 -Subject: [PATCH] blkid: fix invalid pointer cast in DumpDisk() -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -LogicalSectorSize is a Go int (64 bits on 64-bit systems) and the -argument to blkid_get_logical_sector_size() is a C int * (pointer to -32 bits). The value fits in 32 bits and the field is initialized to -zero, so we get away with this on little-endian systems, but not on -s390x. - -See also 76a71f08d3c1. - -Reported-by: Jakub Čajka ---- - internal/exec/util/blkid.go | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/internal/exec/util/blkid.go b/internal/exec/util/blkid.go -index 8e53e26c..3888ce54 100644 ---- a/internal/exec/util/blkid.go -+++ b/internal/exec/util/blkid.go -@@ -147,10 +147,11 @@ func DumpDisk(device string) (DiskInfo, error) { - cDevice := C.CString(device) - defer C.free(unsafe.Pointer(cDevice)) - -- cSectorSizeRef := (*C.int)(unsafe.Pointer(&output.LogicalSectorSize)) -- if err := cResultToErr(C.blkid_get_logical_sector_size(cDevice, cSectorSizeRef), device); err != nil { -+ var sectorSize C.int -+ if err := cResultToErr(C.blkid_get_logical_sector_size(cDevice, §orSize), device); err != nil { - return DiskInfo{}, err - } -+ output.LogicalSectorSize = int(sectorSize) - - numParts := C.int(0) - cNumPartsRef := (*C.int)(unsafe.Pointer(&numParts)) --- -2.25.4 - diff --git a/ignition.spec b/ignition.spec index 520c55c..5c70fe7 100644 --- a/ignition.spec +++ b/ignition.spec @@ -49,7 +49,7 @@ # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix}/v2 -%global commit 947598ed908b374c50028f260eb52da9795a4ba4 +%global commit 5be43fd39ddeed32efe90d69cec57e2cae3bd8a8 %global shortcommit %(c=%{commit}; echo ${c:0:7}) # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these @@ -60,15 +60,12 @@ %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Version: 2.6.0 -Release: 2.git%{shortcommit}%{?dist} +Version: 2.7.0 +Release: 1.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz -# Fix sector size detection on s390x -# https://github.com/coreos/ignition/pull/1070 -Patch0: blkid-fix-invalid-pointer-cast-in-DumpDisk.patch %define gopath %{_datadir}/gocode ExcludeArch: ppc64 @@ -247,6 +244,22 @@ Provides: bundled(golang(google.golang.org/genproto/googleapis/iam/v1)) = 0.0.0- Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc/code)) = 0.0.0-20200610104632.gita5b850bcf112 Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc/status)) = 0.0.0-20200610104632.gita5b850bcf112 Provides: bundled(golang(google.golang.org/genproto/googleapis/type/expr)) = 0.0.0-20200610104632.gita5b850bcf112 +Provides: bundled(golang(go.opencensus.io)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/internal)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/internal/tagencoding)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/metric/metricdata)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/metric/metricproducer)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/plugin/ochttp)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/plugin/ochttp/propagation/b3)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/resource)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/stats)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/stats/internal)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/stats/view)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/tag)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/trace)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/trace/internal)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/trace/propagation)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/trace/tracestate)) = 0.22.5 %endif @@ -432,7 +445,6 @@ Ignition project's Github releases page. # setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html # unpack source0 and apply patches %setup -T -b 0 -q -n %{repo}-%{commit} -%patch0 -p1 %build # Set up PWD as a proper import path for go @@ -550,6 +562,8 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %gotest %{import_path}/config/v3_0/types %gotest %{import_path}/config/v3_1 %gotest %{import_path}/config/v3_1/types +%gotest %{import_path}/config/v3_2 +%gotest %{import_path}/config/v3_2/types %gotest %{import_path}/config/validate %gotest %{import_path}/internal/exec/stages/files %gotest %{import_path}/internal/exec/util @@ -563,7 +577,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %files %license LICENSE -%doc README.md doc/ +%doc README.md docs/ %{dracutlibdir}/modules.d/* %{_prefix}/lib/systemd/system/*.service @@ -592,6 +606,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Wed Oct 14 2020 Stephen Lowrie - 2.7.0-1.git5be43fd +- New release + * Wed Aug 12 2020 Benjamin Gilbert - 2.6.0-2.git947598e - Fix sector size detection on s390x diff --git a/sources b/sources index 11e2c3c..6a69d7a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ignition-947598e.tar.gz) = ffdaab6d3ab25c1d95515b14ba54c7ca5c6adcc98cb73e74b911caf6f082d8648dc35eddeb4886b8f87dd884b80084f1432b4707362e20e5ebe9bd498aeb4edd +SHA512 (ignition-5be43fd.tar.gz) = 6d3cbb966f95695201795d85e0c322d90f5f9e8dbd161f2cefdd819efc597fdc46791dba4cfc3c3965afb646cd635ba67d4268b2940f372dfd224fa8aaaf57b6 From a67d7056b84921f25cc6ddb31238be785c5559fd Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Tue, 27 Oct 2020 23:32:46 -0400 Subject: [PATCH 092/172] download-ignition.sh: drop This script isn't doing anything that `spectool -g -S` won't do. --- download-ignition.sh | 3 --- 1 file changed, 3 deletions(-) delete mode 100755 download-ignition.sh diff --git a/download-ignition.sh b/download-ignition.sh deleted file mode 100755 index 68a6115..0000000 --- a/download-ignition.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -set -xeuo pipefail -rpmspec -P ignition.spec | grep 'Source0:' | tr -s ' ' | cut -d ' ' -f 2 | xargs curl -LO From 6f5a0f935d592a4ff8e169d5d7a31c60ba433381 Mon Sep 17 00:00:00 2001 From: Sohan Kunkerkar Date: Wed, 25 Nov 2020 17:08:44 -0500 Subject: [PATCH 093/172] release: Ignition v2.8.0 --- .gitignore | 1 + ignition.spec | 17 ++++++++++------- sources | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 80b1be9..f9c3e39 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,4 @@ /ignition-0d6f3e5.tar.gz /ignition-947598e.tar.gz /ignition-5be43fd.tar.gz +/ignition-db4d30d.tar.gz diff --git a/ignition.spec b/ignition.spec index 5c70fe7..73ecdb6 100644 --- a/ignition.spec +++ b/ignition.spec @@ -49,7 +49,7 @@ # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix}/v2 -%global commit 5be43fd39ddeed32efe90d69cec57e2cae3bd8a8 +%global commit db4d30d079fd663d0f4c6d59c6fae00ffa268093 %global shortcommit %(c=%{commit}; echo ${c:0:7}) # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these @@ -60,7 +60,7 @@ %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Version: 2.7.0 +Version: 2.8.0 Release: 1.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 @@ -170,11 +170,11 @@ Provides: bundled(golang(github.com/coreos/go-semver/semver)) = 0.3.0 Provides: bundled(golang(github.com/coreos/go-systemd/v22/dbus)) = 22.0.0 Provides: bundled(golang(github.com/coreos/go-systemd/v22/journal)) = 22.0.0 Provides: bundled(golang(github.com/coreos/go-systemd/v22/unit)) = 22.0.0 -Provides: bundled(golang(github.com/coreos/vcontext/json)) = 0.0.0-20190529201340.git22b159166068 -Provides: bundled(golang(github.com/coreos/vcontext/path)) = 0.0.0-20190529201340.git22b159166068 -Provides: bundled(golang(github.com/coreos/vcontext/report)) = 0.0.0-20190529201340.git22b159166068 -Provides: bundled(golang(github.com/coreos/vcontext/tree)) = 0.0.0-20190529201340.git22b159166068 -Provides: bundled(golang(github.com/coreos/vcontext/validate)) = 0.0.0-20190529201340.git22b159166068 +Provides: bundled(golang(github.com/coreos/vcontext/json)) = 0.0.0-20201120045928.gitb0e13dab675c +Provides: bundled(golang(github.com/coreos/vcontext/path)) = 0.0.0-20201120045928.gitb0e13dab675c +Provides: bundled(golang(github.com/coreos/vcontext/report)) = 0.0.0-20201120045928.gitb0e13dab675c +Provides: bundled(golang(github.com/coreos/vcontext/tree)) = 0.0.0-20201120045928.gitb0e13dab675c +Provides: bundled(golang(github.com/coreos/vcontext/validate)) = 0.0.0-20201120045928.gitb0e13dab675c Provides: bundled(golang(github.com/google/renameio)) = 0.1.0 Provides: bundled(golang(github.com/google/uuid)) = 1.1.1 Provides: bundled(golang(github.com/pin/tftp)) = 2.1.0 @@ -606,6 +606,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Wed Nov 25 2020 Sohan Kunkerkar - 2.8.0-1.gitdb4d30d +- New release + * Wed Oct 14 2020 Stephen Lowrie - 2.7.0-1.git5be43fd - New release diff --git a/sources b/sources index 6a69d7a..094adca 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ignition-5be43fd.tar.gz) = 6d3cbb966f95695201795d85e0c322d90f5f9e8dbd161f2cefdd819efc597fdc46791dba4cfc3c3965afb646cd635ba67d4268b2940f372dfd224fa8aaaf57b6 +SHA512 (ignition-db4d30d.tar.gz) = b658267975c1163db15a6973a9840a5f4fb8ad81e476f8b5d3a0c0d93aa414429b06fb06b9c8aa644c971051b1f050c33241018e38e41894a6223f49b0c796bc From d194305bc2dd6a23dc7c517c01d2f071a9d9270d Mon Sep 17 00:00:00 2001 From: Sohan Kunkerkar Date: Thu, 3 Dec 2020 09:22:40 -0500 Subject: [PATCH 094/172] release: Ignition v2.8.1 --- .gitignore | 1 + ignition.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index f9c3e39..49e473f 100644 --- a/.gitignore +++ b/.gitignore @@ -50,3 +50,4 @@ /ignition-947598e.tar.gz /ignition-5be43fd.tar.gz /ignition-db4d30d.tar.gz +/ignition-c733d23.tar.gz diff --git a/ignition.spec b/ignition.spec index 73ecdb6..fac4903 100644 --- a/ignition.spec +++ b/ignition.spec @@ -49,7 +49,7 @@ # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix}/v2 -%global commit db4d30d079fd663d0f4c6d59c6fae00ffa268093 +%global commit c733d23c71fa64722129e8946db49c58cfdea286 %global shortcommit %(c=%{commit}; echo ${c:0:7}) # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these @@ -60,7 +60,7 @@ %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Version: 2.8.0 +Version: 2.8.1 Release: 1.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 @@ -606,6 +606,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Thu Dec 03 2020 Sohan Kunkerkar - 2.8.1-1.gitc733d23 +- New release + * Wed Nov 25 2020 Sohan Kunkerkar - 2.8.0-1.gitdb4d30d - New release diff --git a/sources b/sources index 094adca..ebe75d5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ignition-db4d30d.tar.gz) = b658267975c1163db15a6973a9840a5f4fb8ad81e476f8b5d3a0c0d93aa414429b06fb06b9c8aa644c971051b1f050c33241018e38e41894a6223f49b0c796bc +SHA512 (ignition-c733d23.tar.gz) = 8057768ac13983c4a0f1b6edf6f230deb26547aa4d46ea36a4dc8d33a66e1f6de85c5b195077dfc4165e884d307a8c14f1104602d32372cffb825f7d1d89414b From ec21a27d4c1a19a93bd8619adf0b9b36fcb86334 Mon Sep 17 00:00:00 2001 From: Sohan Kunkerkar Date: Fri, 8 Jan 2021 04:26:33 -0500 Subject: [PATCH 095/172] release: Ignition v2.9.0 --- .gitignore | 1 + ignition.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 49e473f..597c2c3 100644 --- a/.gitignore +++ b/.gitignore @@ -51,3 +51,4 @@ /ignition-5be43fd.tar.gz /ignition-db4d30d.tar.gz /ignition-c733d23.tar.gz +/ignition-1d56dc8.tar.gz diff --git a/ignition.spec b/ignition.spec index fac4903..8fecad6 100644 --- a/ignition.spec +++ b/ignition.spec @@ -49,7 +49,7 @@ # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix}/v2 -%global commit c733d23c71fa64722129e8946db49c58cfdea286 +%global commit 1d56dc8e717a10c1a8b392050bcb3d269cd42154 %global shortcommit %(c=%{commit}; echo ${c:0:7}) # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these @@ -60,7 +60,7 @@ %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Version: 2.8.1 +Version: 2.9.0 Release: 1.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 @@ -606,6 +606,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Jan 08 2021 Sohan Kunkerkar - 2.9.0-1.git1d56dc8 +- New release + * Thu Dec 03 2020 Sohan Kunkerkar - 2.8.1-1.gitc733d23 - New release diff --git a/sources b/sources index ebe75d5..2ef8e73 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ignition-c733d23.tar.gz) = 8057768ac13983c4a0f1b6edf6f230deb26547aa4d46ea36a4dc8d33a66e1f6de85c5b195077dfc4165e884d307a8c14f1104602d32372cffb825f7d1d89414b +SHA512 (ignition-1d56dc8.tar.gz) = 44e334128443f79f7b814a27df80288a204f2f24cb449fe43836bcb5e0c5e27f8065193d4a934cafc04221b2237f9a55695a1a7bd22158317fad1050321717c8 From f27cf37ade8120c1a6a7e5ccf2f730d2a40d1d08 Mon Sep 17 00:00:00 2001 From: Sohan Kunkerkar Date: Tue, 12 Jan 2021 02:46:45 -0500 Subject: [PATCH 096/172] Fix AWS probing by using the IMDS token URL --- ignition.spec | 8 +- ...oviders-aws-probe-the-IMDS-token-URL.patch | 76 +++++++++++++++++++ 2 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 internal-providers-aws-probe-the-IMDS-token-URL.patch diff --git a/ignition.spec b/ignition.spec index 8fecad6..ed1c496 100644 --- a/ignition.spec +++ b/ignition.spec @@ -61,11 +61,14 @@ Name: ignition Version: 2.9.0 -Release: 1.git%{shortcommit}%{?dist} +Release: 2.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +# Fix AWS probing by using the IMDS token URL to ensure that networking is up +# https://github.com/coreos/ignition/pull/1161 +Patch0: internal-providers-aws-probe-the-IMDS-token-URL.patch %define gopath %{_datadir}/gocode ExcludeArch: ppc64 @@ -606,6 +609,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Tue Jan 12 2021 Sohan Kunkerkar - 2.9.0-2.git1d56dc8 +- Fix AWS probing by using the IMDS token URL to ensure that networking is up + * Fri Jan 08 2021 Sohan Kunkerkar - 2.9.0-1.git1d56dc8 - New release diff --git a/internal-providers-aws-probe-the-IMDS-token-URL.patch b/internal-providers-aws-probe-the-IMDS-token-URL.patch new file mode 100644 index 0000000..d989482 --- /dev/null +++ b/internal-providers-aws-probe-the-IMDS-token-URL.patch @@ -0,0 +1,76 @@ +From 74ffe3749d70b9d115a9b9790969b8dcb4a76e12 Mon Sep 17 00:00:00 2001 +From: Stephen Lowrie +Date: Mon, 11 Jan 2021 11:27:12 -0600 +Subject: [PATCH] internal/providers/aws: probe the IMDS token URL + +Probing the `/latest` path causes a 401 Unauthorized when running with +IMDSv2 only. Instead ping the token URL. +--- + internal/providers/aws/aws.go | 37 +++++++++++++++++++---------------- + 1 file changed, 20 insertions(+), 17 deletions(-) + +diff --git a/internal/providers/aws/aws.go b/internal/providers/aws/aws.go +index 54373dbb..4a6655f0 100644 +--- a/internal/providers/aws/aws.go ++++ b/internal/providers/aws/aws.go +@@ -40,11 +40,6 @@ var ( + Host: "169.254.169.254", + Path: "2019-10-01/user-data", + } +- metadataServiceProbeURL = url.URL{ +- Scheme: "http", +- Host: "169.254.169.254", +- Path: "latest", +- } + imdsTokenURL = url.URL{ + Scheme: "http", + Host: "169.254.169.254", +@@ -78,17 +73,17 @@ func NewFetcher(l *log.Logger) (resource.Fetcher, error) { + // Init prepares the fetcher for this platform + func Init(f *resource.Fetcher) error { + // During the fetch stage we might be running before the networking +- // is fully ready. Perform an HTTP fetch against the metadata probe +- // URL to ensure that networking is up before we attempt to fetch +- // the region hint from ec2metadata. ++ // is fully ready. Perform an HTTP fetch against the IMDS token URL ++ // to ensure that networking is up before we attempt to fetch the ++ // region hint from ec2metadata. + // +- // NOTE: the FetchToBuffer call against the metadata service probe +- // URL is a temporary solution to handle waiting for networking +- // before fetching from the AWS API. We do this instead of an +- // infinite retry loop on the API call because, without a clear +- // understanding of the failure cases, that would risk provisioning +- // failures due to quirks of the ec2metadata API. Additionally a +- // finite retry loop would have to time out quickly enough to avoid ++ // NOTE: the FetchToBuffer call against the IMDS token URL is a ++ // temporary solution to handle waiting for networking before ++ // fetching from the AWS API. We do this instead of an infinite ++ // retry loop on the API call because, without a clear understanding ++ // of the failure cases, that would risk provisioning failures due ++ // to quirks of the ec2metadata API. Additionally a finite retry ++ // loop would have to time out quickly enough to avoid + // extraordinarily long boots on failure (since this code runs in + // every stage) but that would risk premature timeouts if the + // network takes a while to come up. +@@ -102,8 +97,16 @@ func Init(f *resource.Fetcher) error { + // NOTE: FetchToBuffer is handling the ErrNeedNet case. If we move + // to an alternative method, we will need to handle the detection in + // this function. +- _, err := f.FetchToBuffer(metadataServiceProbeURL, resource.FetchOptions{}) +- if err != nil { ++ opts := resource.FetchOptions{ ++ Headers: http.Header{ ++ "x-aws-ec2-metadata-token-ttl-seconds": []string{"21600"}, ++ }, ++ HTTPVerb: "PUT", ++ } ++ _, err := f.FetchToBuffer(imdsTokenURL, opts) ++ // ErrNotFound would just mean that the instance might not have ++ // IMDSv2 enabled ++ if err != nil && err != resource.ErrNotFound { + return err + } + +-- +2.29.2 From 5b5a69d6bb98bc3e95b3aa6c3d4646e5020fda40 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 14:14:31 +0000 Subject: [PATCH 097/172] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ignition.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index ed1c496..583be97 100644 --- a/ignition.spec +++ b/ignition.spec @@ -61,7 +61,7 @@ Name: ignition Version: 2.9.0 -Release: 2.git%{shortcommit}%{?dist} +Release: 3.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} @@ -609,6 +609,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 2.9.0-3.git1d56dc8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Tue Jan 12 2021 Sohan Kunkerkar - 2.9.0-2.git1d56dc8 - Fix AWS probing by using the IMDS token URL to ensure that networking is up From 4a87958080604941a6f6f332bd98541fea26cff9 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 5 Feb 2021 17:26:23 -0500 Subject: [PATCH 098/172] Correctly enable IMDS patch --- ignition.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index 583be97..a9af48d 100644 --- a/ignition.spec +++ b/ignition.spec @@ -61,7 +61,7 @@ Name: ignition Version: 2.9.0 -Release: 3.git%{shortcommit}%{?dist} +Release: 4.git%{shortcommit}%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} @@ -448,6 +448,7 @@ Ignition project's Github releases page. # setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html # unpack source0 and apply patches %setup -T -b 0 -q -n %{repo}-%{commit} +%patch0 -p1 %build # Set up PWD as a proper import path for go @@ -609,6 +610,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* Fri Feb 05 2021 Benjamin Gilbert - 2.9.0-4.git1d56dc8 +- Correctly enable IMDS patch + * Tue Jan 26 2021 Fedora Release Engineering - 2.9.0-3.git1d56dc8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 0332d11d037c7cfd5f47acddbb01a8ccef335a5c Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 5 Feb 2021 17:40:36 -0500 Subject: [PATCH 099/172] Set ExclusiveArch from %go_arches --- ignition.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index a9af48d..009665d 100644 --- a/ignition.spec +++ b/ignition.spec @@ -71,7 +71,7 @@ Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcomm Patch0: internal-providers-aws-probe-the-IMDS-token-URL.patch %define gopath %{_datadir}/gocode -ExcludeArch: ppc64 +ExclusiveArch: %{go_arches} BuildRequires: golang >= 1.10 # add non golang BuildRequires that weren't detected BuildRequires: libblkid-devel @@ -612,6 +612,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %changelog * Fri Feb 05 2021 Benjamin Gilbert - 2.9.0-4.git1d56dc8 - Correctly enable IMDS patch +- Set ExclusiveArch from %%go_arches * Tue Jan 26 2021 Fedora Release Engineering - 2.9.0-3.git1d56dc8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 053eaac99bc457a2b88165c4d6a66af4322011cf Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 5 Feb 2021 17:39:51 -0500 Subject: [PATCH 100/172] Drop Git commit hash from Release We've been using a release + patches workflow for a while now. --- .gitignore | 1 + ignition.spec | 12 +++++------- sources | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index 597c2c3..2d860cd 100644 --- a/.gitignore +++ b/.gitignore @@ -52,3 +52,4 @@ /ignition-db4d30d.tar.gz /ignition-c733d23.tar.gz /ignition-1d56dc8.tar.gz +/ignition-2.9.0.tar.gz diff --git a/ignition.spec b/ignition.spec index 009665d..02ebb58 100644 --- a/ignition.spec +++ b/ignition.spec @@ -49,8 +49,6 @@ # https://github.com/coreos/ignition %global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} %global import_path %{provider_prefix}/v2 -%global commit 1d56dc8e717a10c1a8b392050bcb3d269cd42154 -%global shortcommit %(c=%{commit}; echo ${c:0:7}) # define ldflags, buildflags, testflags here. The ldflags were # taken from ./build. We will need to periodically check these # for consistency @@ -61,11 +59,11 @@ Name: ignition Version: 2.9.0 -Release: 4.git%{shortcommit}%{?dist} +Release: 4%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz +Source0: https://%{provider_prefix}/archive/v%{version}/%{repo}-%{version}.tar.gz # Fix AWS probing by using the IMDS token URL to ensure that networking is up # https://github.com/coreos/ignition/pull/1161 Patch0: internal-providers-aws-probe-the-IMDS-token-URL.patch @@ -445,9 +443,8 @@ building binaries to sign by Fedora release engineering and include on the Ignition project's Github releases page. %prep -# setup command reference: http://ftp.rpm.org/max-rpm/s1-rpm-inside-macros.html # unpack source0 and apply patches -%setup -T -b 0 -q -n %{repo}-%{commit} +%setup -q %patch0 -p1 %build @@ -610,7 +607,8 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog -* Fri Feb 05 2021 Benjamin Gilbert - 2.9.0-4.git1d56dc8 +* Fri Feb 05 2021 Benjamin Gilbert - 2.9.0-4 +- Drop Git commit hash from Release - Correctly enable IMDS patch - Set ExclusiveArch from %%go_arches diff --git a/sources b/sources index 2ef8e73..8a36460 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ignition-1d56dc8.tar.gz) = 44e334128443f79f7b814a27df80288a204f2f24cb449fe43836bcb5e0c5e27f8065193d4a934cafc04221b2237f9a55695a1a7bd22158317fad1050321717c8 +SHA512 (ignition-2.9.0.tar.gz) = 714ae90fb32a45e1b21e0b0671e7933ce302cdd943cd02cfc221e8bf88269fb464ff5f740d54b444e5c341a3877bf2943ca6f2c2f1374df904386400d73ebe97 From 5a58c66355411d4c8ccd1827f6da3690ca22b5e0 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 5 Feb 2021 18:12:57 -0500 Subject: [PATCH 101/172] Switch to %autosetup --- ignition.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ignition.spec b/ignition.spec index 02ebb58..1de9251 100644 --- a/ignition.spec +++ b/ignition.spec @@ -443,9 +443,7 @@ building binaries to sign by Fedora release engineering and include on the Ignition project's Github releases page. %prep -# unpack source0 and apply patches -%setup -q -%patch0 -p1 +%autosetup -p1 %build # Set up PWD as a proper import path for go @@ -610,6 +608,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} * Fri Feb 05 2021 Benjamin Gilbert - 2.9.0-4 - Drop Git commit hash from Release - Correctly enable IMDS patch +- Switch to %%autosetup - Set ExclusiveArch from %%go_arches * Tue Jan 26 2021 Fedora Release Engineering - 2.9.0-3.git1d56dc8 From 3174eb41355fc2dea96f14492e0570a5631d5449 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 5 Feb 2021 18:14:52 -0500 Subject: [PATCH 102/172] Drop old notes from original package creation --- ignition.spec.orig | 348 --------------------------------------------- notes.txt | 61 -------- 2 files changed, 409 deletions(-) delete mode 100644 ignition.spec.orig delete mode 100644 notes.txt diff --git a/ignition.spec.orig b/ignition.spec.orig deleted file mode 100644 index aced5ef..0000000 --- a/ignition.spec.orig +++ /dev/null @@ -1,348 +0,0 @@ -# Original spec file as generated by: -# gofed repo2spec --detect github.com/coreos/ignition --commit f7079129b8651ac51dba14c3af65692bb413c1dd --with-extra --with-build -f -# With: -# gofed/gofed:v1.0.1 docker image - - -# If any of the following macros should be set otherwise, -# you can wrap any of them with the following conditions: -# - %%if 0%%{centos} == 7 -# - %%if 0%%{?rhel} == 7 -# - %%if 0%%{?fedora} == 23 -# Or just test for particular distribution: -# - %%if 0%%{centos} -# - %%if 0%%{?rhel} -# - %%if 0%%{?fedora} -# -# Be aware, on centos, both %%rhel and %%centos are set. If you want to test -# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition. -# (Don't forget to replace double percentage symbol with single one in order to apply a condition) - -# Generate devel rpm -%global with_devel 1 -# Build project from bundled dependencies -%global with_bundled 0 -# Build with debug info rpm -%global with_debug 1 -# Run tests in check section -%global with_check 1 -# Generate unit-test rpm -%global with_unit_test 1 - -%if 0%{?with_debug} -%global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif - -%if ! 0%{?gobuild:1} -%define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**}; -%endif - -%global provider github -%global provider_tld com -%global project coreos -%global repo ignition -# https://github.com/coreos/ignition -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix} -%global commit f7079129b8651ac51dba14c3af65692bb413c1dd -%global shortcommit %(c=%{commit}; echo ${c:0:7}) - -Name: golang-%{provider}-%{project}-%{repo} -Version: 0 -Release: 0.1.git%{shortcommit}%{?dist} -Summary: !!!!FILL!!!! -# Detected licences -# - Unknown at 'LICENSE' -License: !!!!FILL!!!! -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz - -# e.g. el6 has ppc64 arch without gcc-go, so EA tag is required -ExclusiveArch: %{?go_arches:%{go_arches}}%{!?go_arches:%{ix86} x86_64 aarch64 %{arm}} -# If go_compiler is not set to 1, there is no virtual provide. Use golang instead. -BuildRequires: %{?go_compiler:compiler(go-compiler)}%{!?go_compiler:golang} - -%if ! 0%{?with_bundled} -# validate/main.go -BuildRequires: golang(github.com/spf13/cobra) - -# Remaining dependencies not included in main packages -BuildRequires: golang(github.com/vmware/vmw-ovflib) -BuildRequires: golang(github.com/coreos/go-systemd/unit) -BuildRequires: golang(github.com/coreos/go-semver/semver) -BuildRequires: golang(github.com/sigma/vmw-guestinfo/vmcheck) -BuildRequires: golang(github.com/pin/tftp) -BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) -BuildRequires: golang(github.com/sigma/vmw-guestinfo/rpcvmx) -BuildRequires: golang(github.com/coreos/go-systemd/dbus) -BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/session) -BuildRequires: golang(github.com/vincent-petithory/dataurl) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/awserr) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds) -BuildRequires: golang(github.com/ajeddeloh/go-json) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata) -BuildRequires: golang(github.com/pborman/uuid) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws) -%endif - -%description -%{summary} - -%if 0%{?with_devel} -%package devel -Summary: %{summary} -BuildArch: noarch - -%if 0%{?with_check} && ! 0%{?with_bundled} -BuildRequires: golang(github.com/ajeddeloh/go-json) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/awserr) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/session) -BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3) -BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) -BuildRequires: golang(github.com/coreos/go-semver/semver) -BuildRequires: golang(github.com/coreos/go-systemd/dbus) -BuildRequires: golang(github.com/coreos/go-systemd/unit) -BuildRequires: golang(github.com/pborman/uuid) -BuildRequires: golang(github.com/pin/tftp) -BuildRequires: golang(github.com/sigma/vmw-guestinfo/rpcvmx) -BuildRequires: golang(github.com/sigma/vmw-guestinfo/vmcheck) -BuildRequires: golang(github.com/vincent-petithory/dataurl) -BuildRequires: golang(github.com/vmware/vmw-ovflib) -%endif - -Requires: golang(github.com/ajeddeloh/go-json) -Requires: golang(github.com/aws/aws-sdk-go/aws) -Requires: golang(github.com/aws/aws-sdk-go/aws/awserr) -Requires: golang(github.com/aws/aws-sdk-go/aws/credentials) -Requires: golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds) -Requires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata) -Requires: golang(github.com/aws/aws-sdk-go/aws/session) -Requires: golang(github.com/aws/aws-sdk-go/service/s3) -Requires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) -Requires: golang(github.com/coreos/go-semver/semver) -Requires: golang(github.com/coreos/go-systemd/dbus) -Requires: golang(github.com/coreos/go-systemd/unit) -Requires: golang(github.com/pborman/uuid) -Requires: golang(github.com/pin/tftp) -Requires: golang(github.com/sigma/vmw-guestinfo/rpcvmx) -Requires: golang(github.com/sigma/vmw-guestinfo/vmcheck) -Requires: golang(github.com/vincent-petithory/dataurl) -Requires: golang(github.com/vmware/vmw-ovflib) - -Provides: golang(%{import_path}/config/shared) = %{version}-%{release} -Provides: golang(%{import_path}/config/shared/errors) = %{version}-%{release} -Provides: golang(%{import_path}/config/shared/validations) = %{version}-%{release} -Provides: golang(%{import_path}/config/util) = %{version}-%{release} -Provides: golang(%{import_path}/config/v1) = %{version}-%{release} -Provides: golang(%{import_path}/config/v1/types) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_0) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_0/types) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_1) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_1/types) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_2) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_2/types) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_3_experimental) = %{version}-%{release} -Provides: golang(%{import_path}/config/v2_3_experimental/types) = %{version}-%{release} -Provides: golang(%{import_path}/config/validate) = %{version}-%{release} -Provides: golang(%{import_path}/config/validate/astjson) = %{version}-%{release} -Provides: golang(%{import_path}/config/validate/astnode) = %{version}-%{release} -Provides: golang(%{import_path}/config/validate/report) = %{version}-%{release} -Provides: golang(%{import_path}/tests) = %{version}-%{release} -Provides: golang(%{import_path}/tests/negative/files) = %{version}-%{release} -Provides: golang(%{import_path}/tests/negative/filesystems) = %{version}-%{release} -Provides: golang(%{import_path}/tests/negative/general) = %{version}-%{release} -Provides: golang(%{import_path}/tests/negative/networkd) = %{version}-%{release} -Provides: golang(%{import_path}/tests/negative/partitions) = %{version}-%{release} -Provides: golang(%{import_path}/tests/negative/regression) = %{version}-%{release} -Provides: golang(%{import_path}/tests/negative/security) = %{version}-%{release} -Provides: golang(%{import_path}/tests/negative/timeouts) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/files) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/filesystems) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/general) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/networkd) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/oem) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/partitions) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/passwd) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/regression) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/security) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/systemd) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/timeouts) = %{version}-%{release} -Provides: golang(%{import_path}/tests/register) = %{version}-%{release} -Provides: golang(%{import_path}/tests/registry) = %{version}-%{release} -Provides: golang(%{import_path}/tests/types) = %{version}-%{release} - -%description devel -%{summary} - -This package contains library source intended for -building other packages which use import path with -%{import_path} prefix. -%endif - -%if 0%{?with_unit_test} && 0%{?with_devel} -%package unit-test-devel -Summary: Unit tests for %{name} package -%if 0%{?with_check} -#Here comes all BuildRequires: PACKAGE the unit tests -#in %%check section need for running -%endif - -# test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} - -%if 0%{?with_check} && ! 0%{?with_bundled} -BuildRequires: golang(github.com/stretchr/testify/assert) -%endif - -Requires: golang(github.com/stretchr/testify/assert) - -%description unit-test-devel -%{summary} - -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif - -%prep -%setup -q -n %{repo}-%{commit} - -%build -mkdir -p src/%{provider}.%{provider_tld}/%{project} -ln -s ../../../ src/%{import_path} - -%if ! 0%{?with_bundled} -export GOPATH=$(pwd):%{gopath} -%else -# No dependency directories so far -export GOPATH=$(pwd):%{gopath} -%endif - -#%gobuild -o bin/internal %{import_path}/internal -#%gobuild -o bin/internal/util/tools/docs %{import_path}/internal/util/tools/docs -#%gobuild -o bin/tests/stubs/id-stub %{import_path}/tests/stubs/id-stub -#%gobuild -o bin/tests/stubs/useradd-stub %{import_path}/tests/stubs/useradd-stub -#%gobuild -o bin/tests/stubs/usermod-stub %{import_path}/tests/stubs/usermod-stub -#%gobuild -o bin/validate %{import_path}/validate - -%install -install -d -p %{buildroot}%{_bindir} -#install -p -m 0755 bin/internal %{buildroot}%{_bindir} -#install -p -m 0755 bin/internal/util/tools/docs %{buildroot}%{_bindir} -#install -p -m 0755 bin/tests/stubs/id-stub %{buildroot}%{_bindir} -#install -p -m 0755 bin/tests/stubs/useradd-stub %{buildroot}%{_bindir} -#install -p -m 0755 bin/tests/stubs/usermod-stub %{buildroot}%{_bindir} -#install -p -m 0755 bin/validate %{buildroot}%{_bindir} - -# source codes for building projects -%if 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list -# find all *.go but no *_test.go files and generate devel.file-list -for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go" | grep -v "vendor") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -%endif - -# testing files for this project -%if 0%{?with_unit_test} && 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -# find all *_test.go files and generate unit-test-devel.file-list -for file in $(find . -iname "*_test.go" | grep -v "vendor") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -%endif - -%if 0%{?with_devel} -sort -u -o devel.file-list devel.file-list -%endif - -%check -%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -%if ! 0%{?with_bundled} -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%else -# Since we aren't packaging up the vendor directory we need to link -# back to it somehow. Hack it up so that we can add the vendor -# directory from BUILD dir as a gopath to be searched when executing -# tests from the BUILDROOT dir. -ln -s ./ ./vendor/src # ./vendor/src -> ./vendor - -export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} -%endif - -%if ! 0%{?gotest:1} -%global gotest go test -%endif - -%gotest %{import_path}/config/v1 -%gotest %{import_path}/config/v1/types -%gotest %{import_path}/config/v2_0 -%gotest %{import_path}/config/v2_0/types -%gotest %{import_path}/config/v2_1 -%gotest %{import_path}/config/v2_1/types -%gotest %{import_path}/config/v2_2 -%gotest %{import_path}/config/v2_2/types -%gotest %{import_path}/config/v2_3_experimental -%gotest %{import_path}/config/v2_3_experimental/types -%gotest %{import_path}/config/validate -%gotest %{import_path}/internal/config -%gotest %{import_path}/internal/exec/stages/files -%gotest %{import_path}/internal/exec/util -%gotest %{import_path}/internal/registry -%gotest %{import_path}/internal/util -%gotest %{import_path}/tests -%endif - -#define license tag if not already defined -%{!?_licensedir:%global license %doc} - -%files -%license LICENSE -%doc README.md code-of-conduct.md CONTRIBUTING.md -#%{_bindir}/internal -#%{_bindir}/internal/util/tools/docs -#%{_bindir}/tests/stubs/id-stub -#%{_bindir}/tests/stubs/useradd-stub -#%{_bindir}/tests/stubs/usermod-stub -#%{_bindir}/validate - -%if 0%{?with_devel} -%files devel -f devel.file-list -%license LICENSE -%doc README.md code-of-conduct.md CONTRIBUTING.md -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%endif - -%if 0%{?with_unit_test} && 0%{?with_devel} -%files unit-test-devel -f unit-test-devel.file-list -%license LICENSE -%doc README.md code-of-conduct.md CONTRIBUTING.md -%endif - -%changelog* Thu Aug 30 2018 root - 0-0.1.gitf707912 -- First package for Fedora - diff --git a/notes.txt b/notes.txt deleted file mode 100644 index d97e49e..0000000 --- a/notes.txt +++ /dev/null @@ -1,61 +0,0 @@ -#grab gofed from https://github.com/gofed/gofed -#follow instructions for install - -#choose which version of the repo you want to build. For ignition it was 0.2.6 and the commit was 76107251acd117c6d3e5b4dae2b47f82f944984b - -[vagrant@vanilla-f28 ~]$ gofed repo2spec --detect github.com/coreos/ignition --commit 76107251acd117c6d3e5b4dae2b47f82f944984b --with-extra --with-build -f -Repo URL: github.com/coreos/ignition -Commit: 76107251acd117c6d3e5b4dae2b47f82f944984b -Name: golang-github-coreos-ignition - -(1/4) Checking if the package already exists in PkgDB -(2/4) Collecting data -(3/4) Generating spec file -(4/4) Discovering golang dependencies -Discovering package dependencies - Class: github.com/ajeddeloh/go-json (golang-github-ajeddeloh-go-json) PkgDB=False - Class: github.com/aws/aws-sdk-go (golang-github-aws-aws-sdk-go) PkgDB=True - Class: github.com/coreos/go-semver (golang-github-coreos-go-semver) PkgDB=True - Class: github.com/coreos/go-systemd (golang-github-coreos-go-systemd) PkgDB=True - Class: github.com/pin/tftp (golang-github-pin-tftp) PkgDB=False - Class: github.com/sigma/vmw-guestinfo (golang-github-sigma-vmw-guestinfo) PkgDB=False - Class: github.com/vincent-petithory/dataurl (golang-github-vincent-petithory-dataurl) PkgDB=False - Class: github.com/vmware/vmw-ovflib (golang-github-vmware-vmw-ovflib) PkgDB=False - -Discovering test dependencies - Class: github.com/stretchr/testify (golang-github-stretchr-testify) PkgDB=True - -Spec file golang-github-coreos-ignition.spec at /home/vagrant/golang-github-coreos-ignition - -# spec file now at /home/vagrant/golang-github-coreos-ignition/golang-github-coreos-ignition.spec - -# go through and fix things up - see diff - -# generate bundled provides by copying/using go-mods-to-bundled-provides.py to -# the ignition source folder and then running it. copy into spec file -# should be done by gofed at some point - https://github.com/gofed/gofed/issues/42 - -# grab source tarball -# rpmspec -P ignition.spec | grep Source0 -# pushd $HOME/rpmbuild/SOURCES/ -# curl -L -O $URL -# popd - - -# build RPM -$ rpmbuild -ba ignition.spec - -# find a srpm in `$HOME/rpmbuild/SRPMS` -# find a RPM in `$HOME/rpmbuild/RPM/arch/` -# see if the dependencies are proper - -$ rpm -qpR $HOME/rpmbuild/RPMS/x86_64/ignition-0.26.0-0.1.git7610725.fc28.x86_64.rpm - - -# setup to run koji, ref: https://fedoraproject.org/wiki/Using_the_Koji_build_system -$ fedora-packager-setup -$ kinit @FEDORAPROJECT.ORG - - -# to build it on koji run: -$ koji build --scratch rawhide /path/to/srpm/ignition-0.26.0-0.1.git7610725.fc28.src.rpm From d2013a08cf4f3782896f6d61f45332a67c7a8a96 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 5 Feb 2021 18:25:33 -0500 Subject: [PATCH 103/172] Drop mention of networkd in package description --- ignition.spec | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/ignition.spec b/ignition.spec index 1de9251..6e768a6 100644 --- a/ignition.spec +++ b/ignition.spec @@ -267,10 +267,10 @@ Provides: bundled(golang(go.opencensus.io/trace/tracestate)) = 0.22.5 %description Ignition is a utility used to manipulate systems during the initramfs. This includes partitioning disks, formatting partitions, writing files -(regular files, systemd units, networkd units, etc.), and configuring -users. On first boot, Ignition reads its configuration from a source -of truth (remote URL, network metadata service, hypervisor bridge, etc.) -and applies the configuration. +(regular files, systemd units, etc.), and configuring users. On first +boot, Ignition reads its configuration from a source of truth (remote +URL, network metadata service, hypervisor bridge, etc.) and applies +the configuration. ############## devel subpackage ############## @@ -420,10 +420,10 @@ Conflicts: ignition < 0.31.0-3 %description validate Ignition is a utility used to manipulate systems during the initramfs. This includes partitioning disks, formatting partitions, writing files -(regular files, systemd units, networkd units, etc.), and configuring -users. On first boot, Ignition reads its configuration from a source -of truth (remote URL, network metadata service, hypervisor bridge, etc.) -and applies the configuration. +(regular files, systemd units, etc.), and configuring users. On first +boot, Ignition reads its configuration from a source of truth (remote +URL, network metadata service, hypervisor bridge, etc.) and applies +the configuration. This package contains a tool for validating Ignition configurations. @@ -610,6 +610,7 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} - Correctly enable IMDS patch - Switch to %%autosetup - Set ExclusiveArch from %%go_arches +- Drop mention of networkd in package description * Tue Jan 26 2021 Fedora Release Engineering - 2.9.0-3.git1d56dc8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From 882b9d831a05c80c8f83b3fc07c8ef702d0e0787 Mon Sep 17 00:00:00 2001 From: Stephen Lowrie Date: Fri, 30 Apr 2021 11:55:11 -0500 Subject: [PATCH 104/172] release: Ignition 2.10.1 --- .gitignore | 1 + ignition.rpmlintrc | 2 + ignition.spec | 26 ++++--- ...oviders-aws-probe-the-IMDS-token-URL.patch | 76 ------------------- sources | 2 +- 5 files changed, 20 insertions(+), 87 deletions(-) create mode 100644 ignition.rpmlintrc delete mode 100644 internal-providers-aws-probe-the-IMDS-token-URL.patch diff --git a/.gitignore b/.gitignore index 2d860cd..5d442e6 100644 --- a/.gitignore +++ b/.gitignore @@ -53,3 +53,4 @@ /ignition-c733d23.tar.gz /ignition-1d56dc8.tar.gz /ignition-2.9.0.tar.gz +/ignition-2.10.1.tar.gz diff --git a/ignition.rpmlintrc b/ignition.rpmlintrc new file mode 100644 index 0000000..de41af1 --- /dev/null +++ b/ignition.rpmlintrc @@ -0,0 +1,2 @@ +# Suppress hardcoded library path warning +addFilter("hardcoded-library-path in %{_prefix}/lib/dracut") diff --git a/ignition.spec b/ignition.spec index 6e768a6..4bf342b 100644 --- a/ignition.spec +++ b/ignition.spec @@ -58,15 +58,12 @@ %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Version: 2.9.0 -Release: 4%{?dist} +Version: 2.10.1 +Release: 1%{?dist} Summary: First boot installer and configuration tool License: ASL 2.0 URL: https://%{provider_prefix} Source0: https://%{provider_prefix}/archive/v%{version}/%{repo}-%{version}.tar.gz -# Fix AWS probing by using the IMDS token URL to ensure that networking is up -# https://github.com/coreos/ignition/pull/1161 -Patch0: internal-providers-aws-probe-the-IMDS-token-URL.patch %define gopath %{_datadir}/gocode ExclusiveArch: %{go_arches} @@ -171,11 +168,11 @@ Provides: bundled(golang(github.com/coreos/go-semver/semver)) = 0.3.0 Provides: bundled(golang(github.com/coreos/go-systemd/v22/dbus)) = 22.0.0 Provides: bundled(golang(github.com/coreos/go-systemd/v22/journal)) = 22.0.0 Provides: bundled(golang(github.com/coreos/go-systemd/v22/unit)) = 22.0.0 -Provides: bundled(golang(github.com/coreos/vcontext/json)) = 0.0.0-20201120045928.gitb0e13dab675c -Provides: bundled(golang(github.com/coreos/vcontext/path)) = 0.0.0-20201120045928.gitb0e13dab675c -Provides: bundled(golang(github.com/coreos/vcontext/report)) = 0.0.0-20201120045928.gitb0e13dab675c -Provides: bundled(golang(github.com/coreos/vcontext/tree)) = 0.0.0-20201120045928.gitb0e13dab675c -Provides: bundled(golang(github.com/coreos/vcontext/validate)) = 0.0.0-20201120045928.gitb0e13dab675c +Provides: bundled(golang(github.com/coreos/vcontext/json)) = 0.0.0-20210407161507.git4ee6c745c8bd +Provides: bundled(golang(github.com/coreos/vcontext/path)) = 0.0.0-20210407161507.git4ee6c745c8bd +Provides: bundled(golang(github.com/coreos/vcontext/report)) = 0.0.0-20210407161507.git4ee6c745c8bd +Provides: bundled(golang(github.com/coreos/vcontext/tree)) = 0.0.0-20210407161507.git4ee6c745c8bd +Provides: bundled(golang(github.com/coreos/vcontext/validate)) = 0.0.0-20210407161507.git4ee6c745c8bd Provides: bundled(golang(github.com/google/renameio)) = 0.1.0 Provides: bundled(golang(github.com/google/uuid)) = 1.1.1 Provides: bundled(golang(github.com/pin/tftp)) = 2.1.0 @@ -558,11 +555,17 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %gotest %{import_path}/config/merge %gotest %{import_path}/config/translate %gotest %{import_path}/config/v3_0 +%gotest %{import_path}/config/v3_0/translate %gotest %{import_path}/config/v3_0/types %gotest %{import_path}/config/v3_1 +%gotest %{import_path}/config/v3_1/translate %gotest %{import_path}/config/v3_1/types %gotest %{import_path}/config/v3_2 +%gotest %{import_path}/config/v3_2/translate %gotest %{import_path}/config/v3_2/types +%gotest %{import_path}/config/v3_3_experimental +%gotest %{import_path}/config/v3_3_experimental/translate +%gotest %{import_path}/config/v3_3_experimental/types %gotest %{import_path}/config/validate %gotest %{import_path}/internal/exec/stages/files %gotest %{import_path}/internal/exec/util @@ -605,6 +608,9 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} %endif %changelog +* 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 - Correctly enable IMDS patch diff --git a/internal-providers-aws-probe-the-IMDS-token-URL.patch b/internal-providers-aws-probe-the-IMDS-token-URL.patch deleted file mode 100644 index d989482..0000000 --- a/internal-providers-aws-probe-the-IMDS-token-URL.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 74ffe3749d70b9d115a9b9790969b8dcb4a76e12 Mon Sep 17 00:00:00 2001 -From: Stephen Lowrie -Date: Mon, 11 Jan 2021 11:27:12 -0600 -Subject: [PATCH] internal/providers/aws: probe the IMDS token URL - -Probing the `/latest` path causes a 401 Unauthorized when running with -IMDSv2 only. Instead ping the token URL. ---- - internal/providers/aws/aws.go | 37 +++++++++++++++++++---------------- - 1 file changed, 20 insertions(+), 17 deletions(-) - -diff --git a/internal/providers/aws/aws.go b/internal/providers/aws/aws.go -index 54373dbb..4a6655f0 100644 ---- a/internal/providers/aws/aws.go -+++ b/internal/providers/aws/aws.go -@@ -40,11 +40,6 @@ var ( - Host: "169.254.169.254", - Path: "2019-10-01/user-data", - } -- metadataServiceProbeURL = url.URL{ -- Scheme: "http", -- Host: "169.254.169.254", -- Path: "latest", -- } - imdsTokenURL = url.URL{ - Scheme: "http", - Host: "169.254.169.254", -@@ -78,17 +73,17 @@ func NewFetcher(l *log.Logger) (resource.Fetcher, error) { - // Init prepares the fetcher for this platform - func Init(f *resource.Fetcher) error { - // During the fetch stage we might be running before the networking -- // is fully ready. Perform an HTTP fetch against the metadata probe -- // URL to ensure that networking is up before we attempt to fetch -- // the region hint from ec2metadata. -+ // is fully ready. Perform an HTTP fetch against the IMDS token URL -+ // to ensure that networking is up before we attempt to fetch the -+ // region hint from ec2metadata. - // -- // NOTE: the FetchToBuffer call against the metadata service probe -- // URL is a temporary solution to handle waiting for networking -- // before fetching from the AWS API. We do this instead of an -- // infinite retry loop on the API call because, without a clear -- // understanding of the failure cases, that would risk provisioning -- // failures due to quirks of the ec2metadata API. Additionally a -- // finite retry loop would have to time out quickly enough to avoid -+ // NOTE: the FetchToBuffer call against the IMDS token URL is a -+ // temporary solution to handle waiting for networking before -+ // fetching from the AWS API. We do this instead of an infinite -+ // retry loop on the API call because, without a clear understanding -+ // of the failure cases, that would risk provisioning failures due -+ // to quirks of the ec2metadata API. Additionally a finite retry -+ // loop would have to time out quickly enough to avoid - // extraordinarily long boots on failure (since this code runs in - // every stage) but that would risk premature timeouts if the - // network takes a while to come up. -@@ -102,8 +97,16 @@ func Init(f *resource.Fetcher) error { - // NOTE: FetchToBuffer is handling the ErrNeedNet case. If we move - // to an alternative method, we will need to handle the detection in - // this function. -- _, err := f.FetchToBuffer(metadataServiceProbeURL, resource.FetchOptions{}) -- if err != nil { -+ opts := resource.FetchOptions{ -+ Headers: http.Header{ -+ "x-aws-ec2-metadata-token-ttl-seconds": []string{"21600"}, -+ }, -+ HTTPVerb: "PUT", -+ } -+ _, err := f.FetchToBuffer(imdsTokenURL, opts) -+ // ErrNotFound would just mean that the instance might not have -+ // IMDSv2 enabled -+ if err != nil && err != resource.ErrNotFound { - return err - } - --- -2.29.2 diff --git a/sources b/sources index 8a36460..21c6ff9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ignition-2.9.0.tar.gz) = 714ae90fb32a45e1b21e0b0671e7933ce302cdd943cd02cfc221e8bf88269fb464ff5f740d54b444e5c341a3877bf2943ca6f2c2f1374df904386400d73ebe97 +SHA512 (ignition-2.10.1.tar.gz) = 039ea5ab19c0e2efa6ec2c21534e4a5b93f0fb20576d51563283ede1caa3faa29dbb461632bb01f7549d47677991d17516d94f2cefc5982d23545ace5f196f4f From 57fc8be7c963371ceb20b24aa94bab2d6c15fb90 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 26 May 2021 06:27:06 +0000 Subject: [PATCH 105/172] spec: regenerate from go2rpm The old spec file was a mess full of things we didn't need/use. Regenerate a new one from `go2rpm` and then import back the bits we need. Co-authored by: Stephen Lowrie --- ignition.spec | 433 +++++++------------------------------------------- 1 file changed, 59 insertions(+), 374 deletions(-) diff --git a/ignition.spec b/ignition.spec index 4bf342b..d34af52 100644 --- a/ignition.spec +++ b/ignition.spec @@ -1,74 +1,26 @@ -# Original spec file for 0.28.0 as generated by: -# gofed repo2spec --detect github.com/coreos/ignition --commit f7079129b8651ac51dba14c3af65692bb413c1dd --with-extra --with-build -f -# With: -# gofed/gofed:v1.0.1 docker image -# Modified by hand for v2.0.0-alpha +# Generated by go2rpm 1.3 +%bcond_without check -# If any of the following macros should be set otherwise, -# you can wrap any of them with the following conditions: -# - %%if 0%%{centos} == 7 -# - %%if 0%%{?rhel} == 7 -# - %%if 0%%{?fedora} == 23 -# Or just test for particular distribution: -# - %%if 0%%{centos} -# - %%if 0%%{?rhel} -# - %%if 0%%{?fedora} -# -# Be aware, on centos, both %%rhel and %%centos are set. If you want to test -# rhel specific macros, you can use %%if 0%%{?rhel} && 0%%{?centos} == 0 condition. -# (Don't forget to replace double percentage symbol with single one in order to apply a condition) - -# Not all devel deps exist in Fedora so you can't install the devel rpm -# so we need to build without devel for now -# Generate devel rpm -%global with_devel 0 -# Build project from bundled dependencies -%global with_bundled 1 -# Build with debug info rpm -%global with_debug 1 -# Run tests in check section -%global with_check 1 -# Generate unit-test rpm -%global with_unit_test 1 - -%if 0%{?with_debug} -%global _dwz_low_mem_die_limit 0 -%else -%global debug_package %{nil} -%endif - -%if ! 0%{?gobuild:1} -%define gobuild(o:) go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %{?**}; -%endif - -# macros for Ignition -%global provider github -%global provider_tld com -%global project coreos -%global repo ignition # https://github.com/coreos/ignition -%global provider_prefix %{provider}.%{provider_tld}/%{project}/%{repo} -%global import_path %{provider_prefix}/v2 -# define ldflags, buildflags, testflags here. The ldflags were -# taken from ./build. We will need to periodically check these -# for consistency -%global ldflags ' -X github.com/coreos/ignition/v2/internal/version.Raw=%{version} ' -%global buildflags %nil -%global testflags %nil +%global goipath github.com/coreos/ignition +%global gomodulesmode GO111MODULE=on +Version: 2.10.1 + +%gometa + +%global golicenses LICENSE +%global godocs README.md docs/ %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Version: 2.10.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: First boot installer and configuration tool -License: ASL 2.0 -URL: https://%{provider_prefix} -Source0: https://%{provider_prefix}/archive/v%{version}/%{repo}-%{version}.tar.gz -%define gopath %{_datadir}/gocode -ExclusiveArch: %{go_arches} -BuildRequires: golang >= 1.10 -# add non golang BuildRequires that weren't detected +# Upstream license specification: Apache-2.0 +License: ASL 2.0 +URL: %{gourl} +Source0: %{gosource} + BuildRequires: libblkid-devel # Requires for 'disks' stage @@ -82,36 +34,7 @@ Requires: dracut-network Obsoletes: ignition-dracut < 0.31.0-3 -# Main rpm package BuildRequires -%if ! 0%{?with_bundled} -# Remaining dependencies not included in main packages (sorted) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/awserr) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/session) -BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3) -BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) -BuildRequires: golang(github.com/coreos/go-semver/semver) -BuildRequires: golang(github.com/coreos/go-systemd/dbus) -BuildRequires: golang(github.com/coreos/go-systemd/unit) -BuildRequires: golang(github.com/coreos/vcontext/json) -BuildRequires: golang(github.com/coreos/vcontext/path) -BuildRequires: golang(github.com/coreos/vcontext/report) -BuildRequires: golang(github.com/coreos/vcontext/tree) -BuildRequires: golang(github.com/coreos/vcontext/validate) -BuildRequires: golang(github.com/google/uuid) -BuildRequires: golang(github.com/pin/tftp) -BuildRequires: golang(github.com/vincent-petithory/dataurl) -BuildRequires: golang(github.com/vmware/vmw-guestinfo/rpcvmx) -BuildRequires: golang(github.com/vmware/vmw-guestinfo/vmcheck) -BuildRequires: golang(github.com/vmware/vmw-ovflib) -BuildRequires: golang(golang.org/x/net/http/httpproxy) -%endif - -# Main package Provides (generated with go-mods-to-bundled-provides.py | sort) -%if 0%{?with_bundled} +# Generated by `go-mods-to-bundled-provides.py | sort` Provides: bundled(golang(cloud.google.com/go)) = 0.58.0 Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.58.0 Provides: bundled(golang(cloud.google.com/go/iam)) = 0.58.0 @@ -185,12 +108,28 @@ Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcout)) = 0.0.0-201707 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcvmx)) = 0.0.0-20170707015358.git25eff159a728 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/vmcheck)) = 0.0.0-20170707015358.git25eff159a728 Provides: bundled(golang(github.com/vmware/vmw-ovflib)) = 0.0.0-20170608004843.git1f217b9dc714 +Provides: bundled(golang(go.opencensus.io)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/internal)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/internal/tagencoding)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/metric/metricdata)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/metric/metricproducer)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/plugin/ochttp)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/plugin/ochttp/propagation/b3)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/resource)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/stats)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/stats/internal)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/stats/view)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/tag)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/trace)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/trace/internal)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/trace/propagation)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/trace/tracestate)) = 0.22.5 Provides: bundled(golang(golang.org/x/net/context)) = 0.0.0-20200602114024.git627f9648deb9 Provides: bundled(golang(golang.org/x/net/context/ctxhttp)) = 0.0.0-20200602114024.git627f9648deb9 -Provides: bundled(golang(golang.org/x/net/http2)) = 0.0.0-20200602114024.git627f9648deb9 -Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.0.0-20200602114024.git627f9648deb9 Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.0.0-20200602114024.git627f9648deb9 Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.0.0-20200602114024.git627f9648deb9 +Provides: bundled(golang(golang.org/x/net/http2)) = 0.0.0-20200602114024.git627f9648deb9 +Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.0.0-20200602114024.git627f9648deb9 Provides: bundled(golang(golang.org/x/net/idna)) = 0.0.0-20200602114024.git627f9648deb9 Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.0.0-20200602114024.git627f9648deb9 Provides: bundled(golang(golang.org/x/net/trace)) = 0.0.0-20200602114024.git627f9648deb9 @@ -242,24 +181,6 @@ Provides: bundled(golang(google.golang.org/genproto/googleapis/iam/v1)) = 0.0.0- Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc/code)) = 0.0.0-20200610104632.gita5b850bcf112 Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc/status)) = 0.0.0-20200610104632.gita5b850bcf112 Provides: bundled(golang(google.golang.org/genproto/googleapis/type/expr)) = 0.0.0-20200610104632.gita5b850bcf112 -Provides: bundled(golang(go.opencensus.io)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/internal)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/internal/tagencoding)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/metric/metricdata)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/metric/metricproducer)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/plugin/ochttp)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/plugin/ochttp/propagation/b3)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/resource)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/stats)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/stats/internal)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/stats/view)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/tag)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/trace)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/trace/internal)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/trace/propagation)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/trace/tracestate)) = 0.22.5 -%endif - %description Ignition is a utility used to manipulate systems during the initramfs. @@ -269,144 +190,8 @@ boot, Ignition reads its configuration from a source of truth (remote URL, network metadata service, hypervisor bridge, etc.) and applies the configuration. -############## devel subpackage ############## - -%if 0%{?with_devel} -%package devel -Summary: %{summary} -BuildArch: noarch -License: ASL 2.0 - -# devel subpackage BuildRequires -%if 0%{?with_check} && ! 0%{?with_bundled} -# These buildrequires are only for our tests (check) (sorted) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/awserr) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata) -BuildRequires: golang(github.com/aws/aws-sdk-go/aws/session) -BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3) -BuildRequires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) -BuildRequires: golang(github.com/coreos/go-semver/semver) -BuildRequires: golang(github.com/coreos/go-systemd/dbus) -BuildRequires: golang(github.com/coreos/go-systemd/unit) -BuildRequires: golang(github.com/coreos/vcontext/json) -BuildRequires: golang(github.com/coreos/vcontext/path) -BuildRequires: golang(github.com/coreos/vcontext/report) -BuildRequires: golang(github.com/coreos/vcontext/tree) -BuildRequires: golang(github.com/coreos/vcontext/validate) -BuildRequires: golang(github.com/google/uuid) -BuildRequires: golang(github.com/pin/tftp) -BuildRequires: golang(github.com/vincent-petithory/dataurl) -BuildRequires: golang(github.com/vmware/vmw-guestinfo/rpcvmx) -BuildRequires: golang(github.com/vmware/vmw-guestinfo/vmcheck) -BuildRequires: golang(github.com/vmware/vmw-ovflib) -BuildRequires: golang(golang.org/x/net/http/httpproxy) -%endif - -# devel subpackage Requires. This is basically the source code from -# all of the libraries that ignition imports during build. (sorted) -Requires: golang(github.com/aws/aws-sdk-go/aws) -Requires: golang(github.com/aws/aws-sdk-go/aws/awserr) -Requires: golang(github.com/aws/aws-sdk-go/aws/credentials) -Requires: golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds) -Requires: golang(github.com/aws/aws-sdk-go/aws/ec2metadata) -Requires: golang(github.com/aws/aws-sdk-go/aws/session) -Requires: golang(github.com/aws/aws-sdk-go/service/s3) -Requires: golang(github.com/aws/aws-sdk-go/service/s3/s3manager) -Requires: golang(github.com/coreos/go-semver/semver) -Requires: golang(github.com/coreos/go-systemd/dbus) -Requires: golang(github.com/coreos/go-systemd/unit) -Requires: golang(github.com/coreos/vcontext/json) -Requires: golang(github.com/coreos/vcontext/path) -Requires: golang(github.com/coreos/vcontext/report) -Requires: golang(github.com/coreos/vcontext/tree) -Requires: golang(github.com/coreos/vcontext/validate) -Requires: golang(github.com/google/uuid) -Requires: golang(github.com/pin/tftp) -Requires: golang(github.com/vincent-petithory/dataurl) -Requires: golang(github.com/vmware/vmw-guestinfo/rpcvmx) -Requires: golang(github.com/vmware/vmw-guestinfo/vmcheck) -Requires: golang(github.com/vmware/vmw-ovflib) -Requires: golang(golang.org/x/net/http/httpproxy) - -# devel subpackage Provides (sorted) -Provides: golang(%{import_path}/config) = %{version}-%{release} -Provides: golang(%{import_path}/config/merge) = %{version}-%{release} -Provides: golang(%{import_path}/config/shared) = %{version}-%{release} -Provides: golang(%{import_path}/config/shared/errors) = %{version}-%{release} -Provides: golang(%{import_path}/config/shared/validations) = %{version}-%{release} -Provides: golang(%{import_path}/config/translate) = %{version}-%{release} -Provides: golang(%{import_path}/config/translate/tests/pkga) = %{version}-%{release} -Provides: golang(%{import_path}/config/translate/tests/pkgb) = %{version}-%{release} -Provides: golang(%{import_path}/config/util) = %{version}-%{release} -Provides: golang(%{import_path}/config/v3_0) = %{version}-%{release} -Provides: golang(%{import_path}/config/v3_0/types) = %{version}-%{release} -Provides: golang(%{import_path}/config/v3_1_experimental) = %{version}-%{release} -Provides: golang(%{import_path}/config/v3_1_experimental/translate) = %{version}-%{release} -Provides: golang(%{import_path}/config/v3_1_experimental/types) = %{version}-%{release} -Provides: golang(%{import_path}/config/validate) = %{version}-%{release} -Provides: golang(%{import_path}/tests) = %{version}-%{release} -Provides: golang(%{import_path}/tests/negative/files) = %{version}-%{release} -Provides: golang(%{import_path}/tests/negative/filesystems) = %{version}-%{release} -Provides: golang(%{import_path}/tests/negative/general) = %{version}-%{release} -Provides: golang(%{import_path}/tests/negative/partitions) = %{version}-%{release} -Provides: golang(%{import_path}/tests/negative/proxy) = %{version}-%{release} -Provides: golang(%{import_path}/tests/negative/regression) = %{version}-%{release} -Provides: golang(%{import_path}/tests/negative/security) = %{version}-%{release} -Provides: golang(%{import_path}/tests/negative/timeouts) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/files) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/filesystems) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/general) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/partitions) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/passwd) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/proxy) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/regression) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/security) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/systemd) = %{version}-%{release} -Provides: golang(%{import_path}/tests/positive/timeouts) = %{version}-%{release} -Provides: golang(%{import_path}/tests/register) = %{version}-%{release} -Provides: golang(%{import_path}/tests/registry) = %{version}-%{release} -Provides: golang(%{import_path}/tests/servers) = %{version}-%{release} -Provides: golang(%{import_path}/tests/types) = %{version}-%{release} - -%description devel -%{summary} - -This package contains library source intended for -building other packages which use import path with -%{import_path} prefix. -%endif - -############## unit-test-devel subpackage ############## -%if 0%{?with_unit_test} && 0%{?with_devel} -%package unit-test-devel -Summary: Unit tests for %{name} package -License: ASL 2.0 -%if 0%{?with_check} -#Here comes all BuildRequires: PACKAGE the unit tests -#in %%check section need for running -%endif - -# test subpackage tests code from devel subpackage -Requires: %{name}-devel = %{version}-%{release} - -%if 0%{?with_check} && ! 0%{?with_bundled} -BuildRequires: golang(github.com/stretchr/testify/assert) -%endif - -Requires: golang(github.com/stretchr/testify/assert) - -%description unit-test-devel -%{summary} - -This package contains unit tests for project -providing packages with %{import_path} prefix. -%endif - - ############## validate subpackage ############## + %package validate Summary: Validation tool for Ignition configs @@ -425,6 +210,7 @@ the configuration. This package contains a tool for validating Ignition configurations. ############## validate-nonlinux subpackage ############## + %package validate-nonlinux Summary: Validation tool for Ignition configs for macOS and Windows @@ -440,40 +226,26 @@ building binaries to sign by Fedora release engineering and include on the Ignition project's Github releases page. %prep -%autosetup -p1 +%goprep -k +%autopatch -p1 %build -# Set up PWD as a proper import path for go -mkdir -p src/%{provider}.%{provider_tld}/%{project} -ln -s ../../../ src/%{provider_prefix} - -export LDFLAGS=%{ldflags} -# Enable SELinux relabeling -export LDFLAGS+=' -X github.com/coreos/ignition/v2/internal/distro.selinuxRelabel=true ' - -# Modules, baby! -export GO111MODULE=on -export GOFLAGS='-mod=vendor' +export LDFLAGS="-X github.com/coreos/ignition/v2/internal/version.Raw=%{version} -X github.com/coreos/ignition/v2/internal/distro.selinuxRelabel=true " +export GOFLAGS="-mod=vendor" echo "Building ignition..." -%gobuild -o ./ignition %{import_path}/internal +%gobuild -o ./ignition internal/main.go echo "Building ignition-validate..." -%gobuild -o ./ignition-validate %{import_path}/validate +%gobuild -o ./ignition-validate validate/main.go -echo "Building macOS ignition-validate" -export GOARCH=amd64 -export GOOS=darwin -%gobuild -o ./ignition-validate-x86_64-apple-darwin %{import_path}/validate +%global gocrossbuild go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x -echo "Building Windows ignition-validate" -export GOARCH=amd64 -export GOOS=windows -%gobuild -o ./ignition-validate-x86_64-pc-windows-gnu.exe %{import_path}/validate +echo "Building macOS ignition-validate..." +GOARCH=amd64 GOOS=darwin %gocrossbuild -o ./ignition-validate-x86_64-apple-darwin validate/main.go -# Set this back, just in case -export GOARCH= -export GOOS=linux +echo "Building Windows ignition-validate..." +GOARCH=amd64 GOOS=windows %gocrossbuild -o ./ignition-validate-x86_64-pc-windows-gnu.exe validate/main.go %install # dracut modules @@ -494,120 +266,33 @@ install -p -m 0644 ./ignition-validate-x86_64-pc-windows-gnu.exe %{buildroot}%{_ # the command line. Install directly into the dracut module dir. install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition -# source codes for building projects -%if 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -echo "%%dir %%{gopath}/src/%%{import_path}/." >> devel.file-list -# find all *.go but no *_test.go files and generate devel.file-list -for file in $(find . \( -iname "*.go" -or -iname "*.s" \) \! -iname "*_test.go" | grep -v "vendor") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -%endif - -# testing files for this project -%if 0%{?with_unit_test} && 0%{?with_devel} -install -d -p %{buildroot}/%{gopath}/src/%{import_path}/ -# find all *_test.go files and generate unit-test-devel.file-list -for file in $(find . -iname "*_test.go" | grep -v "vendor") ; do - dirprefix=$(dirname $file) - install -d -p %{buildroot}/%{gopath}/src/%{import_path}/$dirprefix - cp -pav $file %{buildroot}/%{gopath}/src/%{import_path}/$file - echo "%%{gopath}/src/%%{import_path}/$file" >> unit-test-devel.file-list - - while [ "$dirprefix" != "." ]; do - echo "%%dir %%{gopath}/src/%%{import_path}/$dirprefix" >> devel.file-list - dirprefix=$(dirname $dirprefix) - done -done -%endif - -%if 0%{?with_devel} -sort -u -o devel.file-list devel.file-list -%endif - +%if %{with check} %check -%if 0%{?with_check} && 0%{?with_unit_test} && 0%{?with_devel} -%if ! 0%{?with_bundled} -export GOPATH=%{buildroot}/%{gopath}:%{gopath} -%else -# Since we aren't packaging up the vendor directory we need to link -# back to it somehow. Hack it up so that we can add the vendor -# directory from BUILD dir as a gopath to be searched when executing -# tests from the BUILDROOT dir. -ln -s ./ ./vendor/src # ./vendor/src -> ./vendor - -export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath} +# Exclude the blackbox tests +%gocheck -t tests %endif -%if ! 0%{?gotest:1} -%global gotest go test -%endif - -%gotest %{import_path}/config -%gotest %{import_path}/config/merge -%gotest %{import_path}/config/translate -%gotest %{import_path}/config/v3_0 -%gotest %{import_path}/config/v3_0/translate -%gotest %{import_path}/config/v3_0/types -%gotest %{import_path}/config/v3_1 -%gotest %{import_path}/config/v3_1/translate -%gotest %{import_path}/config/v3_1/types -%gotest %{import_path}/config/v3_2 -%gotest %{import_path}/config/v3_2/translate -%gotest %{import_path}/config/v3_2/types -%gotest %{import_path}/config/v3_3_experimental -%gotest %{import_path}/config/v3_3_experimental/translate -%gotest %{import_path}/config/v3_3_experimental/types -%gotest %{import_path}/config/validate -%gotest %{import_path}/internal/exec/stages/files -%gotest %{import_path}/internal/exec/util -%gotest %{import_path}/internal/registry -%gotest %{import_path}/internal/util -%gotest %{import_path}/tests -%endif - -#define license tag if not already defined -%{!?_licensedir:%global license %doc} - %files -%license LICENSE -%doc README.md docs/ +%license %{golicenses} +%doc %{godocs} %{dracutlibdir}/modules.d/* %{_prefix}/lib/systemd/system/*.service %files validate %doc README.md -%license LICENSE -%{_bindir}/%{name}-validate +%license %{golicenses} +%{_bindir}/ignition-validate %files validate-nonlinux -%license LICENSE +%license %{golicenses} %dir %{_datadir}/ignition %{_datadir}/ignition/ignition-validate-x86_64-apple-darwin %{_datadir}/ignition/ignition-validate-x86_64-pc-windows-gnu.exe -%if 0%{?with_devel} -%files devel -f devel.file-list -%license LICENSE -%doc README.md code-of-conduct.md CONTRIBUTING.md -%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project} -%endif - -%if 0%{?with_unit_test} && 0%{?with_devel} -%files unit-test-devel -f unit-test-devel.file-list -%license LICENSE -%doc README.md code-of-conduct.md CONTRIBUTING.md -%endif - %changelog +* 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 From 03c2a3f05b1dd6b13f042329c8540ce8f8c31141 Mon Sep 17 00:00:00 2001 From: Jonathan Lebon Date: Wed, 26 May 2021 15:40:09 -0400 Subject: [PATCH 106/172] Backport patch for multipath on firstboot https://github.com/coreos/ignition/pull/1208 https://github.com/coreos/fedora-coreos-config/pull/1011 --- ...ser.service-drop-Before-multipathd.s.patch | 33 +++++++++++++++++++ ignition.spec | 8 ++++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0001-ignition-setup-user.service-drop-Before-multipathd.s.patch diff --git a/0001-ignition-setup-user.service-drop-Before-multipathd.s.patch b/0001-ignition-setup-user.service-drop-Before-multipathd.s.patch new file mode 100644 index 0000000..ba43245 --- /dev/null +++ b/0001-ignition-setup-user.service-drop-Before-multipathd.s.patch @@ -0,0 +1,33 @@ +From 88a96f132240a71112397adbb4b7ffafd570e723 Mon Sep 17 00:00:00 2001 +From: Jonathan Lebon +Date: Wed, 12 May 2021 17:27:20 -0400 +Subject: [PATCH] ignition-setup-user.service: drop Before=multipathd.service + +We don't officially support multipath enabled on first boot yet. That's +what I'm working on, but this gets in the way because we actually need +to do the *opposite* (i.e. ensure that any I/O going to multipathed +devices is done through the multipath device node). + +Related: https://bugzilla.redhat.com/show_bug.cgi?id=1954025 +--- + dracut/30ignition/ignition-setup-user.service | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/dracut/30ignition/ignition-setup-user.service b/dracut/30ignition/ignition-setup-user.service +index b3ad98b3..e0fb5d06 100644 +--- a/dracut/30ignition/ignition-setup-user.service ++++ b/dracut/30ignition/ignition-setup-user.service +@@ -11,10 +11,6 @@ OnFailureJobMode=isolate + # Stage order: setup -> fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. + Before=ignition-fetch-offline.service + +-# We want to make sure we're not racing with multipath taking ownership of the +-# boot device. +-Before=multipathd.service +- + # On diskful boots, ignition-generator adds Requires/After on + # dev-disk-by\x2dlabel-boot.device + +-- +2.31.1 + diff --git a/ignition.spec b/ignition.spec index d34af52..57755ef 100644 --- a/ignition.spec +++ b/ignition.spec @@ -13,13 +13,14 @@ Version: 2.10.1 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 2%{?dist} +Release: 3%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 License: ASL 2.0 URL: %{gourl} Source0: %{gosource} +Patch0: 0001-ignition-setup-user.service-drop-Before-multipathd.s.patch BuildRequires: libblkid-devel @@ -290,6 +291,11 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_datadir}/ignition/ignition-validate-x86_64-pc-windows-gnu.exe %changelog +* 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 From eeb1bb62c6d0f6b308efddb6f2645195d1aa773a Mon Sep 17 00:00:00 2001 From: Sohan Kunkerkar Date: Wed, 9 Jun 2021 15:00:15 -0400 Subject: [PATCH 107/172] Fix go-mods-to-bundled-provides script to parse correct rpm version --- go-mods-to-bundled-provides.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go-mods-to-bundled-provides.py b/go-mods-to-bundled-provides.py index 3de621a..51dee83 100755 --- a/go-mods-to-bundled-provides.py +++ b/go-mods-to-bundled-provides.py @@ -51,7 +51,7 @@ def go_mod_tag_to_rpm_provides_version(tag): tag = tag[1:] # is this a pseudo-version? e.g. v0.0.0-20181031085051-9002847aa142 - m = re.match("(.*)-([0-9]{14})-([a-f0-9]{12})", tag) + m = re.match("(.*)-([0-9.]+)-([a-f0-9]{12})", tag) if m: # rpm doesn't like multiple dashes in the version, so just merge the # timestamp and the commit checksum into the "release" field From c67462bad16d56160a713790dcadddb27dea79ac Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 25 Jun 2021 22:31:12 -0400 Subject: [PATCH 108/172] 2.11.0 --- .gitignore | 1 + ...ser.service-drop-Before-multipathd.s.patch | 33 -------------- ignition.spec | 44 ++++++++++--------- sources | 2 +- 4 files changed, 25 insertions(+), 55 deletions(-) delete mode 100644 0001-ignition-setup-user.service-drop-Before-multipathd.s.patch diff --git a/.gitignore b/.gitignore index 5d442e6..42f06a3 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ /ignition-1d56dc8.tar.gz /ignition-2.9.0.tar.gz /ignition-2.10.1.tar.gz +/ignition-2.11.0.tar.gz diff --git a/0001-ignition-setup-user.service-drop-Before-multipathd.s.patch b/0001-ignition-setup-user.service-drop-Before-multipathd.s.patch deleted file mode 100644 index ba43245..0000000 --- a/0001-ignition-setup-user.service-drop-Before-multipathd.s.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 88a96f132240a71112397adbb4b7ffafd570e723 Mon Sep 17 00:00:00 2001 -From: Jonathan Lebon -Date: Wed, 12 May 2021 17:27:20 -0400 -Subject: [PATCH] ignition-setup-user.service: drop Before=multipathd.service - -We don't officially support multipath enabled on first boot yet. That's -what I'm working on, but this gets in the way because we actually need -to do the *opposite* (i.e. ensure that any I/O going to multipathed -devices is done through the multipath device node). - -Related: https://bugzilla.redhat.com/show_bug.cgi?id=1954025 ---- - dracut/30ignition/ignition-setup-user.service | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/dracut/30ignition/ignition-setup-user.service b/dracut/30ignition/ignition-setup-user.service -index b3ad98b3..e0fb5d06 100644 ---- a/dracut/30ignition/ignition-setup-user.service -+++ b/dracut/30ignition/ignition-setup-user.service -@@ -11,10 +11,6 @@ OnFailureJobMode=isolate - # Stage order: setup -> fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. - Before=ignition-fetch-offline.service - --# We want to make sure we're not racing with multipath taking ownership of the --# boot device. --Before=multipathd.service -- - # On diskful boots, ignition-generator adds Requires/After on - # dev-disk-by\x2dlabel-boot.device - --- -2.31.1 - diff --git a/ignition.spec b/ignition.spec index 57755ef..5c8cbb4 100644 --- a/ignition.spec +++ b/ignition.spec @@ -4,7 +4,7 @@ # https://github.com/coreos/ignition %global goipath github.com/coreos/ignition %global gomodulesmode GO111MODULE=on -Version: 2.10.1 +Version: 2.11.0 %gometa @@ -13,14 +13,13 @@ Version: 2.10.1 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 3%{?dist} +Release: 1%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 License: ASL 2.0 URL: %{gourl} Source0: %{gosource} -Patch0: 0001-ignition-setup-user.service-drop-Before-multipathd.s.patch BuildRequires: libblkid-devel @@ -109,28 +108,12 @@ Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcout)) = 0.0.0-201707 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcvmx)) = 0.0.0-20170707015358.git25eff159a728 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/vmcheck)) = 0.0.0-20170707015358.git25eff159a728 Provides: bundled(golang(github.com/vmware/vmw-ovflib)) = 0.0.0-20170608004843.git1f217b9dc714 -Provides: bundled(golang(go.opencensus.io)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/internal)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/internal/tagencoding)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/metric/metricdata)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/metric/metricproducer)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/plugin/ochttp)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/plugin/ochttp/propagation/b3)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/resource)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/stats)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/stats/internal)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/stats/view)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/tag)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/trace)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/trace/internal)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/trace/propagation)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/trace/tracestate)) = 0.22.5 Provides: bundled(golang(golang.org/x/net/context)) = 0.0.0-20200602114024.git627f9648deb9 Provides: bundled(golang(golang.org/x/net/context/ctxhttp)) = 0.0.0-20200602114024.git627f9648deb9 -Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.0.0-20200602114024.git627f9648deb9 -Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.0.0-20200602114024.git627f9648deb9 Provides: bundled(golang(golang.org/x/net/http2)) = 0.0.0-20200602114024.git627f9648deb9 Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.0.0-20200602114024.git627f9648deb9 +Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.0.0-20200602114024.git627f9648deb9 +Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.0.0-20200602114024.git627f9648deb9 Provides: bundled(golang(golang.org/x/net/idna)) = 0.0.0-20200602114024.git627f9648deb9 Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.0.0-20200602114024.git627f9648deb9 Provides: bundled(golang(golang.org/x/net/trace)) = 0.0.0-20200602114024.git627f9648deb9 @@ -182,6 +165,22 @@ Provides: bundled(golang(google.golang.org/genproto/googleapis/iam/v1)) = 0.0.0- Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc/code)) = 0.0.0-20200610104632.gita5b850bcf112 Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc/status)) = 0.0.0-20200610104632.gita5b850bcf112 Provides: bundled(golang(google.golang.org/genproto/googleapis/type/expr)) = 0.0.0-20200610104632.gita5b850bcf112 +Provides: bundled(golang(go.opencensus.io)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/internal)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/internal/tagencoding)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/metric/metricdata)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/metric/metricproducer)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/plugin/ochttp)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/plugin/ochttp/propagation/b3)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/resource)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/stats)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/stats/internal)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/stats/view)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/tag)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/trace)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/trace/internal)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/trace/propagation)) = 0.22.5 +Provides: bundled(golang(go.opencensus.io/trace/tracestate)) = 0.22.5 %description Ignition is a utility used to manipulate systems during the initramfs. @@ -291,6 +290,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_datadir}/ignition/ignition-validate-x86_64-pc-windows-gnu.exe %changelog +* 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 diff --git a/sources b/sources index 21c6ff9..1ac0d8c 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ignition-2.10.1.tar.gz) = 039ea5ab19c0e2efa6ec2c21534e4a5b93f0fb20576d51563283ede1caa3faa29dbb461632bb01f7549d47677991d17516d94f2cefc5982d23545ace5f196f4f +SHA512 (ignition-2.11.0.tar.gz) = e84d8e9f8991f3737b7a8c5d6e47a9312eae807966a47eee4a53ef0ec8a543bbb8a71a0d2a64869eea6df943b5d3bb79c74f8571a9406d7c40b82e6a50779985 From 5da73581354eb64c35bbd786e7035a20347be63f Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 8 Jul 2021 18:09:10 -0400 Subject: [PATCH 109/172] Drop ignition-firstboot-complete and ignition-setup-user services They should be in distro glue instead. See also https://github.com/coreos/ignition/pull/1246#issuecomment-876451763. --- drop-ignition-firstboot-complete-2.11.0.patch | 67 ++++++ drop-ignition-setup-base-2.11.0.patch | 25 ++ drop-ignition-setup-user-2.11.0.patch | 218 ++++++++++++++++++ ignition.spec | 14 +- 4 files changed, 320 insertions(+), 4 deletions(-) create mode 100644 drop-ignition-firstboot-complete-2.11.0.patch create mode 100644 drop-ignition-setup-base-2.11.0.patch create mode 100644 drop-ignition-setup-user-2.11.0.patch diff --git a/drop-ignition-firstboot-complete-2.11.0.patch b/drop-ignition-firstboot-complete-2.11.0.patch new file mode 100644 index 0000000..49e68bb --- /dev/null +++ b/drop-ignition-firstboot-complete-2.11.0.patch @@ -0,0 +1,67 @@ +From fdbd1e41bb15d24936e4c14323ea988a0ecf0846 Mon Sep 17 00:00:00 2001 +From: Jonathan Lebon +Date: Tue, 6 Jul 2021 14:49:32 -0400 +Subject: [PATCH 1/3] Remove ignition-firstboot-complete.service + +This is a distro-level integration service. Let's remove it from here +and have it live e.g. in coreos/fedora-coreos-config for FCOS/RHCOS. + +Closes: #1125 +--- + Makefile | 1 - + systemd/ignition-firstboot-complete.service | 31 --------------------- + 2 files changed, 32 deletions(-) + delete mode 100644 systemd/ignition-firstboot-complete.service + +diff --git a/Makefile b/Makefile +index 6b3f49a4..af9a94ad 100644 +--- a/Makefile ++++ b/Makefile +@@ -23,7 +23,6 @@ install: all + install -m 0644 -D -t $(DESTDIR)/usr/lib/dracut/modules.d/$${bn} $$x/*; \ + done + chmod a+x $(DESTDIR)/usr/lib/dracut/modules.d/*/*.sh $(DESTDIR)/usr/lib/dracut/modules.d/*/*-generator +- install -m 0644 -D -t $(DESTDIR)/usr/lib/systemd/system systemd/* + install -m 0755 -D -t $(DESTDIR)/usr/lib/dracut/modules.d/30ignition bin/$(GOARCH)/ignition + install -m 0755 -D -t $(DESTDIR)/usr/bin bin/$(GOARCH)/ignition-validate + +diff --git a/systemd/ignition-firstboot-complete.service b/systemd/ignition-firstboot-complete.service +deleted file mode 100644 +index c506773a..00000000 +--- a/systemd/ignition-firstboot-complete.service ++++ /dev/null +@@ -1,31 +0,0 @@ +-[Unit] +-Description=Mark boot complete +-Documentation=https://github.com/coreos/ignition +-ConditionKernelCommandLine=ignition.firstboot +-ConditionPathExists=!/run/ostree-live +-RequiresMountsFor=/boot +- +-[Service] +-Type=oneshot +-RemainAfterExit=yes +-# The MountFlags=slave is so we remount /boot temporarily writable; +-# see https://github.com/ostreedev/ostree/issues/1265 for the bigger picture. +-# This option creates a new mount namespace; from the point of view of +-# everything else, /boot stays readonly. We only have a transient writable mount +-# for the lifetime of the unit. +-# +-# Also regarding the lack of `-f` for rm ; we should have only run if GRUB +-# detected this file. Fail if we are unable to remove it, rather than risking +-# rerunning Ignition at next boot. +-MountFlags=slave +-# It is better to have a separate script to do this but it might be polluting +-# the target system with some script in i.e. /usr/sbin/firstboot-complete +-# The retval code is still respected with having this if-else block. +-ExecStart=/bin/sh -c \ +- 'mount -o remount,rw /boot && \ +- if [[ $(uname -m) = s390x ]]; then zipl; fi && \ +- rm /boot/ignition.firstboot' +- +-[Install] +-# Part of basic.target so this happens early on in firstboot +-WantedBy=basic.target +-- +2.31.1 + diff --git a/drop-ignition-setup-base-2.11.0.patch b/drop-ignition-setup-base-2.11.0.patch new file mode 100644 index 0000000..462d851 --- /dev/null +++ b/drop-ignition-setup-base-2.11.0.patch @@ -0,0 +1,25 @@ +From 9f25f6a7371c8027777c76efe77904c2e2c8fd75 Mon Sep 17 00:00:00 2001 +From: Benjamin Gilbert +Date: Wed, 7 Jul 2021 18:27:31 -0400 +Subject: [PATCH 2/3] dracut: drop reference to ignition-setup-base.service + +It was removed in e2d3fa3a61b3. +--- + dracut/30ignition/ignition-fetch-offline.service | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/dracut/30ignition/ignition-fetch-offline.service b/dracut/30ignition/ignition-fetch-offline.service +index 0a18e0de..7c4b0289 100644 +--- a/dracut/30ignition/ignition-fetch-offline.service ++++ b/dracut/30ignition/ignition-fetch-offline.service +@@ -14,7 +14,6 @@ After=basic.target + # Stage order: setup -> fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. + # We run after the setup stage has run because it may copy in new/different + # ignition configs for us to consume. +-After=ignition-setup-base.service + After=ignition-setup-user.service + Before=ignition-fetch.service + +-- +2.31.1 + diff --git a/drop-ignition-setup-user-2.11.0.patch b/drop-ignition-setup-user-2.11.0.patch new file mode 100644 index 0000000..a4f3006 --- /dev/null +++ b/drop-ignition-setup-user-2.11.0.patch @@ -0,0 +1,218 @@ +From d791aaed74b861fc40104e0c96c4427d667a8f7a Mon Sep 17 00:00:00 2001 +From: Benjamin Gilbert +Date: Thu, 8 Jul 2021 15:39:11 -0400 +Subject: [PATCH 3/3] dracut: drop ignition-setup-user.service + +It assumes that we can mount /dev/disk/by-label/boot and copy a file out +of it, which may not be true on all distros. We already have a clear +external API for providing injected user configs to Ignition (put them +in /usr/lib/ignition/user.ign), so leave this to the distro to handle as +it wishes. +--- + dracut/30ignition/ignition-disks.service | 2 +- + .../30ignition/ignition-fetch-offline.service | 5 +-- + dracut/30ignition/ignition-fetch.service | 2 +- + dracut/30ignition/ignition-files.service | 2 +- + dracut/30ignition/ignition-generator | 9 ------ + dracut/30ignition/ignition-kargs.service | 2 +- + dracut/30ignition/ignition-mount.service | 2 +- + dracut/30ignition/ignition-setup-user.service | 23 ------------- + dracut/30ignition/ignition-setup-user.sh | 32 ------------------- + dracut/30ignition/module-setup.sh | 4 --- + 10 files changed, 6 insertions(+), 77 deletions(-) + delete mode 100644 dracut/30ignition/ignition-setup-user.service + delete mode 100755 dracut/30ignition/ignition-setup-user.sh + +diff --git a/dracut/30ignition/ignition-disks.service b/dracut/30ignition/ignition-disks.service +index 66fa8838..92c8d242 100644 +--- a/dracut/30ignition/ignition-disks.service ++++ b/dracut/30ignition/ignition-disks.service +@@ -5,7 +5,7 @@ ConditionPathExists=/etc/initrd-release + DefaultDependencies=false + Before=ignition-complete.target + +-# Stage order: setup -> fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. ++# Stage order: fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. + After=ignition-fetch.service + Before=ignition-mount.service + +diff --git a/dracut/30ignition/ignition-fetch-offline.service b/dracut/30ignition/ignition-fetch-offline.service +index 7c4b0289..b8ae7a7d 100644 +--- a/dracut/30ignition/ignition-fetch-offline.service ++++ b/dracut/30ignition/ignition-fetch-offline.service +@@ -11,10 +11,7 @@ DefaultDependencies=false + Before=ignition-complete.target + After=basic.target + +-# Stage order: setup -> fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. +-# We run after the setup stage has run because it may copy in new/different +-# ignition configs for us to consume. +-After=ignition-setup-user.service ++# Stage order: fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. + Before=ignition-fetch.service + + OnFailure=emergency.target +diff --git a/dracut/30ignition/ignition-fetch.service b/dracut/30ignition/ignition-fetch.service +index d629273d..d914362d 100644 +--- a/dracut/30ignition/ignition-fetch.service ++++ b/dracut/30ignition/ignition-fetch.service +@@ -9,7 +9,7 @@ ConditionPathExists=/run/ignition/neednet + # Don't run if the `fetch-offline` stage successfully fetched a config + ConditionPathExists=!/run/ignition.json + +-# Stage order: setup -> fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. ++# Stage order: fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. + # We run after the setup stage has run because it may copy in new/different + # ignition configs for us to consume. + After=ignition-fetch-offline.service +diff --git a/dracut/30ignition/ignition-files.service b/dracut/30ignition/ignition-files.service +index 90bda675..aa64fb68 100644 +--- a/dracut/30ignition/ignition-files.service ++++ b/dracut/30ignition/ignition-files.service +@@ -8,7 +8,7 @@ Before=ignition-complete.target + OnFailure=emergency.target + OnFailureJobMode=isolate + +-# Stage order: setup -> fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. ++# Stage order: fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. + After=ignition-mount.service + + # Run before initrd-parse-etc so that we can drop files it then picks up. +diff --git a/dracut/30ignition/ignition-generator b/dracut/30ignition/ignition-generator +index a444395a..1dff7442 100755 +--- a/dracut/30ignition/ignition-generator ++++ b/dracut/30ignition/ignition-generator +@@ -47,15 +47,6 @@ if $(cmdline_bool 'ignition.firstboot' 0); then + # and therefore won't have a root disk. + if ! command -v is-live-image >/dev/null || ! is-live-image; then + add_requires ignition-diskful.target ignition-complete.target +- +- # ignition-setup-user.service should depend on the boot device node +- # only on diskful boots +- mkdir -p "${UNIT_DIR}/ignition-setup-user.service.d" +- cat > "${UNIT_DIR}/ignition-setup-user.service.d/diskful.conf" < fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. ++# Stage order: fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. + After=ignition-fetch.service + Before=ignition-disks.service + +diff --git a/dracut/30ignition/ignition-mount.service b/dracut/30ignition/ignition-mount.service +index b3af2fa8..0d25afab 100644 +--- a/dracut/30ignition/ignition-mount.service ++++ b/dracut/30ignition/ignition-mount.service +@@ -5,7 +5,7 @@ ConditionPathExists=/etc/initrd-release + DefaultDependencies=false + Before=ignition-complete.target + +-# Stage order: setup -> fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. ++# Stage order: fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. + # We need to make sure the partitions and filesystems are set up before + # mounting. This is also guaranteed through After=initrd-root-fs.target but + # just to be explicit. +diff --git a/dracut/30ignition/ignition-setup-user.service b/dracut/30ignition/ignition-setup-user.service +deleted file mode 100644 +index 40c53dd1..00000000 +--- a/dracut/30ignition/ignition-setup-user.service ++++ /dev/null +@@ -1,23 +0,0 @@ +-[Unit] +-Description=Ignition (setup user config) +-Documentation=https://github.com/coreos/ignition +-ConditionPathExists=/etc/initrd-release +-DefaultDependencies=false +-Before=ignition-complete.target +- +-OnFailure=emergency.target +-OnFailureJobMode=isolate +- +-# Stage order: setup -> fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. +-Before=ignition-fetch-offline.service +- +-# On diskful boots, ignition-generator adds Requires/After on +-# dev-disk-by\x2dlabel-boot.device +- +-[Service] +-Type=oneshot +-RemainAfterExit=yes +-# The MountFlags=slave is so the umount of /boot is guaranteed to happen +-# /boot will only be mounted for the lifetime of the unit. +-MountFlags=slave +-ExecStart=/usr/sbin/ignition-setup-user +diff --git a/dracut/30ignition/ignition-setup-user.sh b/dracut/30ignition/ignition-setup-user.sh +deleted file mode 100755 +index e0f3c4e2..00000000 +--- a/dracut/30ignition/ignition-setup-user.sh ++++ /dev/null +@@ -1,32 +0,0 @@ +-#!/bin/bash +-set -euo pipefail +- +-copy_file_if_exists() { +- src="${1}"; dst="${2}" +- if [ -f "${src}" ]; then +- echo "Copying ${src} to ${dst}" +- cp "${src}" "${dst}" +- else +- echo "File ${src} does not exist.. Skipping copy" +- fi +-} +- +-destination=/usr/lib/ignition +-mkdir -p $destination +- +-if command -v is-live-image >/dev/null && is-live-image; then +- # Live image. If the user has supplied a config.ign via an appended +- # initrd, put it in the right place. +- copy_file_if_exists "/config.ign" "${destination}/user.ign" +-else +- # We will support a user embedded config in the boot partition +- # under $bootmnt/ignition/config.ign. Note that we mount /boot +- # but we don't unmount boot because we are run in a systemd unit +- # with MountFlags=slave so it is unmounted for us. +- bootmnt=/mnt/boot_partition +- mkdir -p $bootmnt +- # mount as read-only since we don't strictly need write access and we may be +- # running alongside other code that also has it mounted ro +- mount -o ro /dev/disk/by-label/boot $bootmnt +- copy_file_if_exists "${bootmnt}/ignition/config.ign" "${destination}/user.ign" +-fi +diff --git a/dracut/30ignition/module-setup.sh b/dracut/30ignition/module-setup.sh +index e51112f8..8e7e3033 100755 +--- a/dracut/30ignition/module-setup.sh ++++ b/dracut/30ignition/module-setup.sh +@@ -56,9 +56,6 @@ install() { + # Required on system using SELinux + inst_multiple -o setfiles + +- inst_script "$moddir/ignition-setup-user.sh" \ +- "/usr/sbin/ignition-setup-user" +- + inst_script "$moddir/ignition-kargs-helper.sh" \ + "/usr/sbin/ignition-kargs-helper" + +@@ -83,7 +80,6 @@ install() { + "$systemdsystemunitdir/ignition-$x.target" + done + +- install_ignition_unit ignition-setup-user.service + install_ignition_unit ignition-fetch.service + install_ignition_unit ignition-fetch-offline.service + install_ignition_unit ignition-kargs.service +-- +2.31.1 + diff --git a/ignition.spec b/ignition.spec index 5c8cbb4..10d68cc 100644 --- a/ignition.spec +++ b/ignition.spec @@ -13,13 +13,18 @@ Version: 2.11.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 1%{?dist} +Release: 2%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 License: ASL 2.0 URL: %{gourl} Source0: %{gosource} +# https://github.com/coreos/ignition/pull/1245 +Patch0: drop-ignition-firstboot-complete-2.11.0.patch +# https://github.com/coreos/ignition/pull/1248 +Patch1: drop-ignition-setup-base-2.11.0.patch +Patch2: drop-ignition-setup-user-2.11.0.patch BuildRequires: libblkid-devel @@ -250,9 +255,7 @@ GOARCH=amd64 GOOS=windows %gocrossbuild -o ./ignition-validate-x86_64-pc-windows %install # dracut modules install -d -p %{buildroot}/%{dracutlibdir}/modules.d -install -d -p %{buildroot}/%{_prefix}/lib/systemd/system cp -r dracut/* %{buildroot}/%{dracutlibdir}/modules.d/ -install -m 0644 -t %{buildroot}/%{_prefix}/lib/systemd/system/ systemd/* # ignition install -d -p %{buildroot}%{_bindir} @@ -276,7 +279,6 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %license %{golicenses} %doc %{godocs} %{dracutlibdir}/modules.d/* -%{_prefix}/lib/systemd/system/*.service %files validate %doc README.md @@ -290,6 +292,10 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_datadir}/ignition/ignition-validate-x86_64-pc-windows-gnu.exe %changelog +* 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 From b97215216d68d70bae8feb88aeb9bf668a101db3 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 08:27:26 +0000 Subject: [PATCH 110/172] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ignition.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index 10d68cc..34932dd 100644 --- a/ignition.spec +++ b/ignition.spec @@ -13,7 +13,7 @@ Version: 2.11.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 2%{?dist} +Release: 3%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -292,6 +292,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_datadir}/ignition/ignition-validate-x86_64-pc-windows-gnu.exe %changelog +* 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 From 459a9ea0e09e7280f297f32374335f081c223f9c Mon Sep 17 00:00:00 2001 From: Sohan Kunkerkar Date: Fri, 6 Aug 2021 09:50:04 -0400 Subject: [PATCH 111/172] Ignition 2.12.0 --- .gitignore | 1 + drop-ignition-firstboot-complete-2.11.0.patch | 67 ------ drop-ignition-setup-base-2.11.0.patch | 25 -- drop-ignition-setup-user-2.11.0.patch | 218 ------------------ ignition.spec | 12 +- sources | 2 +- 6 files changed, 7 insertions(+), 318 deletions(-) delete mode 100644 drop-ignition-firstboot-complete-2.11.0.patch delete mode 100644 drop-ignition-setup-base-2.11.0.patch delete mode 100644 drop-ignition-setup-user-2.11.0.patch diff --git a/.gitignore b/.gitignore index 42f06a3..8272bd3 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,4 @@ /ignition-2.9.0.tar.gz /ignition-2.10.1.tar.gz /ignition-2.11.0.tar.gz +/ignition-2.12.0.tar.gz diff --git a/drop-ignition-firstboot-complete-2.11.0.patch b/drop-ignition-firstboot-complete-2.11.0.patch deleted file mode 100644 index 49e68bb..0000000 --- a/drop-ignition-firstboot-complete-2.11.0.patch +++ /dev/null @@ -1,67 +0,0 @@ -From fdbd1e41bb15d24936e4c14323ea988a0ecf0846 Mon Sep 17 00:00:00 2001 -From: Jonathan Lebon -Date: Tue, 6 Jul 2021 14:49:32 -0400 -Subject: [PATCH 1/3] Remove ignition-firstboot-complete.service - -This is a distro-level integration service. Let's remove it from here -and have it live e.g. in coreos/fedora-coreos-config for FCOS/RHCOS. - -Closes: #1125 ---- - Makefile | 1 - - systemd/ignition-firstboot-complete.service | 31 --------------------- - 2 files changed, 32 deletions(-) - delete mode 100644 systemd/ignition-firstboot-complete.service - -diff --git a/Makefile b/Makefile -index 6b3f49a4..af9a94ad 100644 ---- a/Makefile -+++ b/Makefile -@@ -23,7 +23,6 @@ install: all - install -m 0644 -D -t $(DESTDIR)/usr/lib/dracut/modules.d/$${bn} $$x/*; \ - done - chmod a+x $(DESTDIR)/usr/lib/dracut/modules.d/*/*.sh $(DESTDIR)/usr/lib/dracut/modules.d/*/*-generator -- install -m 0644 -D -t $(DESTDIR)/usr/lib/systemd/system systemd/* - install -m 0755 -D -t $(DESTDIR)/usr/lib/dracut/modules.d/30ignition bin/$(GOARCH)/ignition - install -m 0755 -D -t $(DESTDIR)/usr/bin bin/$(GOARCH)/ignition-validate - -diff --git a/systemd/ignition-firstboot-complete.service b/systemd/ignition-firstboot-complete.service -deleted file mode 100644 -index c506773a..00000000 ---- a/systemd/ignition-firstboot-complete.service -+++ /dev/null -@@ -1,31 +0,0 @@ --[Unit] --Description=Mark boot complete --Documentation=https://github.com/coreos/ignition --ConditionKernelCommandLine=ignition.firstboot --ConditionPathExists=!/run/ostree-live --RequiresMountsFor=/boot -- --[Service] --Type=oneshot --RemainAfterExit=yes --# The MountFlags=slave is so we remount /boot temporarily writable; --# see https://github.com/ostreedev/ostree/issues/1265 for the bigger picture. --# This option creates a new mount namespace; from the point of view of --# everything else, /boot stays readonly. We only have a transient writable mount --# for the lifetime of the unit. --# --# Also regarding the lack of `-f` for rm ; we should have only run if GRUB --# detected this file. Fail if we are unable to remove it, rather than risking --# rerunning Ignition at next boot. --MountFlags=slave --# It is better to have a separate script to do this but it might be polluting --# the target system with some script in i.e. /usr/sbin/firstboot-complete --# The retval code is still respected with having this if-else block. --ExecStart=/bin/sh -c \ -- 'mount -o remount,rw /boot && \ -- if [[ $(uname -m) = s390x ]]; then zipl; fi && \ -- rm /boot/ignition.firstboot' -- --[Install] --# Part of basic.target so this happens early on in firstboot --WantedBy=basic.target --- -2.31.1 - diff --git a/drop-ignition-setup-base-2.11.0.patch b/drop-ignition-setup-base-2.11.0.patch deleted file mode 100644 index 462d851..0000000 --- a/drop-ignition-setup-base-2.11.0.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 9f25f6a7371c8027777c76efe77904c2e2c8fd75 Mon Sep 17 00:00:00 2001 -From: Benjamin Gilbert -Date: Wed, 7 Jul 2021 18:27:31 -0400 -Subject: [PATCH 2/3] dracut: drop reference to ignition-setup-base.service - -It was removed in e2d3fa3a61b3. ---- - dracut/30ignition/ignition-fetch-offline.service | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/dracut/30ignition/ignition-fetch-offline.service b/dracut/30ignition/ignition-fetch-offline.service -index 0a18e0de..7c4b0289 100644 ---- a/dracut/30ignition/ignition-fetch-offline.service -+++ b/dracut/30ignition/ignition-fetch-offline.service -@@ -14,7 +14,6 @@ After=basic.target - # Stage order: setup -> fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. - # We run after the setup stage has run because it may copy in new/different - # ignition configs for us to consume. --After=ignition-setup-base.service - After=ignition-setup-user.service - Before=ignition-fetch.service - --- -2.31.1 - diff --git a/drop-ignition-setup-user-2.11.0.patch b/drop-ignition-setup-user-2.11.0.patch deleted file mode 100644 index a4f3006..0000000 --- a/drop-ignition-setup-user-2.11.0.patch +++ /dev/null @@ -1,218 +0,0 @@ -From d791aaed74b861fc40104e0c96c4427d667a8f7a Mon Sep 17 00:00:00 2001 -From: Benjamin Gilbert -Date: Thu, 8 Jul 2021 15:39:11 -0400 -Subject: [PATCH 3/3] dracut: drop ignition-setup-user.service - -It assumes that we can mount /dev/disk/by-label/boot and copy a file out -of it, which may not be true on all distros. We already have a clear -external API for providing injected user configs to Ignition (put them -in /usr/lib/ignition/user.ign), so leave this to the distro to handle as -it wishes. ---- - dracut/30ignition/ignition-disks.service | 2 +- - .../30ignition/ignition-fetch-offline.service | 5 +-- - dracut/30ignition/ignition-fetch.service | 2 +- - dracut/30ignition/ignition-files.service | 2 +- - dracut/30ignition/ignition-generator | 9 ------ - dracut/30ignition/ignition-kargs.service | 2 +- - dracut/30ignition/ignition-mount.service | 2 +- - dracut/30ignition/ignition-setup-user.service | 23 ------------- - dracut/30ignition/ignition-setup-user.sh | 32 ------------------- - dracut/30ignition/module-setup.sh | 4 --- - 10 files changed, 6 insertions(+), 77 deletions(-) - delete mode 100644 dracut/30ignition/ignition-setup-user.service - delete mode 100755 dracut/30ignition/ignition-setup-user.sh - -diff --git a/dracut/30ignition/ignition-disks.service b/dracut/30ignition/ignition-disks.service -index 66fa8838..92c8d242 100644 ---- a/dracut/30ignition/ignition-disks.service -+++ b/dracut/30ignition/ignition-disks.service -@@ -5,7 +5,7 @@ ConditionPathExists=/etc/initrd-release - DefaultDependencies=false - Before=ignition-complete.target - --# Stage order: setup -> fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. -+# Stage order: fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. - After=ignition-fetch.service - Before=ignition-mount.service - -diff --git a/dracut/30ignition/ignition-fetch-offline.service b/dracut/30ignition/ignition-fetch-offline.service -index 7c4b0289..b8ae7a7d 100644 ---- a/dracut/30ignition/ignition-fetch-offline.service -+++ b/dracut/30ignition/ignition-fetch-offline.service -@@ -11,10 +11,7 @@ DefaultDependencies=false - Before=ignition-complete.target - After=basic.target - --# Stage order: setup -> fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. --# We run after the setup stage has run because it may copy in new/different --# ignition configs for us to consume. --After=ignition-setup-user.service -+# Stage order: fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. - Before=ignition-fetch.service - - OnFailure=emergency.target -diff --git a/dracut/30ignition/ignition-fetch.service b/dracut/30ignition/ignition-fetch.service -index d629273d..d914362d 100644 ---- a/dracut/30ignition/ignition-fetch.service -+++ b/dracut/30ignition/ignition-fetch.service -@@ -9,7 +9,7 @@ ConditionPathExists=/run/ignition/neednet - # Don't run if the `fetch-offline` stage successfully fetched a config - ConditionPathExists=!/run/ignition.json - --# Stage order: setup -> fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. -+# Stage order: fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. - # We run after the setup stage has run because it may copy in new/different - # ignition configs for us to consume. - After=ignition-fetch-offline.service -diff --git a/dracut/30ignition/ignition-files.service b/dracut/30ignition/ignition-files.service -index 90bda675..aa64fb68 100644 ---- a/dracut/30ignition/ignition-files.service -+++ b/dracut/30ignition/ignition-files.service -@@ -8,7 +8,7 @@ Before=ignition-complete.target - OnFailure=emergency.target - OnFailureJobMode=isolate - --# Stage order: setup -> fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. -+# Stage order: fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. - After=ignition-mount.service - - # Run before initrd-parse-etc so that we can drop files it then picks up. -diff --git a/dracut/30ignition/ignition-generator b/dracut/30ignition/ignition-generator -index a444395a..1dff7442 100755 ---- a/dracut/30ignition/ignition-generator -+++ b/dracut/30ignition/ignition-generator -@@ -47,15 +47,6 @@ if $(cmdline_bool 'ignition.firstboot' 0); then - # and therefore won't have a root disk. - if ! command -v is-live-image >/dev/null || ! is-live-image; then - add_requires ignition-diskful.target ignition-complete.target -- -- # ignition-setup-user.service should depend on the boot device node -- # only on diskful boots -- mkdir -p "${UNIT_DIR}/ignition-setup-user.service.d" -- cat > "${UNIT_DIR}/ignition-setup-user.service.d/diskful.conf" < fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. -+# Stage order: fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. - After=ignition-fetch.service - Before=ignition-disks.service - -diff --git a/dracut/30ignition/ignition-mount.service b/dracut/30ignition/ignition-mount.service -index b3af2fa8..0d25afab 100644 ---- a/dracut/30ignition/ignition-mount.service -+++ b/dracut/30ignition/ignition-mount.service -@@ -5,7 +5,7 @@ ConditionPathExists=/etc/initrd-release - DefaultDependencies=false - Before=ignition-complete.target - --# Stage order: setup -> fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. -+# Stage order: fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. - # We need to make sure the partitions and filesystems are set up before - # mounting. This is also guaranteed through After=initrd-root-fs.target but - # just to be explicit. -diff --git a/dracut/30ignition/ignition-setup-user.service b/dracut/30ignition/ignition-setup-user.service -deleted file mode 100644 -index 40c53dd1..00000000 ---- a/dracut/30ignition/ignition-setup-user.service -+++ /dev/null -@@ -1,23 +0,0 @@ --[Unit] --Description=Ignition (setup user config) --Documentation=https://github.com/coreos/ignition --ConditionPathExists=/etc/initrd-release --DefaultDependencies=false --Before=ignition-complete.target -- --OnFailure=emergency.target --OnFailureJobMode=isolate -- --# Stage order: setup -> fetch-offline [-> fetch] [-> kargs] -> disks -> mount -> files. --Before=ignition-fetch-offline.service -- --# On diskful boots, ignition-generator adds Requires/After on --# dev-disk-by\x2dlabel-boot.device -- --[Service] --Type=oneshot --RemainAfterExit=yes --# The MountFlags=slave is so the umount of /boot is guaranteed to happen --# /boot will only be mounted for the lifetime of the unit. --MountFlags=slave --ExecStart=/usr/sbin/ignition-setup-user -diff --git a/dracut/30ignition/ignition-setup-user.sh b/dracut/30ignition/ignition-setup-user.sh -deleted file mode 100755 -index e0f3c4e2..00000000 ---- a/dracut/30ignition/ignition-setup-user.sh -+++ /dev/null -@@ -1,32 +0,0 @@ --#!/bin/bash --set -euo pipefail -- --copy_file_if_exists() { -- src="${1}"; dst="${2}" -- if [ -f "${src}" ]; then -- echo "Copying ${src} to ${dst}" -- cp "${src}" "${dst}" -- else -- echo "File ${src} does not exist.. Skipping copy" -- fi --} -- --destination=/usr/lib/ignition --mkdir -p $destination -- --if command -v is-live-image >/dev/null && is-live-image; then -- # Live image. If the user has supplied a config.ign via an appended -- # initrd, put it in the right place. -- copy_file_if_exists "/config.ign" "${destination}/user.ign" --else -- # We will support a user embedded config in the boot partition -- # under $bootmnt/ignition/config.ign. Note that we mount /boot -- # but we don't unmount boot because we are run in a systemd unit -- # with MountFlags=slave so it is unmounted for us. -- bootmnt=/mnt/boot_partition -- mkdir -p $bootmnt -- # mount as read-only since we don't strictly need write access and we may be -- # running alongside other code that also has it mounted ro -- mount -o ro /dev/disk/by-label/boot $bootmnt -- copy_file_if_exists "${bootmnt}/ignition/config.ign" "${destination}/user.ign" --fi -diff --git a/dracut/30ignition/module-setup.sh b/dracut/30ignition/module-setup.sh -index e51112f8..8e7e3033 100755 ---- a/dracut/30ignition/module-setup.sh -+++ b/dracut/30ignition/module-setup.sh -@@ -56,9 +56,6 @@ install() { - # Required on system using SELinux - inst_multiple -o setfiles - -- inst_script "$moddir/ignition-setup-user.sh" \ -- "/usr/sbin/ignition-setup-user" -- - inst_script "$moddir/ignition-kargs-helper.sh" \ - "/usr/sbin/ignition-kargs-helper" - -@@ -83,7 +80,6 @@ install() { - "$systemdsystemunitdir/ignition-$x.target" - done - -- install_ignition_unit ignition-setup-user.service - install_ignition_unit ignition-fetch.service - install_ignition_unit ignition-fetch-offline.service - install_ignition_unit ignition-kargs.service --- -2.31.1 - diff --git a/ignition.spec b/ignition.spec index 34932dd..be55bf2 100644 --- a/ignition.spec +++ b/ignition.spec @@ -4,7 +4,7 @@ # https://github.com/coreos/ignition %global goipath github.com/coreos/ignition %global gomodulesmode GO111MODULE=on -Version: 2.11.0 +Version: 2.12.0 %gometa @@ -13,18 +13,13 @@ Version: 2.11.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 3%{?dist} +Release: 1%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 License: ASL 2.0 URL: %{gourl} Source0: %{gosource} -# https://github.com/coreos/ignition/pull/1245 -Patch0: drop-ignition-firstboot-complete-2.11.0.patch -# https://github.com/coreos/ignition/pull/1248 -Patch1: drop-ignition-setup-base-2.11.0.patch -Patch2: drop-ignition-setup-user-2.11.0.patch BuildRequires: libblkid-devel @@ -292,6 +287,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_datadir}/ignition/ignition-validate-x86_64-pc-windows-gnu.exe %changelog +* 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 diff --git a/sources b/sources index 1ac0d8c..d8e596a 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ignition-2.11.0.tar.gz) = e84d8e9f8991f3737b7a8c5d6e47a9312eae807966a47eee4a53ef0ec8a543bbb8a71a0d2a64869eea6df943b5d3bb79c74f8571a9406d7c40b82e6a50779985 +SHA512 (ignition-2.12.0.tar.gz) = 7bbccd680f52df25cdbdd56ae89a2c4f6e628cc0db21e0c3405fd6d4af640546707b1cb7a9ba0cc4db65bed1ecb3c18afea69001a6be42aabbaba43794e29a6f From 20eb55a99eae3c16c7c19a55086e1496e5e78c37 Mon Sep 17 00:00:00 2001 From: Sohan Kunkerkar Date: Thu, 26 Aug 2021 12:02:04 -0400 Subject: [PATCH 112/172] Disable file fragment writing logic for SSH authorized_keys on RHEL/CentOS BZ: https://bugzilla.redhat.com/show_bug.cgi?id=1985481 --- ignition.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index be55bf2..2c05f51 100644 --- a/ignition.spec +++ b/ignition.spec @@ -13,7 +13,7 @@ Version: 2.12.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 1%{?dist} +Release: 2%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -231,6 +231,9 @@ Ignition project's Github releases page. %build export LDFLAGS="-X github.com/coreos/ignition/v2/internal/version.Raw=%{version} -X github.com/coreos/ignition/v2/internal/distro.selinuxRelabel=true " +%if 0%{?rhel} || 0%{?centos} +LDFLAGS+=' -X github.com/coreos/ignition/v2/internal/distro.writeAuthorizedKeysFragment=false ' +%endif export GOFLAGS="-mod=vendor" echo "Building ignition..." @@ -287,6 +290,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_datadir}/ignition/ignition-validate-x86_64-pc-windows-gnu.exe %changelog +* Thu Aug 26 2021 Sohan Kunkerkar - 2.12.0-2 +- Disable file fragment writing logic for SSH authorized_keys on RHEL/CentOS + * Fri Aug 6 2021 Sohan Kunkerkar - 2.12.0-1 - New release From 6f840d29b8ba903d62edd38b924edaf9918ff702 Mon Sep 17 00:00:00 2001 From: Sohan Kunkerkar Date: Thu, 26 Aug 2021 10:31:55 -0400 Subject: [PATCH 113/172] Disable compressdwarf flag to avoid build failures on RHEL/CentOS --- ignition.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index 2c05f51..84befc5 100644 --- a/ignition.spec +++ b/ignition.spec @@ -232,7 +232,8 @@ Ignition project's Github releases page. %build export LDFLAGS="-X github.com/coreos/ignition/v2/internal/version.Raw=%{version} -X github.com/coreos/ignition/v2/internal/distro.selinuxRelabel=true " %if 0%{?rhel} || 0%{?centos} -LDFLAGS+=' -X github.com/coreos/ignition/v2/internal/distro.writeAuthorizedKeysFragment=false ' +# Need uncompressed debug symbols for debuginfo extraction +LDFLAGS+=' -X github.com/coreos/ignition/v2/internal/distro.writeAuthorizedKeysFragment=false -compressdwarf=false ' %endif export GOFLAGS="-mod=vendor" @@ -292,6 +293,7 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %changelog * 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 * Fri Aug 6 2021 Sohan Kunkerkar - 2.12.0-1 - New release From 28bc9afe3093ba8a12dc230e9d351df329353bd4 Mon Sep 17 00:00:00 2001 From: Sohan Kunkerkar Date: Mon, 13 Sep 2021 16:05:08 -0400 Subject: [PATCH 114/172] Disable cross-building of Ignition-validate on RHEL/CentOS --- ignition.spec | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ignition.spec b/ignition.spec index 84befc5..45675d5 100644 --- a/ignition.spec +++ b/ignition.spec @@ -211,6 +211,7 @@ This package contains a tool for validating Ignition configurations. ############## validate-nonlinux subpackage ############## +%if 0%{?fedora} %package validate-nonlinux Summary: Validation tool for Ignition configs for macOS and Windows @@ -224,6 +225,7 @@ This package contains macOS and Windows ignition-validate binaries built through cross-compilation. Do not install it. It is only used for building binaries to sign by Fedora release engineering and include on the Ignition project's Github releases page. +%endif %prep %goprep -k @@ -245,11 +247,13 @@ echo "Building ignition-validate..." %global gocrossbuild go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x +%if 0%{?fedora} echo "Building macOS ignition-validate..." GOARCH=amd64 GOOS=darwin %gocrossbuild -o ./ignition-validate-x86_64-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 %install # dracut modules @@ -261,8 +265,10 @@ install -d -p %{buildroot}%{_bindir} install -p -m 0755 ./ignition-validate %{buildroot}%{_bindir} install -d -p %{buildroot}%{_datadir}/ignition +%if 0%{?fedora} install -p -m 0644 ./ignition-validate-x86_64-apple-darwin %{buildroot}%{_datadir}/ignition install -p -m 0644 ./ignition-validate-x86_64-pc-windows-gnu.exe %{buildroot}%{_datadir}/ignition +%endif # The ignition binary is only for dracut, and is dangerous to run from # the command line. Install directly into the dracut module dir. @@ -284,16 +290,19 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %license %{golicenses} %{_bindir}/ignition-validate +%if 0%{?fedora} %files validate-nonlinux %license %{golicenses} %dir %{_datadir}/ignition %{_datadir}/ignition/ignition-validate-x86_64-apple-darwin %{_datadir}/ignition/ignition-validate-x86_64-pc-windows-gnu.exe +%endif %changelog * 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 * Fri Aug 6 2021 Sohan Kunkerkar - 2.12.0-1 - New release From 34ba0358029c19113694f4c0e6cafa35b4d395ba Mon Sep 17 00:00:00 2001 From: Sohan Kunkerkar Date: Fri, 27 Aug 2021 09:41:53 -0400 Subject: [PATCH 115/172] Conditionalize Fedora-specific configuration --- ignition.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index 45675d5..0f2b8ac 100644 --- a/ignition.spec +++ b/ignition.spec @@ -1,5 +1,11 @@ # Generated by go2rpm 1.3 +%if 0%{?fedora} %bcond_without check +%else +# %gocheck isn't currently provided on CentOS/RHEL +# https://bugzilla.redhat.com/show_bug.cgi?id=1982298 +%bcond_with check +%endif # https://github.com/coreos/ignition %global goipath github.com/coreos/ignition @@ -228,7 +234,11 @@ Ignition project's Github releases page. %endif %prep +%if 0%{?fedora} %goprep -k +%else +%forgeautosetup -p1 +%endif %autopatch -p1 %build @@ -264,8 +274,8 @@ cp -r dracut/* %{buildroot}/%{dracutlibdir}/modules.d/ install -d -p %{buildroot}%{_bindir} install -p -m 0755 ./ignition-validate %{buildroot}%{_bindir} -install -d -p %{buildroot}%{_datadir}/ignition %if 0%{?fedora} +install -d -p %{buildroot}%{_datadir}/ignition install -p -m 0644 ./ignition-validate-x86_64-apple-darwin %{buildroot}%{_datadir}/ignition install -p -m 0644 ./ignition-validate-x86_64-pc-windows-gnu.exe %{buildroot}%{_datadir}/ignition %endif @@ -303,6 +313,7 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition - 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 From a09afd03e2975221415f467016dec253fbd59370 Mon Sep 17 00:00:00 2001 From: Sohan Kunkerkar Date: Wed, 13 Oct 2021 14:09:42 -0400 Subject: [PATCH 116/172] Move Ignition report to /etc Required to address https://github.com/coreos/fedora-coreos-tracker/issues/977 --- ...ange-the-location-of-Ignition-report.patch | 51 +++++++++++++++++++ ignition.spec | 6 ++- 2 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 0001-internal-change-the-location-of-Ignition-report.patch diff --git a/0001-internal-change-the-location-of-Ignition-report.patch b/0001-internal-change-the-location-of-Ignition-report.patch new file mode 100644 index 0000000..c6e4f07 --- /dev/null +++ b/0001-internal-change-the-location-of-Ignition-report.patch @@ -0,0 +1,51 @@ +From 556bc9404cfff08ea63c2a865bd3586ece7e8e44 Mon Sep 17 00:00:00 2001 +From: Sohan Kunkerkar +Date: Wed, 6 Oct 2021 12:08:54 -0400 +Subject: [PATCH] internal/*: change the location of Ignition report + +Fixes https://github.com/coreos/fedora-coreos-tracker/issues/977 + +This change helps to address the problem of displaying a warning +about running Ignition twice while reprovisioning a bare metal +CoreOS instance with a persistent /var partition. +--- + internal/distro/distro.go | 2 +- + internal/exec/stages/files/filesystemEntries.go | 9 --------- + 2 files changed, 1 insertion(+), 10 deletions(-) + +diff --git a/internal/distro/distro.go b/internal/distro/distro.go +index 6438d338..aa51a608 100644 +--- a/internal/distro/distro.go ++++ b/internal/distro/distro.go +@@ -76,7 +76,7 @@ var ( + + // Special file paths in the real root + luksRealRootKeyFilePath = "/etc/luks/" +- resultFilePath = "/var/lib/ignition/result.json" ++ resultFilePath = "/etc/.ignition-result.json" + ) + + func DiskByLabelDir() string { return diskByLabelDir } +diff --git a/internal/exec/stages/files/filesystemEntries.go b/internal/exec/stages/files/filesystemEntries.go +index 79d628a1..dba163c7 100644 +--- a/internal/exec/stages/files/filesystemEntries.go ++++ b/internal/exec/stages/files/filesystemEntries.go +@@ -199,15 +199,6 @@ func (s *stage) createResultFile() error { + } + contentsUri := dataurl.EncodeBytes(data) + entries := []filesystemEntry{ +- // create containing directory with restrictive permissions +- dirEntry{ +- types.Node{ +- Path: filepath.Dir(path), +- }, +- types.DirectoryEmbedded1{ +- Mode: cutil.IntToPtr(0700), +- }, +- }, + fileEntry{ + types.Node{ + Path: path, +-- +2.31.1 + diff --git a/ignition.spec b/ignition.spec index 0f2b8ac..efb50ba 100644 --- a/ignition.spec +++ b/ignition.spec @@ -19,13 +19,14 @@ Version: 2.12.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 2%{?dist} +Release: 3%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 License: ASL 2.0 URL: %{gourl} Source0: %{gosource} +Patch0: 0001-internal-change-the-location-of-Ignition-report.patch BuildRequires: libblkid-devel @@ -309,6 +310,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %endif %changelog +* Wed Oct 13 2021 Sohan Kunkerkar - 2.12.0-3 +- Move Ignition report to /etc + * 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 From 1ba00f299b0d324d7de5dac7a2ecef352f823987 Mon Sep 17 00:00:00 2001 From: Sohan Kunkerkar Date: Tue, 30 Nov 2021 15:04:39 -0500 Subject: [PATCH 117/172] 2.13.0 --- .gitignore | 1 + ...ange-the-location-of-Ignition-report.patch | 51 ------------------- ignition.spec | 20 ++++---- sources | 2 +- 4 files changed, 13 insertions(+), 61 deletions(-) delete mode 100644 0001-internal-change-the-location-of-Ignition-report.patch diff --git a/.gitignore b/.gitignore index 8272bd3..a4cd92e 100644 --- a/.gitignore +++ b/.gitignore @@ -56,3 +56,4 @@ /ignition-2.10.1.tar.gz /ignition-2.11.0.tar.gz /ignition-2.12.0.tar.gz +/ignition-2.13.0.tar.gz diff --git a/0001-internal-change-the-location-of-Ignition-report.patch b/0001-internal-change-the-location-of-Ignition-report.patch deleted file mode 100644 index c6e4f07..0000000 --- a/0001-internal-change-the-location-of-Ignition-report.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 556bc9404cfff08ea63c2a865bd3586ece7e8e44 Mon Sep 17 00:00:00 2001 -From: Sohan Kunkerkar -Date: Wed, 6 Oct 2021 12:08:54 -0400 -Subject: [PATCH] internal/*: change the location of Ignition report - -Fixes https://github.com/coreos/fedora-coreos-tracker/issues/977 - -This change helps to address the problem of displaying a warning -about running Ignition twice while reprovisioning a bare metal -CoreOS instance with a persistent /var partition. ---- - internal/distro/distro.go | 2 +- - internal/exec/stages/files/filesystemEntries.go | 9 --------- - 2 files changed, 1 insertion(+), 10 deletions(-) - -diff --git a/internal/distro/distro.go b/internal/distro/distro.go -index 6438d338..aa51a608 100644 ---- a/internal/distro/distro.go -+++ b/internal/distro/distro.go -@@ -76,7 +76,7 @@ var ( - - // Special file paths in the real root - luksRealRootKeyFilePath = "/etc/luks/" -- resultFilePath = "/var/lib/ignition/result.json" -+ resultFilePath = "/etc/.ignition-result.json" - ) - - func DiskByLabelDir() string { return diskByLabelDir } -diff --git a/internal/exec/stages/files/filesystemEntries.go b/internal/exec/stages/files/filesystemEntries.go -index 79d628a1..dba163c7 100644 ---- a/internal/exec/stages/files/filesystemEntries.go -+++ b/internal/exec/stages/files/filesystemEntries.go -@@ -199,15 +199,6 @@ func (s *stage) createResultFile() error { - } - contentsUri := dataurl.EncodeBytes(data) - entries := []filesystemEntry{ -- // create containing directory with restrictive permissions -- dirEntry{ -- types.Node{ -- Path: filepath.Dir(path), -- }, -- types.DirectoryEmbedded1{ -- Mode: cutil.IntToPtr(0700), -- }, -- }, - fileEntry{ - types.Node{ - Path: path, --- -2.31.1 - diff --git a/ignition.spec b/ignition.spec index efb50ba..aa9e3b7 100644 --- a/ignition.spec +++ b/ignition.spec @@ -10,7 +10,7 @@ # https://github.com/coreos/ignition %global goipath github.com/coreos/ignition %global gomodulesmode GO111MODULE=on -Version: 2.12.0 +Version: 2.13.0 %gometa @@ -19,14 +19,13 @@ Version: 2.12.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 3%{?dist} +Release: 1%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 License: ASL 2.0 URL: %{gourl} Source0: %{gosource} -Patch0: 0001-internal-change-the-location-of-Ignition-report.patch BuildRequires: libblkid-devel @@ -98,17 +97,17 @@ Provides: bundled(golang(github.com/coreos/go-semver/semver)) = 0.3.0 Provides: bundled(golang(github.com/coreos/go-systemd/v22/dbus)) = 22.0.0 Provides: bundled(golang(github.com/coreos/go-systemd/v22/journal)) = 22.0.0 Provides: bundled(golang(github.com/coreos/go-systemd/v22/unit)) = 22.0.0 -Provides: bundled(golang(github.com/coreos/vcontext/json)) = 0.0.0-20210407161507.git4ee6c745c8bd -Provides: bundled(golang(github.com/coreos/vcontext/path)) = 0.0.0-20210407161507.git4ee6c745c8bd -Provides: bundled(golang(github.com/coreos/vcontext/report)) = 0.0.0-20210407161507.git4ee6c745c8bd -Provides: bundled(golang(github.com/coreos/vcontext/tree)) = 0.0.0-20210407161507.git4ee6c745c8bd -Provides: bundled(golang(github.com/coreos/vcontext/validate)) = 0.0.0-20210407161507.git4ee6c745c8bd +Provides: bundled(golang(github.com/coreos/vcontext/json)) = 0.0.0-20211021162308.gitf1dbbca7bef4 +Provides: bundled(golang(github.com/coreos/vcontext/path)) = 0.0.0-20211021162308.gitf1dbbca7bef4 +Provides: bundled(golang(github.com/coreos/vcontext/report)) = 0.0.0-20211021162308.gitf1dbbca7bef4 +Provides: bundled(golang(github.com/coreos/vcontext/tree)) = 0.0.0-20211021162308.gitf1dbbca7bef4 +Provides: bundled(golang(github.com/coreos/vcontext/validate)) = 0.0.0-20211021162308.gitf1dbbca7bef4 Provides: bundled(golang(github.com/google/renameio)) = 0.1.0 Provides: bundled(golang(github.com/google/uuid)) = 1.1.1 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/stretchr/testify/assert)) = 1.5.1 -Provides: bundled(golang(github.com/vincent-petithory/dataurl)) = 0.0.0-20160330182126.git9a301d65acbb +Provides: bundled(golang(github.com/vincent-petithory/dataurl)) = 1.0.0 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/bdoor)) = 0.0.0-20170707015358.git25eff159a728 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/message)) = 0.0.0-20170707015358.git25eff159a728 Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcout)) = 0.0.0-20170707015358.git25eff159a728 @@ -310,6 +309,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %endif %changelog +* Tue Nov 30 2021 Sohan Kunkerkar - 2.13.0-1 +- New release + * Wed Oct 13 2021 Sohan Kunkerkar - 2.12.0-3 - Move Ignition report to /etc diff --git a/sources b/sources index d8e596a..5799214 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ignition-2.12.0.tar.gz) = 7bbccd680f52df25cdbdd56ae89a2c4f6e628cc0db21e0c3405fd6d4af640546707b1cb7a9ba0cc4db65bed1ecb3c18afea69001a6be42aabbaba43794e29a6f +SHA512 (ignition-2.13.0.tar.gz) = 8e5a2e2feac002e829f2d5de54596752efef3a42ad393e55a15c0cc50b7ea4c438380cbb82c9ed386721cccea4a579e32960c463a7ec4fc27ac8aa532cf425ca From 1821283d27e8e563f116d8f2d47f62e9ec252fa6 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 13:11:06 +0000 Subject: [PATCH 118/172] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ignition.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index aa9e3b7..f43f532 100644 --- a/ignition.spec +++ b/ignition.spec @@ -19,7 +19,7 @@ Version: 2.13.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 1%{?dist} +Release: 2%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -309,6 +309,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %endif %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 2.13.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Nov 30 2021 Sohan Kunkerkar - 2.13.0-1 - New release From 5b204a35e8ed22de30749df20ad957f9c6c863ee Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 20 Jan 2022 16:34:08 -0500 Subject: [PATCH 119/172] Fix LUKS volume reuse --- ignition.spec | 7 +++++- luks-volume-reuse.patch | 56 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 luks-volume-reuse.patch diff --git a/ignition.spec b/ignition.spec index f43f532..0be3ee3 100644 --- a/ignition.spec +++ b/ignition.spec @@ -19,13 +19,15 @@ Version: 2.13.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 2%{?dist} +Release: 3%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 License: ASL 2.0 URL: %{gourl} Source0: %{gosource} +# https://github.com/coreos/ignition/pull/1307 +Patch0: luks-volume-reuse.patch BuildRequires: libblkid-devel @@ -309,6 +311,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %endif %changelog +* Thu Jan 20 2022 Benjamin Gilbert - 2.13.0-3 +- Fix LUKS volume reuse + * Thu Jan 20 2022 Fedora Release Engineering - 2.13.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/luks-volume-reuse.patch b/luks-volume-reuse.patch new file mode 100644 index 0000000..b27f481 --- /dev/null +++ b/luks-volume-reuse.patch @@ -0,0 +1,56 @@ +From aed47c18aee593d155d45c0fe9ba29a9e3123cf6 Mon Sep 17 00:00:00 2001 +From: Benjamin Gilbert +Date: Mon, 17 Jan 2022 21:17:08 -0500 +Subject: [PATCH] disks: fix reuse of statically keyed LUKS volume + +We need to persist a volume's keyfile to the real root even if we take +the early `continue` when reusing the volume. Rather than copying code, +enable persistence up front and then disable it afterward if we decide +not to persist the key. + +Fixes error: + + CRITICAL : Ignition failed: creating crypttab entries: missing persisted keyfile for [...] + +Fixes: https://github.com/coreos/ignition/issues/1305 +Fixes: 65e9c1611128 ("stages/disks: use State to persist keyfiles for files stage") +--- + internal/exec/stages/disks/luks.go | 15 ++++++++------- + 1 file changed, 8 insertions(+), 7 deletions(-) + +diff --git a/internal/exec/stages/disks/luks.go b/internal/exec/stages/disks/luks.go +index 77ecc24e..5fa15e70 100644 +--- a/internal/exec/stages/disks/luks.go ++++ b/internal/exec/stages/disks/luks.go +@@ -156,6 +156,13 @@ func (s *stage) createLuks(config types.Config) error { + } + } + } ++ // store the key to be persisted into the real root ++ // do this here so device reuse works correctly ++ key, err := ioutil.ReadFile(keyFilePath) ++ if err != nil { ++ return fmt.Errorf("failed to read keyfile %q: %w", keyFilePath, err) ++ } ++ s.State.LuksPersistKeyFiles[luks.Name] = dataurl.EncodeBytes(key) + + if !util.IsTrue(luks.WipeVolume) { + // If the volume isn't forcefully being created, then we need +@@ -329,13 +336,7 @@ func (s *stage) createLuks(config types.Config) error { + ); err != nil { + return fmt.Errorf("removing key file from luks device: %v", err) + } +- } else { +- // store the key to be persisted into the real root +- key, err := ioutil.ReadFile(keyFilePath) +- if err != nil { +- return fmt.Errorf("failed to read keyfile %q: %w", keyFilePath, err) +- } +- s.State.LuksPersistKeyFiles[luks.Name] = dataurl.EncodeBytes(key) ++ delete(s.State.LuksPersistKeyFiles, luks.Name) + } + } + +-- +2.33.1 + From 7332568141b8373e81193d6e032ac1a8de7a1a94 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 20 Jan 2022 18:29:35 -0500 Subject: [PATCH 120/172] Avoid double patch application on non-Fedora --- ignition.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index 0be3ee3..de88938 100644 --- a/ignition.spec +++ b/ignition.spec @@ -238,10 +238,10 @@ Ignition project's Github releases page. %prep %if 0%{?fedora} %goprep -k +%autopatch -p1 %else %forgeautosetup -p1 %endif -%autopatch -p1 %build export LDFLAGS="-X github.com/coreos/ignition/v2/internal/version.Raw=%{version} -X github.com/coreos/ignition/v2/internal/distro.selinuxRelabel=true " @@ -313,6 +313,7 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %changelog * Thu Jan 20 2022 Benjamin Gilbert - 2.13.0-3 - Fix LUKS volume reuse +- Avoid double patch application on non-Fedora * Thu Jan 20 2022 Fedora Release Engineering - 2.13.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From de340079e83452f4abdf13c622edc9a0dbf601d4 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 28 Jan 2022 04:52:28 -0500 Subject: [PATCH 121/172] Rename -validate-nonlinux to -redistributable; add static Linux binaries Don't Provide the old package name, since no one should be installing it. --- ignition.spec | 42 ++++++++++++++++++++++++++++++++---------- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/ignition.spec b/ignition.spec index de88938..d807ccf 100644 --- a/ignition.spec +++ b/ignition.spec @@ -19,7 +19,7 @@ Version: 2.13.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 3%{?dist} +Release: 4%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -217,22 +217,26 @@ the configuration. This package contains a tool for validating Ignition configurations. -############## validate-nonlinux subpackage ############## +############## validate-redistributable subpackage ############## %if 0%{?fedora} -%package validate-nonlinux +%package validate-redistributable -Summary: Validation tool for Ignition configs for macOS and Windows +Summary: Statically linked validation tool for Ignition configs License: ASL 2.0 BuildArch: noarch Conflicts: ignition < 0.31.0-3 -%description validate-nonlinux -This package contains macOS and Windows ignition-validate binaries built -through cross-compilation. Do not install it. It is only used for -building binaries to sign by Fedora release engineering and include on the -Ignition project's Github releases page. +# In case someone has this subpackage installed, obsolete the old name +# Drop in Fedora 38 +Obsoletes: ignition-validate-nonlinux < 2.13.0-4 + +%description validate-redistributable +This package contains statically linked Linux, macOS, and Windows +ignition-validate binaries built through cross-compilation. Do not install it. +It is only used for building release binaries to be signed by Fedora release +engineering and uploaded to the Ignition GitHub releases page. %endif %prep @@ -260,6 +264,12 @@ echo "Building ignition-validate..." %global gocrossbuild go build -ldflags "${LDFLAGS:-} -B 0x$(head -c20 /dev/urandom|od -An -tx1|tr -d ' \\n')" -a -v -x %if 0%{?fedora} +echo "Building statically-linked Linux ignition-validate..." +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..." GOARCH=amd64 GOOS=darwin %gocrossbuild -o ./ignition-validate-x86_64-apple-darwin validate/main.go @@ -278,8 +288,12 @@ install -p -m 0755 ./ignition-validate %{buildroot}%{_bindir} %if 0%{?fedora} install -d -p %{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 install -p -m 0644 ./ignition-validate-x86_64-apple-darwin %{buildroot}%{_datadir}/ignition install -p -m 0644 ./ignition-validate-x86_64-pc-windows-gnu.exe %{buildroot}%{_datadir}/ignition +install -p -m 0644 ./ignition-validate-x86_64-unknown-linux-gnu-static %{buildroot}%{_datadir}/ignition %endif # The ignition binary is only for dracut, and is dangerous to run from @@ -303,14 +317,22 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_bindir}/ignition-validate %if 0%{?fedora} -%files validate-nonlinux +%files validate-redistributable %license %{golicenses} %dir %{_datadir}/ignition +%{_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 %{_datadir}/ignition/ignition-validate-x86_64-apple-darwin %{_datadir}/ignition/ignition-validate-x86_64-pc-windows-gnu.exe +%{_datadir}/ignition/ignition-validate-x86_64-unknown-linux-gnu-static %endif %changelog +* Fri Jan 28 2022 Benjamin Gilbert - 2.13.0-4 +- Rename -validate-nonlinux subpackage to -validate-redistributable +- Add static Linux binaries to -redistributable + * Thu Jan 20 2022 Benjamin Gilbert - 2.13.0-3 - Fix LUKS volume reuse - Avoid double patch application on non-Fedora From 5873841bec22a1139c13c50c501e70c95f082bb1 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 28 Jan 2022 04:53:09 -0500 Subject: [PATCH 122/172] Fix macro invocation in comment --- ignition.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index d807ccf..8093b0b 100644 --- a/ignition.spec +++ b/ignition.spec @@ -2,7 +2,7 @@ %if 0%{?fedora} %bcond_without check %else -# %gocheck isn't currently provided on CentOS/RHEL +# %%gocheck isn't currently provided on CentOS/RHEL # https://bugzilla.redhat.com/show_bug.cgi?id=1982298 %bcond_with check %endif @@ -332,6 +332,7 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition * 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 * Thu Jan 20 2022 Benjamin Gilbert - 2.13.0-3 - Fix LUKS volume reuse From d9634e2f567d1b837d6d660be0dadb2ed7855643 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Fri, 28 Jan 2022 04:54:23 -0500 Subject: [PATCH 123/172] Update rpmlintrc Filter some additional irrelevant warnings. --- ignition.rpmlintrc | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/ignition.rpmlintrc b/ignition.rpmlintrc index de41af1..18e5612 100644 --- a/ignition.rpmlintrc +++ b/ignition.rpmlintrc @@ -1,2 +1,14 @@ # Suppress hardcoded library path warning addFilter("hardcoded-library-path in %{_prefix}/lib/dracut") + +# Ignition sources have duplicate files because of how spec versioning is +# implemented +addFilter("ignition-debugsource.x86_64: W: files-duplicate") + +# -validate-redistributable is supposed to have binaries in it +addFilter("ignition-validate-redistributable.noarch: E: arch-independent-package-contains-binary-or-object") + +# This is documented as optional +# https://fedoraproject.org/wiki/Upgrade_paths_%E2%80%94_renaming_or_splitting_packages#Do_I_need_to_Provide_my_old_package_names.3F +addFilter("ignition.x86_64: W: obsolete-not-provided ignition-dracut") +addFilter("ignition-validate-redistributable.noarch: W: obsolete-not-provided ignition-validate-nonlinux") From 14ad4c5490a98de3de71cdb5273cbf86704543ee Mon Sep 17 00:00:00 2001 From: Sohan Kunkerkar Date: Thu, 17 Mar 2022 11:05:39 -0400 Subject: [PATCH 124/172] Add patch for fixing the vmware kernel lockdown --- ignition.spec | 8 +++- ...info-quickfix-to-skip-performing-iop.patch | 40 +++++++++++++++++++ 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 vendor-vmw-guestinfo-quickfix-to-skip-performing-iop.patch diff --git a/ignition.spec b/ignition.spec index 8093b0b..87f8d2b 100644 --- a/ignition.spec +++ b/ignition.spec @@ -19,7 +19,7 @@ Version: 2.13.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 4%{?dist} +Release: 5%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -28,6 +28,9 @@ URL: %{gourl} Source0: %{gosource} # https://github.com/coreos/ignition/pull/1307 Patch0: luks-volume-reuse.patch +# vmware: kernel_lockdown breaks guestinfo fetching +# https://github.com/coreos/ignition/issues/1092 +Patch1: vendor-vmw-guestinfo-quickfix-to-skip-performing-iop.patch BuildRequires: libblkid-devel @@ -329,6 +332,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %endif %changelog +* 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 diff --git a/vendor-vmw-guestinfo-quickfix-to-skip-performing-iop.patch b/vendor-vmw-guestinfo-quickfix-to-skip-performing-iop.patch new file mode 100644 index 0000000..6d43fe9 --- /dev/null +++ b/vendor-vmw-guestinfo-quickfix-to-skip-performing-iop.patch @@ -0,0 +1,40 @@ +From 069ab246129be6860aed3389c526543afa87e712 Mon Sep 17 00:00:00 2001 +From: Luca BRUNO +Date: Thu, 17 Sep 2020 16:07:59 +0000 +Subject: [PATCH] vendor/vmw-guestinfo: quickfix to skip performing iopl + +This is a quickfix to avoid performing an `iopl`, which is blocked by +kernel_lockdown under SecureBoot. + +Refs: + * https://bugzilla.redhat.com/show_bug.cgi?id=1877995 + * https://github.com/lucab/vmw_backdoor-rs/issues/6 + * https://github.com/coreos/ignition/issues/1092 +--- + .../vmware/vmw-guestinfo/vmcheck/vmcheck.go | 11 +++++++---- + 1 file changed, 7 insertions(+), 4 deletions(-) + +diff --git a/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck.go b/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck.go +index c46cc5e4..ffd866c0 100644 +--- a/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck.go ++++ b/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck.go +@@ -41,10 +41,13 @@ func IsVirtualWorld() (bool, error) { + + // hypervisorPortCheck tests the availability of the HV port. + func hypervisorPortCheck() (bool, error) { +- // Privilege level 3 to access all ports above 0x3ff +- if err := openPortsAccess(); err != nil { +- return false, err +- } ++ // XXX(lucab): quickfix for https://github.com/coreos/ignition/issues/1092. ++ /* ++ // Privilege level 3 to access all ports above 0x3ff ++ if err := openPortsAccess(); err != nil { ++ return false, err ++ } ++ */ + + p := &bdoor.BackdoorProto{} + +-- +2.21.1 From b614d9bb86db7fcd01fa336a5f671120235f655e Mon Sep 17 00:00:00 2001 From: Steven Presti Date: Fri, 13 May 2022 13:37:56 -0400 Subject: [PATCH 125/172] ignition.spec: update version to v2.14.0 --- .gitignore | 1 + ignition.spec | 37 +++++++----- luks-volume-reuse.patch | 56 ------------------- sources | 2 +- ...info-quickfix-to-skip-performing-iop.patch | 40 ------------- 5 files changed, 25 insertions(+), 111 deletions(-) delete mode 100644 luks-volume-reuse.patch delete mode 100644 vendor-vmw-guestinfo-quickfix-to-skip-performing-iop.patch diff --git a/.gitignore b/.gitignore index a4cd92e..38126ad 100644 --- a/.gitignore +++ b/.gitignore @@ -57,3 +57,4 @@ /ignition-2.11.0.tar.gz /ignition-2.12.0.tar.gz /ignition-2.13.0.tar.gz +/ignition-2.14.0.tar.gz diff --git a/ignition.spec b/ignition.spec index 87f8d2b..37b9ae4 100644 --- a/ignition.spec +++ b/ignition.spec @@ -10,7 +10,7 @@ # https://github.com/coreos/ignition %global goipath github.com/coreos/ignition %global gomodulesmode GO111MODULE=on -Version: 2.13.0 +Version: 2.14.0 %gometa @@ -19,20 +19,16 @@ Version: 2.13.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 5%{?dist} +Release: 1%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 License: ASL 2.0 URL: %{gourl} Source0: %{gosource} -# https://github.com/coreos/ignition/pull/1307 -Patch0: luks-volume-reuse.patch -# vmware: kernel_lockdown breaks guestinfo fetching -# https://github.com/coreos/ignition/issues/1092 -Patch1: vendor-vmw-guestinfo-quickfix-to-skip-performing-iop.patch BuildRequires: libblkid-devel +BuildRequires: systemd-rpm-macros # Requires for 'disks' stage %if 0%{?fedora} @@ -98,6 +94,7 @@ Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.30.2 Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.30.28 Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.30.28 Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts/stsiface)) = 1.30.28 +Provides: bundled(golang(github.com/beevik/etree)) = 1.1.1-0.20200718192613.git4a2f8b9d084c Provides: bundled(golang(github.com/coreos/go-semver/semver)) = 0.3.0 Provides: bundled(golang(github.com/coreos/go-systemd/v22/dbus)) = 22.0.0 Provides: bundled(golang(github.com/coreos/go-systemd/v22/journal)) = 22.0.0 @@ -111,14 +108,14 @@ Provides: bundled(golang(github.com/google/renameio)) = 0.1.0 Provides: bundled(golang(github.com/google/uuid)) = 1.1.1 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/stretchr/testify/assert)) = 1.5.1 +Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.6-0.20210604193023.gitd5e0c0615ace +Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.7.0 Provides: bundled(golang(github.com/vincent-petithory/dataurl)) = 1.0.0 -Provides: bundled(golang(github.com/vmware/vmw-guestinfo/bdoor)) = 0.0.0-20170707015358.git25eff159a728 -Provides: bundled(golang(github.com/vmware/vmw-guestinfo/message)) = 0.0.0-20170707015358.git25eff159a728 -Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcout)) = 0.0.0-20170707015358.git25eff159a728 -Provides: bundled(golang(github.com/vmware/vmw-guestinfo/rpcvmx)) = 0.0.0-20170707015358.git25eff159a728 -Provides: bundled(golang(github.com/vmware/vmw-guestinfo/vmcheck)) = 0.0.0-20170707015358.git25eff159a728 -Provides: bundled(golang(github.com/vmware/vmw-ovflib)) = 0.0.0-20170608004843.git1f217b9dc714 +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/context)) = 0.0.0-20200602114024.git627f9648deb9 Provides: bundled(golang(golang.org/x/net/context/ctxhttp)) = 0.0.0-20200602114024.git627f9648deb9 Provides: bundled(golang(golang.org/x/net/http2)) = 0.0.0-20200602114024.git627f9648deb9 @@ -284,6 +281,10 @@ GOARCH=amd64 GOOS=windows %gocrossbuild -o ./ignition-validate-x86_64-pc-windows # dracut modules install -d -p %{buildroot}/%{dracutlibdir}/modules.d cp -r dracut/* %{buildroot}/%{dracutlibdir}/modules.d/ +install -m 0644 -D -t %{buildroot}/%{_unitdir} systemd/ignition-delete-config.service +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 # ignition install -d -p %{buildroot}%{_bindir} @@ -313,6 +314,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %license %{golicenses} %doc %{godocs} %{dracutlibdir}/modules.d/* +%{_unitdir}/*.service +%{_libexecdir}/ignition-apply +%{_libexecdir}/ignition-rmcfg %files validate %doc README.md @@ -332,6 +336,11 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %endif %changelog +* 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 + * Thu Mar 17 2022 Sohan Kunkerkar - 2.13.0-5 - Avoid kernel lockdown on VMware when running with secure boot diff --git a/luks-volume-reuse.patch b/luks-volume-reuse.patch deleted file mode 100644 index b27f481..0000000 --- a/luks-volume-reuse.patch +++ /dev/null @@ -1,56 +0,0 @@ -From aed47c18aee593d155d45c0fe9ba29a9e3123cf6 Mon Sep 17 00:00:00 2001 -From: Benjamin Gilbert -Date: Mon, 17 Jan 2022 21:17:08 -0500 -Subject: [PATCH] disks: fix reuse of statically keyed LUKS volume - -We need to persist a volume's keyfile to the real root even if we take -the early `continue` when reusing the volume. Rather than copying code, -enable persistence up front and then disable it afterward if we decide -not to persist the key. - -Fixes error: - - CRITICAL : Ignition failed: creating crypttab entries: missing persisted keyfile for [...] - -Fixes: https://github.com/coreos/ignition/issues/1305 -Fixes: 65e9c1611128 ("stages/disks: use State to persist keyfiles for files stage") ---- - internal/exec/stages/disks/luks.go | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) - -diff --git a/internal/exec/stages/disks/luks.go b/internal/exec/stages/disks/luks.go -index 77ecc24e..5fa15e70 100644 ---- a/internal/exec/stages/disks/luks.go -+++ b/internal/exec/stages/disks/luks.go -@@ -156,6 +156,13 @@ func (s *stage) createLuks(config types.Config) error { - } - } - } -+ // store the key to be persisted into the real root -+ // do this here so device reuse works correctly -+ key, err := ioutil.ReadFile(keyFilePath) -+ if err != nil { -+ return fmt.Errorf("failed to read keyfile %q: %w", keyFilePath, err) -+ } -+ s.State.LuksPersistKeyFiles[luks.Name] = dataurl.EncodeBytes(key) - - if !util.IsTrue(luks.WipeVolume) { - // If the volume isn't forcefully being created, then we need -@@ -329,13 +336,7 @@ func (s *stage) createLuks(config types.Config) error { - ); err != nil { - return fmt.Errorf("removing key file from luks device: %v", err) - } -- } else { -- // store the key to be persisted into the real root -- key, err := ioutil.ReadFile(keyFilePath) -- if err != nil { -- return fmt.Errorf("failed to read keyfile %q: %w", keyFilePath, err) -- } -- s.State.LuksPersistKeyFiles[luks.Name] = dataurl.EncodeBytes(key) -+ delete(s.State.LuksPersistKeyFiles, luks.Name) - } - } - --- -2.33.1 - diff --git a/sources b/sources index 5799214..fba25ac 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ignition-2.13.0.tar.gz) = 8e5a2e2feac002e829f2d5de54596752efef3a42ad393e55a15c0cc50b7ea4c438380cbb82c9ed386721cccea4a579e32960c463a7ec4fc27ac8aa532cf425ca +SHA512 (ignition-2.14.0.tar.gz) = e66d42bcfc516055f61abd1808e7ed1bdb4bf4e99b69c16ab9031be173a709c5864e74f23033cb33288e758b2f98a1dd878ef1aa802220afa504997fc3440af3 diff --git a/vendor-vmw-guestinfo-quickfix-to-skip-performing-iop.patch b/vendor-vmw-guestinfo-quickfix-to-skip-performing-iop.patch deleted file mode 100644 index 6d43fe9..0000000 --- a/vendor-vmw-guestinfo-quickfix-to-skip-performing-iop.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 069ab246129be6860aed3389c526543afa87e712 Mon Sep 17 00:00:00 2001 -From: Luca BRUNO -Date: Thu, 17 Sep 2020 16:07:59 +0000 -Subject: [PATCH] vendor/vmw-guestinfo: quickfix to skip performing iopl - -This is a quickfix to avoid performing an `iopl`, which is blocked by -kernel_lockdown under SecureBoot. - -Refs: - * https://bugzilla.redhat.com/show_bug.cgi?id=1877995 - * https://github.com/lucab/vmw_backdoor-rs/issues/6 - * https://github.com/coreos/ignition/issues/1092 ---- - .../vmware/vmw-guestinfo/vmcheck/vmcheck.go | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git a/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck.go b/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck.go -index c46cc5e4..ffd866c0 100644 ---- a/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck.go -+++ b/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck.go -@@ -41,10 +41,13 @@ func IsVirtualWorld() (bool, error) { - - // hypervisorPortCheck tests the availability of the HV port. - func hypervisorPortCheck() (bool, error) { -- // Privilege level 3 to access all ports above 0x3ff -- if err := openPortsAccess(); err != nil { -- return false, err -- } -+ // XXX(lucab): quickfix for https://github.com/coreos/ignition/issues/1092. -+ /* -+ // Privilege level 3 to access all ports above 0x3ff -+ if err := openPortsAccess(); err != nil { -+ return false, err -+ } -+ */ - - p := &bdoor.BackdoorProto{} - --- -2.21.1 From 9c0b6ff73c9dd8c391a47808e4dae3f5960e015c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= Date: Sat, 18 Jun 2022 12:11:54 +0200 Subject: [PATCH 126/172] Rebuilt for CVE-2022-1996, CVE-2022-24675, CVE-2022-28327, CVE-2022-27191, CVE-2022-29526, CVE-2022-30629 --- ignition.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index 37b9ae4..9c89257 100644 --- a/ignition.spec +++ b/ignition.spec @@ -19,7 +19,7 @@ Version: 2.14.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 1%{?dist} +Release: 2%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -336,6 +336,10 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %endif %changelog +* 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 From d1610f2785c05354cb677b70055116bfd47ebce6 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Mon, 27 Jun 2022 19:09:37 -0400 Subject: [PATCH 127/172] Add macOS aarch64 binary to -redistributable --- ignition.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index 9c89257..feaecb3 100644 --- a/ignition.spec +++ b/ignition.spec @@ -19,7 +19,7 @@ Version: 2.14.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 2%{?dist} +Release: 3%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -272,6 +272,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 @@ -292,6 +293,7 @@ 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 @@ -327,6 +329,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 +339,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %endif %changelog +* 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 From 03db1836f4f54f2f306e038dd2af815bb64734a9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 14:32:32 +0000 Subject: [PATCH 128/172] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ignition.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index feaecb3..df4e3ed 100644 --- a/ignition.spec +++ b/ignition.spec @@ -19,7 +19,7 @@ Version: 2.14.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 3%{?dist} +Release: 4%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -339,6 +339,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %endif %changelog +* 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 From a637ff4bd82472f74db4ddbd92bfab0923a6b52e Mon Sep 17 00:00:00 2001 From: Christian Glombek Date: Tue, 9 Aug 2022 16:08:58 +0200 Subject: [PATCH 129/172] Enable writing ssh keys fragments on RHEL/CentOS >= 9 https://issues.redhat.com/browse/COS-1589 --- ignition.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/ignition.spec b/ignition.spec index df4e3ed..d2f8f3f 100644 --- a/ignition.spec +++ b/ignition.spec @@ -19,7 +19,7 @@ Version: 2.14.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 4%{?dist} +Release: 5%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -249,9 +249,13 @@ engineering and uploaded to the Ignition GitHub releases page. %build export LDFLAGS="-X github.com/coreos/ignition/v2/internal/version.Raw=%{version} -X github.com/coreos/ignition/v2/internal/distro.selinuxRelabel=true " -%if 0%{?rhel} || 0%{?centos} +%if 0%{?rhel} && 0%{?rhel} <= 8 +# Disable writing ssh keys fragments on RHEL/CentOS <= 8 +LDFLAGS+=' -X github.com/coreos/ignition/v2/internal/distro.writeAuthorizedKeysFragment=false ' +%endif +%if 0%{?rhel} # Need uncompressed debug symbols for debuginfo extraction -LDFLAGS+=' -X github.com/coreos/ignition/v2/internal/distro.writeAuthorizedKeysFragment=false -compressdwarf=false ' +LDFLAGS+=' -compressdwarf=false ' %endif export GOFLAGS="-mod=vendor" @@ -339,6 +343,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %endif %changelog +* Tue Aug 9 2022 Christian Glombek - 2.14.0-5 +- Enable writing ssh keys fragments on RHEL/CentOS >= 9 + * Thu Jul 21 2022 Fedora Release Engineering - 2.14.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From cdc0d0ebecc9f2119d6a4bdd82d7616f0713d49f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 13:01:57 +0000 Subject: [PATCH 130/172] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ignition.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index d2f8f3f..4a3ca8d 100644 --- a/ignition.spec +++ b/ignition.spec @@ -19,7 +19,7 @@ Version: 2.14.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 5%{?dist} +Release: 6%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -343,6 +343,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %endif %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 2.14.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Tue Aug 9 2022 Christian Glombek - 2.14.0-5 - Enable writing ssh keys fragments on RHEL/CentOS >= 9 From d327075d15257dc37dcc25798f169d8375a3b6da Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Tue, 21 Feb 2023 14:55:53 -0600 Subject: [PATCH 131/172] 2.15.0 --- .gitignore | 1 + ignition.spec | 245 ++++++++++++++++++++++---------------------------- sources | 2 +- 3 files changed, 108 insertions(+), 140 deletions(-) diff --git a/.gitignore b/.gitignore index 38126ad..0c899d0 100644 --- a/.gitignore +++ b/.gitignore @@ -58,3 +58,4 @@ /ignition-2.12.0.tar.gz /ignition-2.13.0.tar.gz /ignition-2.14.0.tar.gz +/ignition-2.15.0.tar.gz diff --git a/ignition.spec b/ignition.spec index 4a3ca8d..5156b16 100644 --- a/ignition.spec +++ b/ignition.spec @@ -10,7 +10,7 @@ # https://github.com/coreos/ignition %global goipath github.com/coreos/ignition %global gomodulesmode GO111MODULE=on -Version: 2.14.0 +Version: 2.15.0 %gometa @@ -19,7 +19,7 @@ Version: 2.14.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 6%{?dist} +Release: 1%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -42,153 +42,117 @@ Requires: dracut-network Obsoletes: ignition-dracut < 0.31.0-3 # Generated by `go-mods-to-bundled-provides.py | sort` -Provides: bundled(golang(cloud.google.com/go)) = 0.58.0 -Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.58.0 -Provides: bundled(golang(cloud.google.com/go/iam)) = 0.58.0 -Provides: bundled(golang(cloud.google.com/go/internal)) = 0.58.0 -Provides: bundled(golang(cloud.google.com/go/internal/optional)) = 0.58.0 -Provides: bundled(golang(cloud.google.com/go/internal/trace)) = 0.58.0 -Provides: bundled(golang(cloud.google.com/go/internal/version)) = 0.58.0 -Provides: bundled(golang(cloud.google.com/go/storage)) = 0.58.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/arn)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/processcreds)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/csm)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/context)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3err)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkmath)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/strings)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sync/singleflight)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/json/jsonutil)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/internal/arn)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.30.28 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts/stsiface)) = 1.30.28 +Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.2.3 +Provides: bundled(golang(cloud.google.com/go/storage)) = 1.29.0 +Provides: bundled(golang(cloud.google.com/go/storage/internal)) = 1.29.0 +Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2)) = 1.29.0 +Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2/stubs)) = 1.29.0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/arn)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/processcreds)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ssocreds)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/csm)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/context)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/arn)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/s3err)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkmath)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/strings)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sync/singleflight)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/checksum)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/json/jsonutil)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/jsonrpc)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restjson)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso/ssoiface)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.44.204 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts/stsiface)) = 1.44.204 Provides: bundled(golang(github.com/beevik/etree)) = 1.1.1-0.20200718192613.git4a2f8b9d084c -Provides: bundled(golang(github.com/coreos/go-semver/semver)) = 0.3.0 -Provides: bundled(golang(github.com/coreos/go-systemd/v22/dbus)) = 22.0.0 -Provides: bundled(golang(github.com/coreos/go-systemd/v22/journal)) = 22.0.0 -Provides: bundled(golang(github.com/coreos/go-systemd/v22/unit)) = 22.0.0 -Provides: bundled(golang(github.com/coreos/vcontext/json)) = 0.0.0-20211021162308.gitf1dbbca7bef4 -Provides: bundled(golang(github.com/coreos/vcontext/path)) = 0.0.0-20211021162308.gitf1dbbca7bef4 -Provides: bundled(golang(github.com/coreos/vcontext/report)) = 0.0.0-20211021162308.gitf1dbbca7bef4 -Provides: bundled(golang(github.com/coreos/vcontext/tree)) = 0.0.0-20211021162308.gitf1dbbca7bef4 -Provides: bundled(golang(github.com/coreos/vcontext/validate)) = 0.0.0-20211021162308.gitf1dbbca7bef4 -Provides: bundled(golang(github.com/google/renameio)) = 0.1.0 -Provides: bundled(golang(github.com/google/uuid)) = 1.1.1 +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 +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.0 +Provides: bundled(golang(github.com/google/uuid)) = 1.3.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.6-0.20210604193023.gitd5e0c0615ace -Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.7.0 +Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.8.1 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/context)) = 0.0.0-20200602114024.git627f9648deb9 -Provides: bundled(golang(golang.org/x/net/context/ctxhttp)) = 0.0.0-20200602114024.git627f9648deb9 -Provides: bundled(golang(golang.org/x/net/http2)) = 0.0.0-20200602114024.git627f9648deb9 -Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.0.0-20200602114024.git627f9648deb9 -Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.0.0-20200602114024.git627f9648deb9 -Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.0.0-20200602114024.git627f9648deb9 -Provides: bundled(golang(golang.org/x/net/idna)) = 0.0.0-20200602114024.git627f9648deb9 -Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.0.0-20200602114024.git627f9648deb9 -Provides: bundled(golang(golang.org/x/net/trace)) = 0.0.0-20200602114024.git627f9648deb9 -Provides: bundled(golang(golang.org/x/oauth2)) = 0.0.0-20200107190931.gitbf48bf16ab8d -Provides: bundled(golang(golang.org/x/oauth2/google)) = 0.0.0-20200107190931.gitbf48bf16ab8d -Provides: bundled(golang(golang.org/x/oauth2/internal)) = 0.0.0-20200107190931.gitbf48bf16ab8d -Provides: bundled(golang(golang.org/x/oauth2/jws)) = 0.0.0-20200107190931.gitbf48bf16ab8d -Provides: bundled(golang(golang.org/x/oauth2/jwt)) = 0.0.0-20200107190931.gitbf48bf16ab8d -Provides: bundled(golang(golang.org/x/sys/internal/unsafeheader)) = 0.0.0-20200610111108.git226ff32320da -Provides: bundled(golang(golang.org/x/sys/unix)) = 0.0.0-20200610111108.git226ff32320da -Provides: bundled(golang(golang.org/x/tools/cmd/goimports)) = 0.0.0-20200610160956.git3e83d1e96d0e -Provides: bundled(golang(golang.org/x/tools/go/analysis)) = 0.0.0-20200610160956.git3e83d1e96d0e -Provides: bundled(golang(golang.org/x/tools/go/analysis/passes/inspect)) = 0.0.0-20200610160956.git3e83d1e96d0e -Provides: bundled(golang(golang.org/x/tools/go/ast/astutil)) = 0.0.0-20200610160956.git3e83d1e96d0e -Provides: bundled(golang(golang.org/x/tools/go/ast/inspector)) = 0.0.0-20200610160956.git3e83d1e96d0e -Provides: bundled(golang(golang.org/x/tools/go/buildutil)) = 0.0.0-20200610160956.git3e83d1e96d0e -Provides: bundled(golang(golang.org/x/tools/go/gcexportdata)) = 0.0.0-20200610160956.git3e83d1e96d0e -Provides: bundled(golang(golang.org/x/tools/go/internal/cgo)) = 0.0.0-20200610160956.git3e83d1e96d0e -Provides: bundled(golang(golang.org/x/tools/go/internal/gcimporter)) = 0.0.0-20200610160956.git3e83d1e96d0e -Provides: bundled(golang(golang.org/x/tools/go/internal/packagesdriver)) = 0.0.0-20200610160956.git3e83d1e96d0e -Provides: bundled(golang(golang.org/x/tools/go/loader)) = 0.0.0-20200610160956.git3e83d1e96d0e -Provides: bundled(golang(golang.org/x/tools/go/packages)) = 0.0.0-20200610160956.git3e83d1e96d0e -Provides: bundled(golang(golang.org/x/tools/go/types/objectpath)) = 0.0.0-20200610160956.git3e83d1e96d0e -Provides: bundled(golang(golang.org/x/tools/go/types/typeutil)) = 0.0.0-20200610160956.git3e83d1e96d0e -Provides: bundled(golang(golang.org/x/tools/internal/analysisinternal)) = 0.0.0-20200610160956.git3e83d1e96d0e -Provides: bundled(golang(golang.org/x/tools/internal/event)) = 0.0.0-20200610160956.git3e83d1e96d0e -Provides: bundled(golang(golang.org/x/tools/internal/event/core)) = 0.0.0-20200610160956.git3e83d1e96d0e -Provides: bundled(golang(golang.org/x/tools/internal/event/keys)) = 0.0.0-20200610160956.git3e83d1e96d0e -Provides: bundled(golang(golang.org/x/tools/internal/event/label)) = 0.0.0-20200610160956.git3e83d1e96d0e -Provides: bundled(golang(golang.org/x/tools/internal/fastwalk)) = 0.0.0-20200610160956.git3e83d1e96d0e -Provides: bundled(golang(golang.org/x/tools/internal/gocommand)) = 0.0.0-20200610160956.git3e83d1e96d0e -Provides: bundled(golang(golang.org/x/tools/internal/gopathwalk)) = 0.0.0-20200610160956.git3e83d1e96d0e -Provides: bundled(golang(golang.org/x/tools/internal/imports)) = 0.0.0-20200610160956.git3e83d1e96d0e -Provides: bundled(golang(golang.org/x/tools/internal/packagesinternal)) = 0.0.0-20200610160956.git3e83d1e96d0e -Provides: bundled(golang(google.golang.org/api/googleapi)) = 0.26.0 -Provides: bundled(golang(google.golang.org/api/googleapi/transport)) = 0.26.0 -Provides: bundled(golang(google.golang.org/api/internal)) = 0.26.0 -Provides: bundled(golang(google.golang.org/api/internal/gensupport)) = 0.26.0 -Provides: bundled(golang(google.golang.org/api/internal/third_party/uritemplates)) = 0.26.0 -Provides: bundled(golang(google.golang.org/api/iterator)) = 0.26.0 -Provides: bundled(golang(google.golang.org/api/option)) = 0.26.0 -Provides: bundled(golang(google.golang.org/api/option/internaloption)) = 0.26.0 -Provides: bundled(golang(google.golang.org/api/storage/v1)) = 0.26.0 -Provides: bundled(golang(google.golang.org/api/transport/cert)) = 0.26.0 -Provides: bundled(golang(google.golang.org/api/transport/http)) = 0.26.0 -Provides: bundled(golang(google.golang.org/api/transport/http/internal/propagation)) = 0.26.0 -Provides: bundled(golang(google.golang.org/genproto/googleapis/api/annotations)) = 0.0.0-20200610104632.gita5b850bcf112 -Provides: bundled(golang(google.golang.org/genproto/googleapis/iam/v1)) = 0.0.0-20200610104632.gita5b850bcf112 -Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc/code)) = 0.0.0-20200610104632.gita5b850bcf112 -Provides: bundled(golang(google.golang.org/genproto/googleapis/rpc/status)) = 0.0.0-20200610104632.gita5b850bcf112 -Provides: bundled(golang(google.golang.org/genproto/googleapis/type/expr)) = 0.0.0-20200610104632.gita5b850bcf112 -Provides: bundled(golang(go.opencensus.io)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/internal)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/internal/tagencoding)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/metric/metricdata)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/metric/metricproducer)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/plugin/ochttp)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/plugin/ochttp/propagation/b3)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/resource)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/stats)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/stats/internal)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/stats/view)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/tag)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/trace)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/trace/internal)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/trace/propagation)) = 0.22.5 -Provides: bundled(golang(go.opencensus.io/trace/tracestate)) = 0.22.5 +Provides: bundled(golang(golang.org/x/net/context)) = 0.7.0 +Provides: bundled(golang(golang.org/x/net/http2)) = 0.7.0 +Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.7.0 +Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.7.0 +Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.7.0 +Provides: bundled(golang(golang.org/x/net/idna)) = 0.7.0 +Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.7.0 +Provides: bundled(golang(golang.org/x/net/trace)) = 0.7.0 +Provides: bundled(golang(golang.org/x/oauth2)) = 0.5.0 +Provides: bundled(golang(golang.org/x/oauth2/authhandler)) = 0.5.0 +Provides: bundled(golang(golang.org/x/oauth2/google)) = 0.5.0 +Provides: bundled(golang(golang.org/x/oauth2/google/internal/externalaccount)) = 0.5.0 +Provides: bundled(golang(golang.org/x/oauth2/internal)) = 0.5.0 +Provides: bundled(golang(golang.org/x/oauth2/jws)) = 0.5.0 +Provides: bundled(golang(golang.org/x/oauth2/jwt)) = 0.5.0 +Provides: bundled(golang(golang.org/x/sys/unix)) = 0.5.0 +Provides: bundled(golang(google.golang.org/api/googleapi)) = 0.110.0 +Provides: bundled(golang(google.golang.org/api/googleapi/transport)) = 0.110.0 +Provides: bundled(golang(google.golang.org/api/iamcredentials/v1)) = 0.110.0 +Provides: bundled(golang(google.golang.org/api/internal)) = 0.110.0 +Provides: bundled(golang(google.golang.org/api/internal/gensupport)) = 0.110.0 +Provides: bundled(golang(google.golang.org/api/internal/impersonate)) = 0.110.0 +Provides: bundled(golang(google.golang.org/api/internal/third_party/uritemplates)) = 0.110.0 +Provides: bundled(golang(google.golang.org/api/iterator)) = 0.110.0 +Provides: bundled(golang(google.golang.org/api/option)) = 0.110.0 +Provides: bundled(golang(google.golang.org/api/option/internaloption)) = 0.110.0 +Provides: bundled(golang(google.golang.org/api/storage/v1)) = 0.110.0 +Provides: bundled(golang(google.golang.org/api/transport)) = 0.110.0 +Provides: bundled(golang(google.golang.org/api/transport/cert)) = 0.110.0 +Provides: bundled(golang(google.golang.org/api/transport/grpc)) = 0.110.0 +Provides: bundled(golang(google.golang.org/api/transport/http)) = 0.110.0 +Provides: bundled(golang(google.golang.org/api/transport/http/internal/propagation)) = 0.110.0 +Provides: bundled(golang(google.golang.org/api/transport/internal/dca)) = 0.110.0 %description Ignition is a utility used to manipulate systems during the initramfs. @@ -343,6 +307,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %endif %changelog +* Tue Feb 21 2023 Benjamin Gilbert - 2.15.0-1 +- New release + * Thu Jan 19 2023 Fedora Release Engineering - 2.14.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index fba25ac..a82bce9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ignition-2.14.0.tar.gz) = e66d42bcfc516055f61abd1808e7ed1bdb4bf4e99b69c16ab9031be173a709c5864e74f23033cb33288e758b2f98a1dd878ef1aa802220afa504997fc3440af3 +SHA512 (ignition-2.15.0.tar.gz) = f599fbd240d9de78a0765749fe9214700629150d7afbf35985683ab174eea6fd8f9de55a598edfa710de1412576d2dd057d116f8ad7e8c8459d4e7cc85d5a705 From 6d7106f64fb71ea70bff829cded9c90cf16dff40 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Tue, 21 Feb 2023 14:58:00 -0600 Subject: [PATCH 132/172] Drop Conflicts/Obsoletes for ancient Ignition releases We're only required to support upgrading from Fedora N-2. --- ignition.rpmlintrc | 1 - ignition.spec | 7 +------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/ignition.rpmlintrc b/ignition.rpmlintrc index 18e5612..8d4c2aa 100644 --- a/ignition.rpmlintrc +++ b/ignition.rpmlintrc @@ -10,5 +10,4 @@ addFilter("ignition-validate-redistributable.noarch: E: arch-independent-package # This is documented as optional # https://fedoraproject.org/wiki/Upgrade_paths_%E2%80%94_renaming_or_splitting_packages#Do_I_need_to_Provide_my_old_package_names.3F -addFilter("ignition.x86_64: W: obsolete-not-provided ignition-dracut") addFilter("ignition-validate-redistributable.noarch: W: obsolete-not-provided ignition-validate-nonlinux") diff --git a/ignition.spec b/ignition.spec index 5156b16..c28afbf 100644 --- a/ignition.spec +++ b/ignition.spec @@ -39,8 +39,6 @@ Requires: gdisk Requires: dracut Requires: dracut-network -Obsoletes: ignition-dracut < 0.31.0-3 - # Generated by `go-mods-to-bundled-provides.py | sort` Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.2.3 Provides: bundled(golang(cloud.google.com/go/storage)) = 1.29.0 @@ -169,8 +167,6 @@ the configuration. Summary: Validation tool for Ignition configs License: ASL 2.0 -Conflicts: ignition < 0.31.0-3 - %description validate Ignition is a utility used to manipulate systems during the initramfs. This includes partitioning disks, formatting partitions, writing files @@ -190,8 +186,6 @@ Summary: Statically linked validation tool for Ignition configs License: ASL 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 @@ -309,6 +303,7 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %changelog * Tue Feb 21 2023 Benjamin Gilbert - 2.15.0-1 - New release +- Drop Conflicts/Obsoletes for ancient Ignition releases * Thu Jan 19 2023 Fedora Release Engineering - 2.14.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From df664a9084f6efc4e24d6047ce1b04f6d06d2e8d Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Tue, 21 Feb 2023 15:09:09 -0600 Subject: [PATCH 133/172] Update rpmlintrc for current rpmlint --- ignition.rpmlintrc | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ignition.rpmlintrc b/ignition.rpmlintrc index 8d4c2aa..8dc3988 100644 --- a/ignition.rpmlintrc +++ b/ignition.rpmlintrc @@ -1,12 +1,11 @@ -# Suppress hardcoded library path warning -addFilter("hardcoded-library-path in %{_prefix}/lib/dracut") - # Ignition sources have duplicate files because of how spec versioning is # implemented -addFilter("ignition-debugsource.x86_64: W: files-duplicate") +addFilter("ignition-debugsource.x86_64: E: files-duplicated-waste") -# -validate-redistributable is supposed to have binaries in it +# -validate-redistributable is supposed to have binaries in it, and +# doesn't really need docs since it isn't user-facing addFilter("ignition-validate-redistributable.noarch: E: arch-independent-package-contains-binary-or-object") +addFilter("ignition-validate-redistributable.noarch: W: no-documentation") # This is documented as optional # https://fedoraproject.org/wiki/Upgrade_paths_%E2%80%94_renaming_or_splitting_packages#Do_I_need_to_Provide_my_old_package_names.3F From b20c1a42571c43fa4690a367166d416184551b33 Mon Sep 17 00:00:00 2001 From: Paul Whalen Date: Tue, 21 Feb 2023 10:18:00 -0500 Subject: [PATCH 134/172] Enable ignition-edge in Fedora Signed-off-by: Paul Whalen --- .gitignore | 1 + ignition.spec | 37 ++++++++++++++++++++++++++++++++++++- sources | 1 + 3 files changed, 38 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 0c899d0..ec90427 100644 --- a/.gitignore +++ b/.gitignore @@ -59,3 +59,4 @@ /ignition-2.13.0.tar.gz /ignition-2.14.0.tar.gz /ignition-2.15.0.tar.gz +/ignition-edge-a3a8f0a.tar.gz diff --git a/ignition.spec b/ignition.spec index c28afbf..5da6e6c 100644 --- a/ignition.spec +++ b/ignition.spec @@ -7,6 +7,9 @@ %bcond_with check %endif +%global ignedgecommit a3a8f0abb2a1c7fc1c9e5d0e7a3e8830b2e2d766 +%global ignedgeshortcommit %(c=%{ignedgecommit}; echo ${c:0:7}) + # https://github.com/coreos/ignition %global goipath github.com/coreos/ignition %global gomodulesmode GO111MODULE=on @@ -19,13 +22,14 @@ Version: 2.15.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 1%{?dist} +Release: 2%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 License: ASL 2.0 URL: %{gourl} Source0: %{gosource} +Source1: https://github.com/fedora-iot/ignition-edge/archive/%{ignedgecommit}/ignition-edge-%{ignedgeshortcommit}.tar.gz BuildRequires: libblkid-devel BuildRequires: systemd-rpm-macros @@ -197,6 +201,17 @@ It is only used for building release binaries to be signed by Fedora release engineering and uploaded to the Ignition GitHub releases page. %endif +############## ignition-edge subpackage ############## + +%package edge + +Summary: Enablement glue for Ignition on IoT/Edge systems +License: ASL 2.0 + +%description edge +This package contains dracut modules, services and binaries needed to enable +Ignition on IoT/Edge systems. + %prep %if 0%{?fedora} %goprep -k @@ -205,6 +220,8 @@ engineering and uploaded to the Ignition GitHub releases page. %forgeautosetup -p1 %endif +tar xvf %{SOURCE1} + %build export LDFLAGS="-X github.com/coreos/ignition/v2/internal/version.Raw=%{version} -X github.com/coreos/ignition/v2/internal/distro.selinuxRelabel=true " %if 0%{?rhel} && 0%{?rhel} <= 8 @@ -268,6 +285,8 @@ 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 +%make_install -C ignition-edge-%{ignedgecommit} + %if %{with check} %check # Exclude the blackbox tests @@ -300,7 +319,23 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_datadir}/ignition/ignition-validate-x86_64-unknown-linux-gnu-static %endif +%files edge +%license %{golicenses} +%doc %{godocs} +%{dracutlibdir}/modules.d/35ignition-edge/* +%{dracutlibdir}/modules.d/10coreos-sysctl/* +%{dracutlibdir}/modules.d/99emergency-shell-setup/* +%{dracutlibdir}/modules.d/99journal-conf/* +%{_unitdir}/coreos-check-ssh-keys.service +%{_unitdir}/coreos-ignition-write-issues.service +%{_unitdir}/ignition-firstboot-complete.service +%{_libexecdir}/coreos-ignition-write-issues +%{_libexecdir}/coreos-check-ssh-keys + %changelog +* 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 diff --git a/sources b/sources index a82bce9..4307b4a 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (ignition-2.15.0.tar.gz) = f599fbd240d9de78a0765749fe9214700629150d7afbf35985683ab174eea6fd8f9de55a598edfa710de1412576d2dd057d116f8ad7e8c8459d4e7cc85d5a705 +SHA512 (ignition-edge-a3a8f0a.tar.gz) = ef04cd411752f1b48fdb64ae8e45a2234b635a19ead82483cb33e246697e6ae639f6036030e7647913f5f589532f3d015bcc81848db50ebe8800242f6f23230a From c3699d870c22dbbaad2510090c7ff2639044b7c1 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Wed, 22 Feb 2023 20:27:17 -0600 Subject: [PATCH 135/172] Remove ignition-edge files from base package --- ignition.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ignition.spec b/ignition.spec index 5da6e6c..f97dd93 100644 --- a/ignition.spec +++ b/ignition.spec @@ -22,7 +22,7 @@ Version: 2.15.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 2%{?dist} +Release: 3%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -296,8 +296,8 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %files %license %{golicenses} %doc %{godocs} -%{dracutlibdir}/modules.d/* -%{_unitdir}/*.service +%{dracutlibdir}/modules.d/30ignition/* +%{_unitdir}/ignition-delete-config.service %{_libexecdir}/ignition-apply %{_libexecdir}/ignition-rmcfg @@ -333,6 +333,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_libexecdir}/coreos-check-ssh-keys %changelog +* 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 From 6b3027138f6b109f73e92311cd78f6d93ae4f28d Mon Sep 17 00:00:00 2001 From: Steven Presti Date: Thu, 1 Jun 2023 13:42:04 -0400 Subject: [PATCH 136/172] Update license to SPDX --- ignition.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/ignition.spec b/ignition.spec index f97dd93..566ee0d 100644 --- a/ignition.spec +++ b/ignition.spec @@ -22,11 +22,11 @@ Version: 2.15.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 3%{?dist} +Release: 4%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 -License: ASL 2.0 +License: Apache-2.0 URL: %{gourl} Source0: %{gosource} Source1: https://github.com/fedora-iot/ignition-edge/archive/%{ignedgecommit}/ignition-edge-%{ignedgeshortcommit}.tar.gz @@ -169,7 +169,7 @@ the configuration. %package validate Summary: Validation tool for Ignition configs -License: ASL 2.0 +License: Apache-2.0 %description validate Ignition is a utility used to manipulate systems during the initramfs. @@ -187,7 +187,7 @@ 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 # In case someone has this subpackage installed, obsolete the old name @@ -206,7 +206,7 @@ engineering and uploaded to the Ignition GitHub releases page. %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 @@ -333,6 +333,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_libexecdir}/coreos-check-ssh-keys %changelog +* 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 From bbbbdecd406c022e69a7ae27f6a122954ea37c43 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 29 Jun 2023 18:02:36 -0400 Subject: [PATCH 137/172] Update to 2.16.1 --- .gitignore | 1 + ignition.spec | 192 ++++++++++++++++++++++++++------------------------ sources | 2 +- 3 files changed, 102 insertions(+), 93 deletions(-) diff --git a/.gitignore b/.gitignore index ec90427..e408f41 100644 --- a/.gitignore +++ b/.gitignore @@ -60,3 +60,4 @@ /ignition-2.14.0.tar.gz /ignition-2.15.0.tar.gz /ignition-edge-a3a8f0a.tar.gz +/ignition-2.16.1.tar.gz diff --git a/ignition.spec b/ignition.spec index 566ee0d..113b2d7 100644 --- a/ignition.spec +++ b/ignition.spec @@ -13,7 +13,7 @@ # https://github.com/coreos/ignition %global goipath github.com/coreos/ignition %global gomodulesmode GO111MODULE=on -Version: 2.15.0 +Version: 2.16.1 %gometa @@ -22,7 +22,7 @@ Version: 2.15.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 4%{?dist} +Release: 1%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -45,62 +45,65 @@ Requires: dracut-network # Generated by `go-mods-to-bundled-provides.py | sort` Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.2.3 -Provides: bundled(golang(cloud.google.com/go/storage)) = 1.29.0 -Provides: bundled(golang(cloud.google.com/go/storage/internal)) = 1.29.0 -Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2)) = 1.29.0 -Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2/stubs)) = 1.29.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/arn)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/processcreds)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ssocreds)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/csm)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/context)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/arn)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/s3err)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkmath)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/strings)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sync/singleflight)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/checksum)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/json/jsonutil)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/jsonrpc)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restjson)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso/ssoiface)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.44.204 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts/stsiface)) = 1.44.204 -Provides: bundled(golang(github.com/beevik/etree)) = 1.1.1-0.20200718192613.git4a2f8b9d084c +Provides: bundled(golang(cloud.google.com/go/storage)) = 1.31.0 +Provides: bundled(golang(cloud.google.com/go/storage/internal)) = 1.31.0 +Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2)) = 1.31.0 +Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2/storagepb)) = 1.31.0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/arn)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/auth/bearer)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/processcreds)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ssocreds)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/csm)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/context)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/arn)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/s3err)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkmath)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/strings)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sync/singleflight)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/checksum)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/json/jsonutil)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/jsonrpc)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restjson)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/ssooidc)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso/ssoiface)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.44.298 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts/stsiface)) = 1.44.298 +Provides: bundled(golang(github.com/beevik/etree)) = 1.2.0 +Provides: bundled(golang(github.com/containers/libhvee/pkg/kvp)) = 0.3.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 @@ -112,49 +115,51 @@ Provides: bundled(golang(github.com/coreos/vcontext/tree)) = 0.0.0-2023020118101 Provides: bundled(golang(github.com/coreos/vcontext/validate)) = 0.0.0-20230201181013.gitd72178a18687 Provides: bundled(golang(github.com/google/renameio/v2)) = 2.0.0 Provides: bundled(golang(github.com/google/uuid)) = 1.3.0 +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.6-0.20210604193023.gitd5e0c0615ace -Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.8.1 +Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.8.4 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/context)) = 0.7.0 -Provides: bundled(golang(golang.org/x/net/http2)) = 0.7.0 -Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.7.0 -Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.7.0 -Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.7.0 -Provides: bundled(golang(golang.org/x/net/idna)) = 0.7.0 -Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.7.0 -Provides: bundled(golang(golang.org/x/net/trace)) = 0.7.0 -Provides: bundled(golang(golang.org/x/oauth2)) = 0.5.0 -Provides: bundled(golang(golang.org/x/oauth2/authhandler)) = 0.5.0 -Provides: bundled(golang(golang.org/x/oauth2/google)) = 0.5.0 -Provides: bundled(golang(golang.org/x/oauth2/google/internal/externalaccount)) = 0.5.0 -Provides: bundled(golang(golang.org/x/oauth2/internal)) = 0.5.0 -Provides: bundled(golang(golang.org/x/oauth2/jws)) = 0.5.0 -Provides: bundled(golang(golang.org/x/oauth2/jwt)) = 0.5.0 -Provides: bundled(golang(golang.org/x/sys/unix)) = 0.5.0 -Provides: bundled(golang(google.golang.org/api/googleapi)) = 0.110.0 -Provides: bundled(golang(google.golang.org/api/googleapi/transport)) = 0.110.0 -Provides: bundled(golang(google.golang.org/api/iamcredentials/v1)) = 0.110.0 -Provides: bundled(golang(google.golang.org/api/internal)) = 0.110.0 -Provides: bundled(golang(google.golang.org/api/internal/gensupport)) = 0.110.0 -Provides: bundled(golang(google.golang.org/api/internal/impersonate)) = 0.110.0 -Provides: bundled(golang(google.golang.org/api/internal/third_party/uritemplates)) = 0.110.0 -Provides: bundled(golang(google.golang.org/api/iterator)) = 0.110.0 -Provides: bundled(golang(google.golang.org/api/option)) = 0.110.0 -Provides: bundled(golang(google.golang.org/api/option/internaloption)) = 0.110.0 -Provides: bundled(golang(google.golang.org/api/storage/v1)) = 0.110.0 -Provides: bundled(golang(google.golang.org/api/transport)) = 0.110.0 -Provides: bundled(golang(google.golang.org/api/transport/cert)) = 0.110.0 -Provides: bundled(golang(google.golang.org/api/transport/grpc)) = 0.110.0 -Provides: bundled(golang(google.golang.org/api/transport/http)) = 0.110.0 -Provides: bundled(golang(google.golang.org/api/transport/http/internal/propagation)) = 0.110.0 -Provides: bundled(golang(google.golang.org/api/transport/internal/dca)) = 0.110.0 +Provides: bundled(golang(golang.org/x/net/context)) = 0.12.0 +Provides: bundled(golang(golang.org/x/net/http2)) = 0.12.0 +Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.12.0 +Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.12.0 +Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.12.0 +Provides: bundled(golang(golang.org/x/net/idna)) = 0.12.0 +Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.12.0 +Provides: bundled(golang(golang.org/x/net/trace)) = 0.12.0 +Provides: bundled(golang(golang.org/x/oauth2)) = 0.10.0 +Provides: bundled(golang(golang.org/x/oauth2/authhandler)) = 0.10.0 +Provides: bundled(golang(golang.org/x/oauth2/google)) = 0.10.0 +Provides: bundled(golang(golang.org/x/oauth2/google/internal/externalaccount)) = 0.10.0 +Provides: bundled(golang(golang.org/x/oauth2/internal)) = 0.10.0 +Provides: bundled(golang(golang.org/x/oauth2/jws)) = 0.10.0 +Provides: bundled(golang(golang.org/x/oauth2/jwt)) = 0.10.0 +Provides: bundled(golang(golang.org/x/sys/cpu)) = 0.10.0 +Provides: bundled(golang(golang.org/x/sys/unix)) = 0.10.0 +Provides: bundled(golang(google.golang.org/api/googleapi)) = 0.130.0 +Provides: bundled(golang(google.golang.org/api/googleapi/transport)) = 0.130.0 +Provides: bundled(golang(google.golang.org/api/iamcredentials/v1)) = 0.130.0 +Provides: bundled(golang(google.golang.org/api/internal)) = 0.130.0 +Provides: bundled(golang(google.golang.org/api/internal/cert)) = 0.130.0 +Provides: bundled(golang(google.golang.org/api/internal/gensupport)) = 0.130.0 +Provides: bundled(golang(google.golang.org/api/internal/impersonate)) = 0.130.0 +Provides: bundled(golang(google.golang.org/api/internal/third_party/uritemplates)) = 0.130.0 +Provides: bundled(golang(google.golang.org/api/iterator)) = 0.130.0 +Provides: bundled(golang(google.golang.org/api/option)) = 0.130.0 +Provides: bundled(golang(google.golang.org/api/option/internaloption)) = 0.130.0 +Provides: bundled(golang(google.golang.org/api/storage/v1)) = 0.130.0 +Provides: bundled(golang(google.golang.org/api/transport)) = 0.130.0 +Provides: bundled(golang(google.golang.org/api/transport/grpc)) = 0.130.0 +Provides: bundled(golang(google.golang.org/api/transport/http)) = 0.130.0 +Provides: bundled(golang(google.golang.org/api/transport/http/internal/propagation)) = 0.130.0 +Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1 %description Ignition is a utility used to manipulate systems during the initramfs. @@ -333,6 +338,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_libexecdir}/coreos-check-ssh-keys %changelog +* Mon Jul 10 2023 Benjamin Gilbert - 2.16.1-1 +- New release + * Thu Jun 1 2023 Steven Presti - 2.15.0-4 - Switch License tags to SPDX diff --git a/sources b/sources index 4307b4a..1ccace3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-2.15.0.tar.gz) = f599fbd240d9de78a0765749fe9214700629150d7afbf35985683ab174eea6fd8f9de55a598edfa710de1412576d2dd057d116f8ad7e8c8459d4e7cc85d5a705 +SHA512 (ignition-2.16.1.tar.gz) = 59cd33eb60062545bcfe9c83dd641f9233ea2069c07b82afd76b9f6de362286234926de4a142f02725d5688e9e2b8bed8444fbf722ce00a225c1504b4b3c7ff8 SHA512 (ignition-edge-a3a8f0a.tar.gz) = ef04cd411752f1b48fdb64ae8e45a2234b635a19ead82483cb33e246697e6ae639f6036030e7647913f5f589532f3d015bcc81848db50ebe8800242f6f23230a From 8d182d2a72c5772207018cedb97d97e9105da517 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Wed, 12 Jul 2023 16:58:39 -0400 Subject: [PATCH 138/172] Update to 2.16.2 --- .gitignore | 1 + ignition.spec | 5 ++++- sources | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index e408f41..66e27c6 100644 --- a/.gitignore +++ b/.gitignore @@ -61,3 +61,4 @@ /ignition-2.15.0.tar.gz /ignition-edge-a3a8f0a.tar.gz /ignition-2.16.1.tar.gz +/ignition-2.16.2.tar.gz diff --git a/ignition.spec b/ignition.spec index 113b2d7..327a690 100644 --- a/ignition.spec +++ b/ignition.spec @@ -13,7 +13,7 @@ # https://github.com/coreos/ignition %global goipath github.com/coreos/ignition %global gomodulesmode GO111MODULE=on -Version: 2.16.1 +Version: 2.16.2 %gometa @@ -338,6 +338,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_libexecdir}/coreos-check-ssh-keys %changelog +* Wed Jul 12 2023 Benjamin Gilbert - 2.16.2-1 +- New release + * Mon Jul 10 2023 Benjamin Gilbert - 2.16.1-1 - New release diff --git a/sources b/sources index 1ccace3..88a6a1f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-2.16.1.tar.gz) = 59cd33eb60062545bcfe9c83dd641f9233ea2069c07b82afd76b9f6de362286234926de4a142f02725d5688e9e2b8bed8444fbf722ce00a225c1504b4b3c7ff8 +SHA512 (ignition-2.16.2.tar.gz) = bb8b3b5eab89d8d4bffe830a9be6fc5f7c6f52db6de799e3fe87e04a6e3a1377496b1c97a5a9e72e91b66bf561dec5eead738794f1a2ffc0acdfa31ba7349892 SHA512 (ignition-edge-a3a8f0a.tar.gz) = ef04cd411752f1b48fdb64ae8e45a2234b635a19ead82483cb33e246697e6ae639f6036030e7647913f5f589532f3d015bcc81848db50ebe8800242f6f23230a From c4b231c156ff672aaecbf14ab0f1824b0f354af9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 07:17:05 +0000 Subject: [PATCH 139/172] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- ignition.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index 327a690..5324307 100644 --- a/ignition.spec +++ b/ignition.spec @@ -22,7 +22,7 @@ Version: 2.16.2 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 1%{?dist} +Release: 2%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -338,6 +338,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_libexecdir}/coreos-check-ssh-keys %changelog +* 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 From 4e94fa6ca44c15289feb06c5cd2ffe6c88365209 Mon Sep 17 00:00:00 2001 From: Steven Presti Date: Wed, 22 Nov 2023 13:47:54 -0500 Subject: [PATCH 140/172] Update to 2.17.0 --- .gitignore | 1 + ignition.spec | 195 ++++++++++++++++++++++++++------------------------ sources | 2 +- 3 files changed, 103 insertions(+), 95 deletions(-) diff --git a/.gitignore b/.gitignore index 66e27c6..9c882a1 100644 --- a/.gitignore +++ b/.gitignore @@ -62,3 +62,4 @@ /ignition-edge-a3a8f0a.tar.gz /ignition-2.16.1.tar.gz /ignition-2.16.2.tar.gz +/ignition-2.17.0.tar.gz diff --git a/ignition.spec b/ignition.spec index 5324307..9c887f9 100644 --- a/ignition.spec +++ b/ignition.spec @@ -13,7 +13,7 @@ # https://github.com/coreos/ignition %global goipath github.com/coreos/ignition %global gomodulesmode GO111MODULE=on -Version: 2.16.2 +Version: 2.17.0 %gometa @@ -22,7 +22,7 @@ Version: 2.16.2 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 2%{?dist} +Release: 1%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -45,65 +45,65 @@ Requires: dracut-network # Generated by `go-mods-to-bundled-provides.py | sort` Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.2.3 -Provides: bundled(golang(cloud.google.com/go/storage)) = 1.31.0 -Provides: bundled(golang(cloud.google.com/go/storage/internal)) = 1.31.0 -Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2)) = 1.31.0 -Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2/storagepb)) = 1.31.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/arn)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/auth/bearer)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/processcreds)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ssocreds)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/csm)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/context)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/arn)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/s3err)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkmath)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/strings)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sync/singleflight)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/checksum)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/json/jsonutil)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/jsonrpc)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restjson)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/ssooidc)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso/ssoiface)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.44.298 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts/stsiface)) = 1.44.298 +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.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.3.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 @@ -114,7 +114,8 @@ Provides: bundled(golang(github.com/coreos/vcontext/report)) = 0.0.0-20230201181 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.0 -Provides: bundled(golang(github.com/google/uuid)) = 1.3.0 +Provides: bundled(golang(github.com/google/uuid)) = 1.4.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 @@ -126,39 +127,42 @@ Provides: bundled(golang(github.com/vmware/vmw-guestinfo/message)) = 0.0.0-20220 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/context)) = 0.12.0 -Provides: bundled(golang(golang.org/x/net/http2)) = 0.12.0 -Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.12.0 -Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.12.0 -Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.12.0 -Provides: bundled(golang(golang.org/x/net/idna)) = 0.12.0 -Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.12.0 -Provides: bundled(golang(golang.org/x/net/trace)) = 0.12.0 -Provides: bundled(golang(golang.org/x/oauth2)) = 0.10.0 -Provides: bundled(golang(golang.org/x/oauth2/authhandler)) = 0.10.0 -Provides: bundled(golang(golang.org/x/oauth2/google)) = 0.10.0 -Provides: bundled(golang(golang.org/x/oauth2/google/internal/externalaccount)) = 0.10.0 -Provides: bundled(golang(golang.org/x/oauth2/internal)) = 0.10.0 -Provides: bundled(golang(golang.org/x/oauth2/jws)) = 0.10.0 -Provides: bundled(golang(golang.org/x/oauth2/jwt)) = 0.10.0 -Provides: bundled(golang(golang.org/x/sys/cpu)) = 0.10.0 -Provides: bundled(golang(golang.org/x/sys/unix)) = 0.10.0 -Provides: bundled(golang(google.golang.org/api/googleapi)) = 0.130.0 -Provides: bundled(golang(google.golang.org/api/googleapi/transport)) = 0.130.0 -Provides: bundled(golang(google.golang.org/api/iamcredentials/v1)) = 0.130.0 -Provides: bundled(golang(google.golang.org/api/internal)) = 0.130.0 -Provides: bundled(golang(google.golang.org/api/internal/cert)) = 0.130.0 -Provides: bundled(golang(google.golang.org/api/internal/gensupport)) = 0.130.0 -Provides: bundled(golang(google.golang.org/api/internal/impersonate)) = 0.130.0 -Provides: bundled(golang(google.golang.org/api/internal/third_party/uritemplates)) = 0.130.0 -Provides: bundled(golang(google.golang.org/api/iterator)) = 0.130.0 -Provides: bundled(golang(google.golang.org/api/option)) = 0.130.0 -Provides: bundled(golang(google.golang.org/api/option/internaloption)) = 0.130.0 -Provides: bundled(golang(google.golang.org/api/storage/v1)) = 0.130.0 -Provides: bundled(golang(google.golang.org/api/transport)) = 0.130.0 -Provides: bundled(golang(google.golang.org/api/transport/grpc)) = 0.130.0 -Provides: bundled(golang(google.golang.org/api/transport/http)) = 0.130.0 -Provides: bundled(golang(google.golang.org/api/transport/http/internal/propagation)) = 0.130.0 +Provides: bundled(golang(golang.org/x/net/bpf)) = 0.18.0 +Provides: bundled(golang(golang.org/x/net/context)) = 0.18.0 +Provides: bundled(golang(golang.org/x/net/http2)) = 0.18.0 +Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.18.0 +Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.18.0 +Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.18.0 +Provides: bundled(golang(golang.org/x/net/idna)) = 0.18.0 +Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.18.0 +Provides: bundled(golang(golang.org/x/net/trace)) = 0.18.0 +Provides: bundled(golang(golang.org/x/oauth2)) = 0.14.0 +Provides: bundled(golang(golang.org/x/oauth2/authhandler)) = 0.14.0 +Provides: bundled(golang(golang.org/x/oauth2/google)) = 0.14.0 +Provides: bundled(golang(golang.org/x/oauth2/google/internal/externalaccount)) = 0.14.0 +Provides: bundled(golang(golang.org/x/oauth2/google/internal/externalaccountauthorizeduser)) = 0.14.0 +Provides: bundled(golang(golang.org/x/oauth2/google/internal/stsexchange)) = 0.14.0 +Provides: bundled(golang(golang.org/x/oauth2/internal)) = 0.14.0 +Provides: bundled(golang(golang.org/x/oauth2/jws)) = 0.14.0 +Provides: bundled(golang(golang.org/x/oauth2/jwt)) = 0.14.0 +Provides: bundled(golang(golang.org/x/sys/cpu)) = 0.14.0 +Provides: bundled(golang(golang.org/x/sys/unix)) = 0.14.0 +Provides: bundled(golang(google.golang.org/api/googleapi)) = 0.151.0 +Provides: bundled(golang(google.golang.org/api/googleapi/transport)) = 0.151.0 +Provides: bundled(golang(google.golang.org/api/iamcredentials/v1)) = 0.151.0 +Provides: bundled(golang(google.golang.org/api/internal)) = 0.151.0 +Provides: bundled(golang(google.golang.org/api/internal/cert)) = 0.151.0 +Provides: bundled(golang(google.golang.org/api/internal/gensupport)) = 0.151.0 +Provides: bundled(golang(google.golang.org/api/internal/impersonate)) = 0.151.0 +Provides: bundled(golang(google.golang.org/api/internal/third_party/uritemplates)) = 0.151.0 +Provides: bundled(golang(google.golang.org/api/iterator)) = 0.151.0 +Provides: bundled(golang(google.golang.org/api/option)) = 0.151.0 +Provides: bundled(golang(google.golang.org/api/option/internaloption)) = 0.151.0 +Provides: bundled(golang(google.golang.org/api/storage/v1)) = 0.151.0 +Provides: bundled(golang(google.golang.org/api/transport)) = 0.151.0 +Provides: bundled(golang(google.golang.org/api/transport/grpc)) = 0.151.0 +Provides: bundled(golang(google.golang.org/api/transport/http)) = 0.151.0 +Provides: bundled(golang(google.golang.org/api/transport/http/internal/propagation)) = 0.151.0 Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1 %description @@ -338,6 +342,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_libexecdir}/coreos-check-ssh-keys %changelog +* Wed Nov 22 2023 Steven Prestil - 2.17.0-1 +- New release + * Thu Jul 20 2023 Fedora Release Engineering - 2.16.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild diff --git a/sources b/sources index 88a6a1f..eefe368 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-2.16.2.tar.gz) = bb8b3b5eab89d8d4bffe830a9be6fc5f7c6f52db6de799e3fe87e04a6e3a1377496b1c97a5a9e72e91b66bf561dec5eead738794f1a2ffc0acdfa31ba7349892 +SHA512 (ignition-2.17.0.tar.gz) = cfbe1ec0fbeee66e568b2943a6893d11f3965867f85dc4005b3dc10299f314bf7e64141c68867a8422dfd911534011a714631c78921abebbaaa0d9705cb5a336 SHA512 (ignition-edge-a3a8f0a.tar.gz) = ef04cd411752f1b48fdb64ae8e45a2234b635a19ead82483cb33e246697e6ae639f6036030e7647913f5f589532f3d015bcc81848db50ebe8800242f6f23230a From a14d6588b3ce145632526861bfef839c1f3287b4 Mon Sep 17 00:00:00 2001 From: Steven Presti Date: Fri, 15 Dec 2023 16:49:48 -0500 Subject: [PATCH 141/172] Add ignition-grub subpackage --- ignition.spec | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index 9c887f9..9565eaa 100644 --- a/ignition.spec +++ b/ignition.spec @@ -22,7 +22,7 @@ Version: 2.17.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 1%{?dist} +Release: 2%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -221,6 +221,16 @@ License: Apache-2.0 This package contains dracut modules, services and binaries needed to enable Ignition on IoT/Edge systems. +############## ignition-grub subpackage ############## + +%package ignition-grub + +Summary: Enablement glue for bootupd's grub2 config +License: Apache-2.0 + +%description ignition-grub +This package contains the grub2 config which is compatable with bootupd. + %prep %if 0%{?fedora} %goprep -k @@ -275,6 +285,10 @@ 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 +# 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} install -p -m 0755 ./ignition-validate %{buildroot}%{_bindir} @@ -341,7 +355,15 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_libexecdir}/coreos-ignition-write-issues %{_libexecdir}/coreos-check-ssh-keys +%files ignition-grub +%doc README.md +%license %{golicenses} +%{_libdir}/bootupd/grub2-static/configs.d/ignition.cfg + %changelog +* 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 From 5ac6552b775161a67fdfee54a832efd308112dbb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jan 2024 22:58:03 +0000 Subject: [PATCH 142/172] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ignition.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index 9565eaa..44545ae 100644 --- a/ignition.spec +++ b/ignition.spec @@ -22,7 +22,7 @@ Version: 2.17.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 2%{?dist} +Release: 3%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -361,6 +361,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_libdir}/bootupd/grub2-static/configs.d/ignition.cfg %changelog +* 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 From 68751ea10a43a98f2b5c458ce2faf9a2be6a43c2 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 24 Jan 2024 22:36:21 +0000 Subject: [PATCH 143/172] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- ignition.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index 44545ae..16d2b44 100644 --- a/ignition.spec +++ b/ignition.spec @@ -22,7 +22,7 @@ Version: 2.17.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 3%{?dist} +Release: 4%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -361,6 +361,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_libdir}/bootupd/grub2-static/configs.d/ignition.cfg %changelog +* 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 From 6296657697f8b49a7d0e6e59ec812fe39648f1a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Fri, 9 Feb 2024 11:42:19 +0100 Subject: [PATCH 144/172] Backport fix for unexpected Azure IMDS status codes See: https://github.com/coreos/ignition/issues/1806 --- ...TP-requests-on-codes-404-410-and-429.patch | 97 +++++++++++++++++++ ignition.spec | 7 +- 2 files changed, 103 insertions(+), 1 deletion(-) create mode 100644 0001-azure-retry-HTTP-requests-on-codes-404-410-and-429.patch diff --git a/0001-azure-retry-HTTP-requests-on-codes-404-410-and-429.patch b/0001-azure-retry-HTTP-requests-on-codes-404-410-and-429.patch new file mode 100644 index 0000000..a49a0a4 --- /dev/null +++ b/0001-azure-retry-HTTP-requests-on-codes-404-410-and-429.patch @@ -0,0 +1,97 @@ +From 3babc7a5b767fb60ca877213d9201568205e983f Mon Sep 17 00:00:00 2001 +From: Jonathan Lebon +Date: Thu, 8 Feb 2024 11:02:27 -0500 +Subject: [PATCH] azure: retry HTTP requests on codes 404, 410, and 429 + +For some reason, the Azure IMDS server expects clients to retry their +HTTP requests even on codes that usually would be considered final. +The documented one is 410[[1]], but let's just match the set from +cloud-init, which also includes 404 and 429[[2]]. + +Closes: #1806 + +[1]: https://learn.microsoft.com/en-us/azure/virtual-machines/instance-metadata-service?tabs=linux#errors-and-debugging +[2]: https://github.com/canonical/cloud-init/commit/c1a2047cf291 + +travier: Edited to cleanly backport on top of 2.17.0 +--- + internal/providers/azure/azure.go | 11 ++++++++++- + internal/resource/http.go | 17 ++++++++++++++++- + internal/resource/url.go | 4 ++++ + 3 files changed, 30 insertions(+), 2 deletions(-) + +diff --git a/internal/providers/azure/azure.go b/internal/providers/azure/azure.go +index d3115f2b..caddcff5 100644 +--- a/internal/providers/azure/azure.go ++++ b/internal/providers/azure/azure.go +@@ -112,7 +112,16 @@ func fetchFromIMDS(f *resource.Fetcher) ([]byte, error) { + headers := make(http.Header) + headers.Set("Metadata", "true") + +- data, err := f.FetchToBuffer(imdsUserdataURL, resource.FetchOptions{Headers: headers}) ++ // Azure IMDS expects some codes <500 to still be retried... ++ // Here, we match the cloud-init set. ++ // https://github.com/canonical/cloud-init/commit/c1a2047cf291 ++ // https://github.com/coreos/ignition/issues/1806 ++ retryCodes := []int{ ++ 404, // not found ++ 410, // gone ++ 429, // rate-limited ++ } ++ data, err := f.FetchToBuffer(imdsUserdataURL, resource.FetchOptions{Headers: headers, RetryCodes: retryCodes}) + if err != nil { + return nil, fmt.Errorf("fetching to buffer: %w", err) + } +diff --git a/internal/resource/http.go b/internal/resource/http.go +index 0d8edace..872ce253 100644 +--- a/internal/resource/http.go ++++ b/internal/resource/http.go +@@ -263,6 +263,21 @@ func (f *Fetcher) newHttpClient() error { + return nil + } + ++func shouldRetryHttp(statusCode int, opts FetchOptions) bool { ++ // we always retry 500+ ++ if statusCode >= 500 { ++ return true ++ } ++ ++ for _, retryCode := range opts.RetryCodes { ++ if statusCode == retryCode { ++ return true ++ } ++ } ++ ++ return false ++} ++ + // httpReaderWithHeader performs an HTTP request on the provided URL with the + // provided request header & method and returns the response body Reader, HTTP + // status code, a cancel function for the result's context, and error (if any). +@@ -298,7 +313,7 @@ func (c HttpClient) httpReaderWithHeader(opts FetchOptions, url string) (io.Read + + if err == nil { + c.logger.Info("%s result: %s", opts.HTTPVerb, http.StatusText(resp.StatusCode)) +- if resp.StatusCode < 500 { ++ if !shouldRetryHttp(resp.StatusCode, opts) { + return resp.Body, resp.StatusCode, cancelFn, nil + } + resp.Body.Close() +diff --git a/internal/resource/url.go b/internal/resource/url.go +index 58e0b9fc..3d16cc59 100644 +--- a/internal/resource/url.go ++++ b/internal/resource/url.go +@@ -125,6 +125,10 @@ type FetchOptions struct { + // HTTPVerb is an HTTP request method to indicate the desired action to + // be performed for a given resource. + HTTPVerb string ++ ++ // List of HTTP codes to retry that usually would be considered as complete. ++ // Status codes >= 500 are always retried. ++ RetryCodes []int + } + + // FetchToBuffer will fetch the given url into a temporary file, and then read +-- +2.43.0 + diff --git a/ignition.spec b/ignition.spec index 16d2b44..61ad84e 100644 --- a/ignition.spec +++ b/ignition.spec @@ -22,7 +22,7 @@ Version: 2.17.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 4%{?dist} +Release: 5%{?dist} Summary: First boot installer and configuration tool # 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-azure-retry-HTTP-requests-on-codes-404-410-and-429.patch + BuildRequires: libblkid-devel BuildRequires: systemd-rpm-macros @@ -361,6 +363,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_libdir}/bootupd/grub2-static/configs.d/ignition.cfg %changelog +* Fri Feb 09 2024 Timothée Ravier - 2.17.0-5 +- Backport fix for unexpected Azure IMDS status codes + * Wed Jan 24 2024 Fedora Release Engineering - 2.17.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 03bd1df84044772b3da417a465e5ccc35beaaaa7 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Sun, 11 Feb 2024 23:27:50 +0000 Subject: [PATCH 145/172] Rebuild for golang 1.22.0 --- ignition.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index 61ad84e..32d9628 100644 --- a/ignition.spec +++ b/ignition.spec @@ -22,7 +22,7 @@ Version: 2.17.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 5%{?dist} +Release: 6%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -363,6 +363,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_libdir}/bootupd/grub2-static/configs.d/ignition.cfg %changelog +* Sun Feb 11 2024 Maxwell G - 2.17.0-6 +- Rebuild for golang 1.22.0 + * Fri Feb 09 2024 Timothée Ravier - 2.17.0-5 - Backport fix for unexpected Azure IMDS status codes From bffea0111666425ca1366cbcfbfbe25bf6d8271f Mon Sep 17 00:00:00 2001 From: Yasmin Valim Date: Mon, 4 Mar 2024 15:07:27 -0300 Subject: [PATCH 146/172] Update to 2.18.0 --- .gitignore | 1 + ...TP-requests-on-codes-404-410-and-429.patch | 97 --------- ignition.spec | 203 +++++++++--------- sources | 2 +- 4 files changed, 105 insertions(+), 198 deletions(-) delete mode 100644 0001-azure-retry-HTTP-requests-on-codes-404-410-and-429.patch diff --git a/.gitignore b/.gitignore index 9c882a1..402d704 100644 --- a/.gitignore +++ b/.gitignore @@ -63,3 +63,4 @@ /ignition-2.16.1.tar.gz /ignition-2.16.2.tar.gz /ignition-2.17.0.tar.gz +/ignition-2.18.0.tar.gz diff --git a/0001-azure-retry-HTTP-requests-on-codes-404-410-and-429.patch b/0001-azure-retry-HTTP-requests-on-codes-404-410-and-429.patch deleted file mode 100644 index a49a0a4..0000000 --- a/0001-azure-retry-HTTP-requests-on-codes-404-410-and-429.patch +++ /dev/null @@ -1,97 +0,0 @@ -From 3babc7a5b767fb60ca877213d9201568205e983f Mon Sep 17 00:00:00 2001 -From: Jonathan Lebon -Date: Thu, 8 Feb 2024 11:02:27 -0500 -Subject: [PATCH] azure: retry HTTP requests on codes 404, 410, and 429 - -For some reason, the Azure IMDS server expects clients to retry their -HTTP requests even on codes that usually would be considered final. -The documented one is 410[[1]], but let's just match the set from -cloud-init, which also includes 404 and 429[[2]]. - -Closes: #1806 - -[1]: https://learn.microsoft.com/en-us/azure/virtual-machines/instance-metadata-service?tabs=linux#errors-and-debugging -[2]: https://github.com/canonical/cloud-init/commit/c1a2047cf291 - -travier: Edited to cleanly backport on top of 2.17.0 ---- - internal/providers/azure/azure.go | 11 ++++++++++- - internal/resource/http.go | 17 ++++++++++++++++- - internal/resource/url.go | 4 ++++ - 3 files changed, 30 insertions(+), 2 deletions(-) - -diff --git a/internal/providers/azure/azure.go b/internal/providers/azure/azure.go -index d3115f2b..caddcff5 100644 ---- a/internal/providers/azure/azure.go -+++ b/internal/providers/azure/azure.go -@@ -112,7 +112,16 @@ func fetchFromIMDS(f *resource.Fetcher) ([]byte, error) { - headers := make(http.Header) - headers.Set("Metadata", "true") - -- data, err := f.FetchToBuffer(imdsUserdataURL, resource.FetchOptions{Headers: headers}) -+ // Azure IMDS expects some codes <500 to still be retried... -+ // Here, we match the cloud-init set. -+ // https://github.com/canonical/cloud-init/commit/c1a2047cf291 -+ // https://github.com/coreos/ignition/issues/1806 -+ retryCodes := []int{ -+ 404, // not found -+ 410, // gone -+ 429, // rate-limited -+ } -+ data, err := f.FetchToBuffer(imdsUserdataURL, resource.FetchOptions{Headers: headers, RetryCodes: retryCodes}) - if err != nil { - return nil, fmt.Errorf("fetching to buffer: %w", err) - } -diff --git a/internal/resource/http.go b/internal/resource/http.go -index 0d8edace..872ce253 100644 ---- a/internal/resource/http.go -+++ b/internal/resource/http.go -@@ -263,6 +263,21 @@ func (f *Fetcher) newHttpClient() error { - return nil - } - -+func shouldRetryHttp(statusCode int, opts FetchOptions) bool { -+ // we always retry 500+ -+ if statusCode >= 500 { -+ return true -+ } -+ -+ for _, retryCode := range opts.RetryCodes { -+ if statusCode == retryCode { -+ return true -+ } -+ } -+ -+ return false -+} -+ - // httpReaderWithHeader performs an HTTP request on the provided URL with the - // provided request header & method and returns the response body Reader, HTTP - // status code, a cancel function for the result's context, and error (if any). -@@ -298,7 +313,7 @@ func (c HttpClient) httpReaderWithHeader(opts FetchOptions, url string) (io.Read - - if err == nil { - c.logger.Info("%s result: %s", opts.HTTPVerb, http.StatusText(resp.StatusCode)) -- if resp.StatusCode < 500 { -+ if !shouldRetryHttp(resp.StatusCode, opts) { - return resp.Body, resp.StatusCode, cancelFn, nil - } - resp.Body.Close() -diff --git a/internal/resource/url.go b/internal/resource/url.go -index 58e0b9fc..3d16cc59 100644 ---- a/internal/resource/url.go -+++ b/internal/resource/url.go -@@ -125,6 +125,10 @@ type FetchOptions struct { - // HTTPVerb is an HTTP request method to indicate the desired action to - // be performed for a given resource. - HTTPVerb string -+ -+ // List of HTTP codes to retry that usually would be considered as complete. -+ // Status codes >= 500 are always retried. -+ RetryCodes []int - } - - // FetchToBuffer will fetch the given url into a temporary file, and then read --- -2.43.0 - diff --git a/ignition.spec b/ignition.spec index 32d9628..d24888e 100644 --- a/ignition.spec +++ b/ignition.spec @@ -13,7 +13,7 @@ # https://github.com/coreos/ignition %global goipath github.com/coreos/ignition %global gomodulesmode GO111MODULE=on -Version: 2.17.0 +Version: 2.18.0 %gometa @@ -22,7 +22,7 @@ Version: 2.17.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 6%{?dist} +Release: 1%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -31,10 +31,9 @@ URL: %{gourl} Source0: %{gosource} Source1: https://github.com/fedora-iot/ignition-edge/archive/%{ignedgecommit}/ignition-edge-%{ignedgeshortcommit}.tar.gz -Patch0: 0001-azure-retry-HTTP-requests-on-codes-404-410-and-429.patch - BuildRequires: libblkid-devel BuildRequires: systemd-rpm-macros +ExcludeArch: %{ix86} # Requires for 'disks' stage %if 0%{?fedora} @@ -47,65 +46,65 @@ Requires: dracut-network # Generated by `go-mods-to-bundled-provides.py | sort` Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.2.3 -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.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.4.0 +Provides: bundled(golang(cloud.google.com/go/storage)) = 1.38.0 +Provides: bundled(golang(cloud.google.com/go/storage/internal)) = 1.38.0 +Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2)) = 1.38.0 +Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2/storagepb)) = 1.38.0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/arn)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/auth/bearer)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/processcreds)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ssocreds)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/csm)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/context)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/arn)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/s3err)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkmath)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/strings)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sync/singleflight)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/checksum)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/json/jsonutil)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/jsonrpc)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restjson)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/ssooidc)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso/ssoiface)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.50.25 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts/stsiface)) = 1.50.25 +Provides: bundled(golang(github.com/beevik/etree)) = 1.3.0 +Provides: bundled(golang(github.com/containers/libhvee/pkg/kvp)) = 0.6.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 @@ -116,7 +115,7 @@ Provides: bundled(golang(github.com/coreos/vcontext/report)) = 0.0.0-20230201181 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.0 -Provides: bundled(golang(github.com/google/uuid)) = 1.4.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 @@ -129,42 +128,42 @@ Provides: bundled(golang(github.com/vmware/vmw-guestinfo/message)) = 0.0.0-20220 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.18.0 -Provides: bundled(golang(golang.org/x/net/context)) = 0.18.0 -Provides: bundled(golang(golang.org/x/net/http2)) = 0.18.0 -Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.18.0 -Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.18.0 -Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.18.0 -Provides: bundled(golang(golang.org/x/net/idna)) = 0.18.0 -Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.18.0 -Provides: bundled(golang(golang.org/x/net/trace)) = 0.18.0 -Provides: bundled(golang(golang.org/x/oauth2)) = 0.14.0 -Provides: bundled(golang(golang.org/x/oauth2/authhandler)) = 0.14.0 -Provides: bundled(golang(golang.org/x/oauth2/google)) = 0.14.0 -Provides: bundled(golang(golang.org/x/oauth2/google/internal/externalaccount)) = 0.14.0 -Provides: bundled(golang(golang.org/x/oauth2/google/internal/externalaccountauthorizeduser)) = 0.14.0 -Provides: bundled(golang(golang.org/x/oauth2/google/internal/stsexchange)) = 0.14.0 -Provides: bundled(golang(golang.org/x/oauth2/internal)) = 0.14.0 -Provides: bundled(golang(golang.org/x/oauth2/jws)) = 0.14.0 -Provides: bundled(golang(golang.org/x/oauth2/jwt)) = 0.14.0 -Provides: bundled(golang(golang.org/x/sys/cpu)) = 0.14.0 -Provides: bundled(golang(golang.org/x/sys/unix)) = 0.14.0 -Provides: bundled(golang(google.golang.org/api/googleapi)) = 0.151.0 -Provides: bundled(golang(google.golang.org/api/googleapi/transport)) = 0.151.0 -Provides: bundled(golang(google.golang.org/api/iamcredentials/v1)) = 0.151.0 -Provides: bundled(golang(google.golang.org/api/internal)) = 0.151.0 -Provides: bundled(golang(google.golang.org/api/internal/cert)) = 0.151.0 -Provides: bundled(golang(google.golang.org/api/internal/gensupport)) = 0.151.0 -Provides: bundled(golang(google.golang.org/api/internal/impersonate)) = 0.151.0 -Provides: bundled(golang(google.golang.org/api/internal/third_party/uritemplates)) = 0.151.0 -Provides: bundled(golang(google.golang.org/api/iterator)) = 0.151.0 -Provides: bundled(golang(google.golang.org/api/option)) = 0.151.0 -Provides: bundled(golang(google.golang.org/api/option/internaloption)) = 0.151.0 -Provides: bundled(golang(google.golang.org/api/storage/v1)) = 0.151.0 -Provides: bundled(golang(google.golang.org/api/transport)) = 0.151.0 -Provides: bundled(golang(google.golang.org/api/transport/grpc)) = 0.151.0 -Provides: bundled(golang(google.golang.org/api/transport/http)) = 0.151.0 -Provides: bundled(golang(google.golang.org/api/transport/http/internal/propagation)) = 0.151.0 +Provides: bundled(golang(golang.org/x/net/bpf)) = 0.21.0 +Provides: bundled(golang(golang.org/x/net/http2)) = 0.21.0 +Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.21.0 +Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.21.0 +Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.21.0 +Provides: bundled(golang(golang.org/x/net/idna)) = 0.21.0 +Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.21.0 +Provides: bundled(golang(golang.org/x/net/trace)) = 0.21.0 +Provides: bundled(golang(golang.org/x/oauth2)) = 0.17.0 +Provides: bundled(golang(golang.org/x/oauth2/authhandler)) = 0.17.0 +Provides: bundled(golang(golang.org/x/oauth2/google)) = 0.17.0 +Provides: bundled(golang(golang.org/x/oauth2/google/internal/externalaccount)) = 0.17.0 +Provides: bundled(golang(golang.org/x/oauth2/google/internal/externalaccountauthorizeduser)) = 0.17.0 +Provides: bundled(golang(golang.org/x/oauth2/google/internal/stsexchange)) = 0.17.0 +Provides: bundled(golang(golang.org/x/oauth2/internal)) = 0.17.0 +Provides: bundled(golang(golang.org/x/oauth2/jws)) = 0.17.0 +Provides: bundled(golang(golang.org/x/oauth2/jwt)) = 0.17.0 +Provides: bundled(golang(golang.org/x/sys/cpu)) = 0.17.0 +Provides: bundled(golang(golang.org/x/sys/unix)) = 0.17.0 +Provides: bundled(golang(golang.org/x/sys/windows)) = 0.17.0 +Provides: bundled(golang(google.golang.org/api/googleapi)) = 0.167.0 +Provides: bundled(golang(google.golang.org/api/googleapi/transport)) = 0.167.0 +Provides: bundled(golang(google.golang.org/api/iamcredentials/v1)) = 0.167.0 +Provides: bundled(golang(google.golang.org/api/internal)) = 0.167.0 +Provides: bundled(golang(google.golang.org/api/internal/cert)) = 0.167.0 +Provides: bundled(golang(google.golang.org/api/internal/gensupport)) = 0.167.0 +Provides: bundled(golang(google.golang.org/api/internal/impersonate)) = 0.167.0 +Provides: bundled(golang(google.golang.org/api/internal/third_party/uritemplates)) = 0.167.0 +Provides: bundled(golang(google.golang.org/api/iterator)) = 0.167.0 +Provides: bundled(golang(google.golang.org/api/option)) = 0.167.0 +Provides: bundled(golang(google.golang.org/api/option/internaloption)) = 0.167.0 +Provides: bundled(golang(google.golang.org/api/storage/v1)) = 0.167.0 +Provides: bundled(golang(google.golang.org/api/transport)) = 0.167.0 +Provides: bundled(golang(google.golang.org/api/transport/grpc)) = 0.167.0 +Provides: bundled(golang(google.golang.org/api/transport/http)) = 0.167.0 +Provides: bundled(golang(google.golang.org/api/transport/http/internal/propagation)) = 0.167.0 Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1 %description @@ -363,6 +362,10 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_libdir}/bootupd/grub2-static/configs.d/ignition.cfg %changelog +* Mon Mar 4 2024 Yasmin de Souza - 2.18.0-1 +- New release +- Discontinue support for i686 + * Sun Feb 11 2024 Maxwell G - 2.17.0-6 - Rebuild for golang 1.22.0 diff --git a/sources b/sources index eefe368..4267e78 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-2.17.0.tar.gz) = cfbe1ec0fbeee66e568b2943a6893d11f3965867f85dc4005b3dc10299f314bf7e64141c68867a8422dfd911534011a714631c78921abebbaaa0d9705cb5a336 +SHA512 (ignition-2.18.0.tar.gz) = 8017d4d289b0c856805909669d05e54a044fd0fdbab88ad573ae4eee197c7cff6ec99997a356bfa138adc9597f75eba6e21e44e00d3f24b6dbf9878b71a5523c SHA512 (ignition-edge-a3a8f0a.tar.gz) = ef04cd411752f1b48fdb64ae8e45a2234b635a19ead82483cb33e246697e6ae639f6036030e7647913f5f589532f3d015bcc81848db50ebe8800242f6f23230a From 7af239fc873dacc8ca0a0b354796c13087bdcbeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Wed, 24 Apr 2024 17:35:06 +0200 Subject: [PATCH 147/172] Misc whitespace fixes --- ignition.spec | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ignition.spec b/ignition.spec index d24888e..d08c787 100644 --- a/ignition.spec +++ b/ignition.spec @@ -33,7 +33,8 @@ Source1: https://github.com/fedora-iot/ignition-edge/archive/%{ignedgecom BuildRequires: libblkid-devel BuildRequires: systemd-rpm-macros -ExcludeArch: %{ix86} + +ExcludeArch: %{ix86} # Requires for 'disks' stage %if 0%{?fedora} @@ -226,7 +227,7 @@ Ignition on IoT/Edge systems. %package ignition-grub -Summary: Enablement glue for bootupd's grub2 config +Summary: Enablement glue for bootupd's grub2 config License: Apache-2.0 %description ignition-grub @@ -446,7 +447,7 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition - New release * Wed Oct 13 2021 Sohan Kunkerkar - 2.12.0-3 -- Move Ignition report to /etc +- Move Ignition report to /etc * Thu Aug 26 2021 Sohan Kunkerkar - 2.12.0-2 - Disable file fragment writing logic for SSH authorized_keys on RHEL/CentOS From 30fd6a24c33ee6d9ae8d734a9676ca3ce88e43f3 Mon Sep 17 00:00:00 2001 From: Steven Presti Date: Wed, 5 Jun 2024 11:30:29 -0400 Subject: [PATCH 148/172] Update to 2.19.0 --- .gitignore | 1 + ignition.spec | 200 +++++++++++++++++++++++++------------------------- sources | 2 +- 3 files changed, 104 insertions(+), 99 deletions(-) diff --git a/.gitignore b/.gitignore index 402d704..f57263b 100644 --- a/.gitignore +++ b/.gitignore @@ -64,3 +64,4 @@ /ignition-2.16.2.tar.gz /ignition-2.17.0.tar.gz /ignition-2.18.0.tar.gz +/ignition-2.19.0.tar.gz diff --git a/ignition.spec b/ignition.spec index d08c787..d6626d8 100644 --- a/ignition.spec +++ b/ignition.spec @@ -13,7 +13,7 @@ # https://github.com/coreos/ignition %global goipath github.com/coreos/ignition %global gomodulesmode GO111MODULE=on -Version: 2.18.0 +Version: 2.19.0 %gometa @@ -46,66 +46,66 @@ Requires: dracut Requires: dracut-network # Generated by `go-mods-to-bundled-provides.py | sort` -Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.2.3 -Provides: bundled(golang(cloud.google.com/go/storage)) = 1.38.0 -Provides: bundled(golang(cloud.google.com/go/storage/internal)) = 1.38.0 -Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2)) = 1.38.0 -Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2/storagepb)) = 1.38.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/arn)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/auth/bearer)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/processcreds)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ssocreds)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/csm)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/context)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/arn)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/s3err)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkmath)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/strings)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sync/singleflight)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/checksum)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/json/jsonutil)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/jsonrpc)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restjson)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/ssooidc)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso/ssoiface)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.50.25 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts/stsiface)) = 1.50.25 -Provides: bundled(golang(github.com/beevik/etree)) = 1.3.0 -Provides: bundled(golang(github.com/containers/libhvee/pkg/kvp)) = 0.6.0 +Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.3.0 +Provides: bundled(golang(cloud.google.com/go/storage)) = 1.41.0 +Provides: bundled(golang(cloud.google.com/go/storage/internal)) = 1.41.0 +Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2)) = 1.41.0 +Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2/storagepb)) = 1.41.0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/arn)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/auth/bearer)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/processcreds)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ssocreds)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/csm)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/context)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/arn)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/s3err)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkmath)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/strings)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sync/singleflight)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/checksum)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/json/jsonutil)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/jsonrpc)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restjson)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/ssooidc)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso/ssoiface)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.53.5 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts/stsiface)) = 1.53.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.5.0 Provides: bundled(golang(github.com/coreos/go-systemd/v22/journal)) = 22.5.0 @@ -122,49 +122,50 @@ 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.6-0.20210604193023.gitd5e0c0615ace -Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.8.4 +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.21.0 -Provides: bundled(golang(golang.org/x/net/http2)) = 0.21.0 -Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.21.0 -Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.21.0 -Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.21.0 -Provides: bundled(golang(golang.org/x/net/idna)) = 0.21.0 -Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.21.0 -Provides: bundled(golang(golang.org/x/net/trace)) = 0.21.0 -Provides: bundled(golang(golang.org/x/oauth2)) = 0.17.0 -Provides: bundled(golang(golang.org/x/oauth2/authhandler)) = 0.17.0 -Provides: bundled(golang(golang.org/x/oauth2/google)) = 0.17.0 -Provides: bundled(golang(golang.org/x/oauth2/google/internal/externalaccount)) = 0.17.0 -Provides: bundled(golang(golang.org/x/oauth2/google/internal/externalaccountauthorizeduser)) = 0.17.0 -Provides: bundled(golang(golang.org/x/oauth2/google/internal/stsexchange)) = 0.17.0 -Provides: bundled(golang(golang.org/x/oauth2/internal)) = 0.17.0 -Provides: bundled(golang(golang.org/x/oauth2/jws)) = 0.17.0 -Provides: bundled(golang(golang.org/x/oauth2/jwt)) = 0.17.0 -Provides: bundled(golang(golang.org/x/sys/cpu)) = 0.17.0 -Provides: bundled(golang(golang.org/x/sys/unix)) = 0.17.0 -Provides: bundled(golang(golang.org/x/sys/windows)) = 0.17.0 -Provides: bundled(golang(google.golang.org/api/googleapi)) = 0.167.0 -Provides: bundled(golang(google.golang.org/api/googleapi/transport)) = 0.167.0 -Provides: bundled(golang(google.golang.org/api/iamcredentials/v1)) = 0.167.0 -Provides: bundled(golang(google.golang.org/api/internal)) = 0.167.0 -Provides: bundled(golang(google.golang.org/api/internal/cert)) = 0.167.0 -Provides: bundled(golang(google.golang.org/api/internal/gensupport)) = 0.167.0 -Provides: bundled(golang(google.golang.org/api/internal/impersonate)) = 0.167.0 -Provides: bundled(golang(google.golang.org/api/internal/third_party/uritemplates)) = 0.167.0 -Provides: bundled(golang(google.golang.org/api/iterator)) = 0.167.0 -Provides: bundled(golang(google.golang.org/api/option)) = 0.167.0 -Provides: bundled(golang(google.golang.org/api/option/internaloption)) = 0.167.0 -Provides: bundled(golang(google.golang.org/api/storage/v1)) = 0.167.0 -Provides: bundled(golang(google.golang.org/api/transport)) = 0.167.0 -Provides: bundled(golang(google.golang.org/api/transport/grpc)) = 0.167.0 -Provides: bundled(golang(google.golang.org/api/transport/http)) = 0.167.0 -Provides: bundled(golang(google.golang.org/api/transport/http/internal/propagation)) = 0.167.0 +Provides: bundled(golang(golang.org/x/net/bpf)) = 0.25.0 +Provides: bundled(golang(golang.org/x/net/http2)) = 0.25.0 +Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.25.0 +Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.25.0 +Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.25.0 +Provides: bundled(golang(golang.org/x/net/idna)) = 0.25.0 +Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.25.0 +Provides: bundled(golang(golang.org/x/net/trace)) = 0.25.0 +Provides: bundled(golang(golang.org/x/oauth2)) = 0.20.0 +Provides: bundled(golang(golang.org/x/oauth2/authhandler)) = 0.20.0 +Provides: bundled(golang(golang.org/x/oauth2/google)) = 0.20.0 +Provides: bundled(golang(golang.org/x/oauth2/google/externalaccount)) = 0.20.0 +Provides: bundled(golang(golang.org/x/oauth2/google/internal/externalaccountauthorizeduser)) = 0.20.0 +Provides: bundled(golang(golang.org/x/oauth2/google/internal/impersonate)) = 0.20.0 +Provides: bundled(golang(golang.org/x/oauth2/google/internal/stsexchange)) = 0.20.0 +Provides: bundled(golang(golang.org/x/oauth2/internal)) = 0.20.0 +Provides: bundled(golang(golang.org/x/oauth2/jws)) = 0.20.0 +Provides: bundled(golang(golang.org/x/oauth2/jwt)) = 0.20.0 +Provides: bundled(golang(golang.org/x/sys/cpu)) = 0.20.0 +Provides: bundled(golang(golang.org/x/sys/unix)) = 0.20.0 +Provides: bundled(golang(golang.org/x/sys/windows)) = 0.20.0 +Provides: bundled(golang(google.golang.org/api/googleapi)) = 0.181.0 +Provides: bundled(golang(google.golang.org/api/googleapi/transport)) = 0.181.0 +Provides: bundled(golang(google.golang.org/api/iamcredentials/v1)) = 0.181.0 +Provides: bundled(golang(google.golang.org/api/internal)) = 0.181.0 +Provides: bundled(golang(google.golang.org/api/internal/cert)) = 0.181.0 +Provides: bundled(golang(google.golang.org/api/internal/gensupport)) = 0.181.0 +Provides: bundled(golang(google.golang.org/api/internal/impersonate)) = 0.181.0 +Provides: bundled(golang(google.golang.org/api/internal/third_party/uritemplates)) = 0.181.0 +Provides: bundled(golang(google.golang.org/api/iterator)) = 0.181.0 +Provides: bundled(golang(google.golang.org/api/option)) = 0.181.0 +Provides: bundled(golang(google.golang.org/api/option/internaloption)) = 0.181.0 +Provides: bundled(golang(google.golang.org/api/storage/v1)) = 0.181.0 +Provides: bundled(golang(google.golang.org/api/transport)) = 0.181.0 +Provides: bundled(golang(google.golang.org/api/transport/grpc)) = 0.181.0 +Provides: bundled(golang(google.golang.org/api/transport/http)) = 0.181.0 +Provides: bundled(golang(google.golang.org/api/transport/http/internal/propagation)) = 0.181.0 Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1 %description @@ -363,6 +364,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_libdir}/bootupd/grub2-static/configs.d/ignition.cfg %changelog +* Wed Jun 05 2024 Steven Prestil - 2.19.0-1 +- New release + * Mon Mar 4 2024 Yasmin de Souza - 2.18.0-1 - New release - Discontinue support for i686 diff --git a/sources b/sources index 4267e78..fae5d77 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-2.18.0.tar.gz) = 8017d4d289b0c856805909669d05e54a044fd0fdbab88ad573ae4eee197c7cff6ec99997a356bfa138adc9597f75eba6e21e44e00d3f24b6dbf9878b71a5523c +SHA512 (ignition-2.19.0.tar.gz) = 3eef2609d94560b0f909a00b5475e534a99c7f1871b166745dc4ebee470082927d21f443d5ba40839749411aa86ba7ad8bc44f6e73f1e797850b07efb8b49485 SHA512 (ignition-edge-a3a8f0a.tar.gz) = ef04cd411752f1b48fdb64ae8e45a2234b635a19ead82483cb33e246697e6ae639f6036030e7647913f5f589532f3d015bcc81848db50ebe8800242f6f23230a From dc2702945ee6105fb6eef96bd82778a8e5822641 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 10:14:15 +0000 Subject: [PATCH 149/172] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- ignition.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index d6626d8..0a16410 100644 --- a/ignition.spec +++ b/ignition.spec @@ -22,7 +22,7 @@ Version: 2.19.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 1%{?dist} +Release: 2%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -364,6 +364,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_libdir}/bootupd/grub2-static/configs.d/ignition.cfg %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 2.19.0-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jun 05 2024 Steven Prestil - 2.19.0-1 - New release From dd57fc84aff35533e0ed89709c7bc0de59f0c26e Mon Sep 17 00:00:00 2001 From: Steven Presti Date: Wed, 23 Oct 2024 09:27:26 -0400 Subject: [PATCH 150/172] Update to 2.20.0 --- .gitignore | 1 + ignition.spec | 201 +++++++++++++++++++++++++------------------------- sources | 2 +- 3 files changed, 104 insertions(+), 100 deletions(-) diff --git a/.gitignore b/.gitignore index f57263b..9eadbdd 100644 --- a/.gitignore +++ b/.gitignore @@ -65,3 +65,4 @@ /ignition-2.17.0.tar.gz /ignition-2.18.0.tar.gz /ignition-2.19.0.tar.gz +/ignition-2.20.0.tar.gz diff --git a/ignition.spec b/ignition.spec index 0a16410..02e895f 100644 --- a/ignition.spec +++ b/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.20.0 %gometa @@ -22,7 +22,7 @@ Version: 2.19.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 2%{?dist} +Release: 1%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -47,63 +47,63 @@ Requires: dracut-network # Generated by `go-mods-to-bundled-provides.py | sort` Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.3.0 -Provides: bundled(golang(cloud.google.com/go/storage)) = 1.41.0 -Provides: bundled(golang(cloud.google.com/go/storage/internal)) = 1.41.0 -Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2)) = 1.41.0 -Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2/storagepb)) = 1.41.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/arn)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/auth/bearer)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/processcreds)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ssocreds)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/csm)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/context)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/arn)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/s3err)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkmath)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/strings)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sync/singleflight)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/checksum)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/json/jsonutil)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/jsonrpc)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restjson)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/ssooidc)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso/ssoiface)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.53.5 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts/stsiface)) = 1.53.5 +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 @@ -129,43 +129,43 @@ Provides: bundled(golang(github.com/vmware/vmw-guestinfo/message)) = 0.0.0-20220 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.25.0 -Provides: bundled(golang(golang.org/x/net/http2)) = 0.25.0 -Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.25.0 -Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.25.0 -Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.25.0 -Provides: bundled(golang(golang.org/x/net/idna)) = 0.25.0 -Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.25.0 -Provides: bundled(golang(golang.org/x/net/trace)) = 0.25.0 -Provides: bundled(golang(golang.org/x/oauth2)) = 0.20.0 -Provides: bundled(golang(golang.org/x/oauth2/authhandler)) = 0.20.0 -Provides: bundled(golang(golang.org/x/oauth2/google)) = 0.20.0 -Provides: bundled(golang(golang.org/x/oauth2/google/externalaccount)) = 0.20.0 -Provides: bundled(golang(golang.org/x/oauth2/google/internal/externalaccountauthorizeduser)) = 0.20.0 -Provides: bundled(golang(golang.org/x/oauth2/google/internal/impersonate)) = 0.20.0 -Provides: bundled(golang(golang.org/x/oauth2/google/internal/stsexchange)) = 0.20.0 -Provides: bundled(golang(golang.org/x/oauth2/internal)) = 0.20.0 -Provides: bundled(golang(golang.org/x/oauth2/jws)) = 0.20.0 -Provides: bundled(golang(golang.org/x/oauth2/jwt)) = 0.20.0 -Provides: bundled(golang(golang.org/x/sys/cpu)) = 0.20.0 -Provides: bundled(golang(golang.org/x/sys/unix)) = 0.20.0 -Provides: bundled(golang(golang.org/x/sys/windows)) = 0.20.0 -Provides: bundled(golang(google.golang.org/api/googleapi)) = 0.181.0 -Provides: bundled(golang(google.golang.org/api/googleapi/transport)) = 0.181.0 -Provides: bundled(golang(google.golang.org/api/iamcredentials/v1)) = 0.181.0 -Provides: bundled(golang(google.golang.org/api/internal)) = 0.181.0 -Provides: bundled(golang(google.golang.org/api/internal/cert)) = 0.181.0 -Provides: bundled(golang(google.golang.org/api/internal/gensupport)) = 0.181.0 -Provides: bundled(golang(google.golang.org/api/internal/impersonate)) = 0.181.0 -Provides: bundled(golang(google.golang.org/api/internal/third_party/uritemplates)) = 0.181.0 -Provides: bundled(golang(google.golang.org/api/iterator)) = 0.181.0 -Provides: bundled(golang(google.golang.org/api/option)) = 0.181.0 -Provides: bundled(golang(google.golang.org/api/option/internaloption)) = 0.181.0 -Provides: bundled(golang(google.golang.org/api/storage/v1)) = 0.181.0 -Provides: bundled(golang(google.golang.org/api/transport)) = 0.181.0 -Provides: bundled(golang(google.golang.org/api/transport/grpc)) = 0.181.0 -Provides: bundled(golang(google.golang.org/api/transport/http)) = 0.181.0 -Provides: bundled(golang(google.golang.org/api/transport/http/internal/propagation)) = 0.181.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 @@ -364,10 +364,13 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_libdir}/bootupd/grub2-static/configs.d/ignition.cfg %changelog +* Wed Oct 23 2024 Steven Presti - 2.20.0-1 +- New Release + * Thu Jul 18 2024 Fedora Release Engineering - 2.19.0-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild -* Wed Jun 05 2024 Steven Prestil - 2.19.0-1 +* Wed Jun 05 2024 Steven Presti - 2.19.0-1 - New release * Mon Mar 4 2024 Yasmin de Souza - 2.18.0-1 @@ -386,10 +389,10 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition * 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 +* Fri Dec 15 2023 Steven Presti - 2.17.0-2 - Add ignition-grub subpackage -* Wed Nov 22 2023 Steven Prestil - 2.17.0-1 +* Wed Nov 22 2023 Steven Presti - 2.17.0-1 - New release * Thu Jul 20 2023 Fedora Release Engineering - 2.16.2-2 diff --git a/sources b/sources index fae5d77..613ba32 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-2.19.0.tar.gz) = 3eef2609d94560b0f909a00b5475e534a99c7f1871b166745dc4ebee470082927d21f443d5ba40839749411aa86ba7ad8bc44f6e73f1e797850b07efb8b49485 +SHA512 (ignition-2.20.0.tar.gz) = 96429a9ad98a54bcc66c65c2b6be8def67371eb70e9df295d44fb5ffdc1915a524772214f39409a0872c52521fdad8e1e4c6f80e019413c77ca3491afe754584 SHA512 (ignition-edge-a3a8f0a.tar.gz) = ef04cd411752f1b48fdb64ae8e45a2234b635a19ead82483cb33e246697e6ae639f6036030e7647913f5f589532f3d015bcc81848db50ebe8800242f6f23230a From 9041937edf55d34861dc723a5d87ad71752f2943 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20Mart=C3=ADn?= Date: Wed, 11 Sep 2024 16:10:04 +0200 Subject: [PATCH 151/172] ignition-edge: Update ignition-edge commit MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add "fips" to ignition-edge dracut module dependencies, see: https://github.com/fedora-iot/ignition-edge/pull/2 Signed-off-by: Miguel Martín --- .gitignore | 1 + ignition.spec | 8 ++++++-- sources | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index 9eadbdd..1c4737c 100644 --- a/.gitignore +++ b/.gitignore @@ -66,3 +66,4 @@ /ignition-2.18.0.tar.gz /ignition-2.19.0.tar.gz /ignition-2.20.0.tar.gz +/ignition-edge-b8d1b7a.tar.gz diff --git a/ignition.spec b/ignition.spec index 02e895f..b94d2ec 100644 --- a/ignition.spec +++ b/ignition.spec @@ -7,7 +7,7 @@ %bcond_with check %endif -%global ignedgecommit a3a8f0abb2a1c7fc1c9e5d0e7a3e8830b2e2d766 +%global ignedgecommit b8d1b7a52c28fd5c33d15a0628d4b69f242f5c57 %global ignedgeshortcommit %(c=%{ignedgecommit}; echo ${c:0:7}) # https://github.com/coreos/ignition @@ -22,7 +22,7 @@ Version: 2.20.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 1%{?dist} +Release: 2%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -364,6 +364,10 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_libdir}/bootupd/grub2-static/configs.d/ignition.cfg %changelog +* Mon Oct 31 2024 Miguel Martín - 2.20.0-2 +- Update ignition-edge commit to include + - https://github.com/fedora-iot/ignition-edge/pull/2 + * Wed Oct 23 2024 Steven Presti - 2.20.0-1 - New Release diff --git a/sources b/sources index 613ba32..4e87dd2 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ignition-2.20.0.tar.gz) = 96429a9ad98a54bcc66c65c2b6be8def67371eb70e9df295d44fb5ffdc1915a524772214f39409a0872c52521fdad8e1e4c6f80e019413c77ca3491afe754584 -SHA512 (ignition-edge-a3a8f0a.tar.gz) = ef04cd411752f1b48fdb64ae8e45a2234b635a19ead82483cb33e246697e6ae639f6036030e7647913f5f589532f3d015bcc81848db50ebe8800242f6f23230a +SHA512 (ignition-edge-b8d1b7a.tar.gz) = 4ad167d89a4efeca8a24f24fe5a0bd2e5a1acfa86eb21653d84ad136236c727c328e7da890f3294a2e81b32e7b52435713e71fdbdd9d93d815f1c202b4f49f36 From 2a8319503ba83c9a6ac185957a53649a6ab11fc4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 07:00:15 +0000 Subject: [PATCH 152/172] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- ignition.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index b94d2ec..2a79e78 100644 --- a/ignition.spec +++ b/ignition.spec @@ -22,7 +22,7 @@ Version: 2.20.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 2%{?dist} +Release: 3%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -364,6 +364,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_libdir}/bootupd/grub2-static/configs.d/ignition.cfg %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 2.20.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Mon Oct 31 2024 Miguel Martín - 2.20.0-2 - Update ignition-edge commit to include - https://github.com/fedora-iot/ignition-edge/pull/2 From 6a5b176f6ca59be59bb420e404fa0757a74883d5 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Sun, 19 Jan 2025 02:55:23 -0500 Subject: [PATCH 153/172] Simpler generation of random -B value --- ignition.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index 2a79e78..0fb2e12 100644 --- a/ignition.spec +++ b/ignition.spec @@ -262,7 +262,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..." From 7411ec9287ae245b4b27e4926d9563a16e2f9174 Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Sun, 19 Jan 2025 01:47:12 -0500 Subject: [PATCH 154/172] Fix bogus date in changelog --- ignition.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index 0fb2e12..280ecea 100644 --- a/ignition.spec +++ b/ignition.spec @@ -367,7 +367,7 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition * Fri Jan 17 2025 Fedora Release Engineering - 2.20.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild -* Mon Oct 31 2024 Miguel Martín - 2.20.0-2 +* Tue Nov 05 2024 Miguel Martín - 2.20.0-2 - Update ignition-edge commit to include - https://github.com/fedora-iot/ignition-edge/pull/2 From d185bf7111ca9ea786b7d3efa30f1726729293bd Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Wed, 22 Jan 2025 16:48:25 -0500 Subject: [PATCH 155/172] Apply upstream patch for Go 1.24 compatibility --- ignition-2.20.0-go-1.24-compat.patch | 79 ++++++++++++++++++++++++++++ ignition.spec | 9 +++- 2 files changed, 87 insertions(+), 1 deletion(-) create mode 100644 ignition-2.20.0-go-1.24-compat.patch diff --git a/ignition-2.20.0-go-1.24-compat.patch b/ignition-2.20.0-go-1.24-compat.patch new file mode 100644 index 0000000..5240d07 --- /dev/null +++ b/ignition-2.20.0-go-1.24-compat.patch @@ -0,0 +1,79 @@ +From 116f0b82f7dc19461b5f0b09550c81f3489525ec Mon Sep 17 00:00:00 2001 +From: "FeRD (Frank Dana)" +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)" +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 + diff --git a/ignition.spec b/ignition.spec index 280ecea..ab10e93 100644 --- a/ignition.spec +++ b/ignition.spec @@ -22,7 +22,7 @@ Version: 2.20.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 3%{?dist} +Release: 4%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -31,6 +31,10 @@ 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 @@ -364,6 +368,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_libdir}/bootupd/grub2-static/configs.d/ignition.cfg %changelog +* Wed Jan 22 2025 FeRD (Frank Dana) - 2.20.0-4 +- Apply upstream patch for Go 1.24 compatibility + * Fri Jan 17 2025 Fedora Release Engineering - 2.20.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 4b614e8a3d72bb2861cec3e39d576cee436e1e72 Mon Sep 17 00:00:00 2001 From: djach7 Date: Mon, 27 Jan 2025 11:40:49 -0500 Subject: [PATCH 156/172] ignition-edge: Update ignition-edge commit Adds in bug fix to prevent read-only error on boot, see: https://github.com/fedora-iot/ignition-edge/pull/3 Signed-off-by: djach7 --- .gitignore | 2 +- ignition.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 1c4737c..64045ff 100644 --- a/.gitignore +++ b/.gitignore @@ -66,4 +66,4 @@ /ignition-2.18.0.tar.gz /ignition-2.19.0.tar.gz /ignition-2.20.0.tar.gz -/ignition-edge-b8d1b7a.tar.gz +/ignition-edge-a258749.tar.gz diff --git a/ignition.spec b/ignition.spec index ab10e93..8e6b3b9 100644 --- a/ignition.spec +++ b/ignition.spec @@ -7,7 +7,7 @@ %bcond_with check %endif -%global ignedgecommit b8d1b7a52c28fd5c33d15a0628d4b69f242f5c57 +%global ignedgecommit a2587490b2a9a215ad12cf15866025efbe027552 %global ignedgeshortcommit %(c=%{ignedgecommit}; echo ${c:0:7}) # https://github.com/coreos/ignition @@ -22,7 +22,7 @@ Version: 2.20.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 4%{?dist} +Release: 5%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -368,6 +368,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_libdir}/bootupd/grub2-static/configs.d/ignition.cfg %changelog +* Mon Jan 27 2025 David Jachimowicz - 2.20.0-5 +- Update ignition-edge commit to include https://github.com/fedora-iot/ignition-edge/pull/3 + * Wed Jan 22 2025 FeRD (Frank Dana) - 2.20.0-4 - Apply upstream patch for Go 1.24 compatibility diff --git a/sources b/sources index 4e87dd2..ab307d8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (ignition-2.20.0.tar.gz) = 96429a9ad98a54bcc66c65c2b6be8def67371eb70e9df295d44fb5ffdc1915a524772214f39409a0872c52521fdad8e1e4c6f80e019413c77ca3491afe754584 -SHA512 (ignition-edge-b8d1b7a.tar.gz) = 4ad167d89a4efeca8a24f24fe5a0bd2e5a1acfa86eb21653d84ad136236c727c328e7da890f3294a2e81b32e7b52435713e71fdbdd9d93d815f1c202b4f49f36 +SHA512 (ignition-edge-a258749.tar.gz) = 0566807f7f4cbf9715566c8c39ba699df00f4ee5d579269c695a4af13d75a4e1f4639b54be85d0703373221d67a3ad0c532c0e075831316e3eed7a33cf316833 From a13fc832991d52be743f12e16fc5af5652256720 Mon Sep 17 00:00:00 2001 From: Steven Presti Date: Fri, 14 Mar 2025 19:42:41 -0400 Subject: [PATCH 157/172] Update to 2.21.0 relates to: https://github.com/coreos/ignition/issues/2033 --- .gitignore | 1 + ignition-2.20.0-go-1.24-compat.patch | 79 ---------- ignition.spec | 227 ++++++++++++++------------- sources | 2 +- 4 files changed, 124 insertions(+), 185 deletions(-) delete mode 100644 ignition-2.20.0-go-1.24-compat.patch diff --git a/.gitignore b/.gitignore index 64045ff..07cc437 100644 --- a/.gitignore +++ b/.gitignore @@ -67,3 +67,4 @@ /ignition-2.19.0.tar.gz /ignition-2.20.0.tar.gz /ignition-edge-a258749.tar.gz +/ignition-2.21.0.tar.gz diff --git a/ignition-2.20.0-go-1.24-compat.patch b/ignition-2.20.0-go-1.24-compat.patch deleted file mode 100644 index 5240d07..0000000 --- a/ignition-2.20.0-go-1.24-compat.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 116f0b82f7dc19461b5f0b09550c81f3489525ec Mon Sep 17 00:00:00 2001 -From: "FeRD (Frank Dana)" -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)" -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 - diff --git a/ignition.spec b/ignition.spec index 8e6b3b9..15f18b4 100644 --- a/ignition.spec +++ b/ignition.spec @@ -13,7 +13,7 @@ # 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,7 +22,7 @@ Version: 2.20.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 5%{?dist} +Release: 1%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -31,10 +31,6 @@ 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 @@ -50,66 +46,82 @@ Requires: dracut Requires: dracut-network # Generated by `go-mods-to-bundled-provides.py | sort` -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(cloud.google.com/go/compute/metadata)) = 0.6.0 +Provides: bundled(golang(cloud.google.com/go/storage)) = 1.50.0 +Provides: bundled(golang(cloud.google.com/go/storage/experimental)) = 1.50.0 +Provides: bundled(golang(cloud.google.com/go/storage/internal)) = 1.50.0 +Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2)) = 1.50.0 +Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2/storagepb)) = 1.50.0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/arn)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/auth/bearer)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/processcreds)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ssocreds)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/csm)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/context)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/arn)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/s3err)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkmath)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/strings)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sync/singleflight)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/checksum)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/json/jsonutil)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/jsonrpc)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restjson)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/ssooidc)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso/ssoiface)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.55.6 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts/stsiface)) = 1.55.6 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/azidentity)) = 1.8.2 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/azidentity/internal)) = 1.8.2 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob)) = 1.6.0 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/appendblob)) = 1.6.0 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob)) = 1.6.0 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/bloberror)) = 1.6.0 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blockblob)) = 1.6.0 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container)) = 1.6.0 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/base)) = 1.6.0 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/exported)) = 1.6.0 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated)) = 1.6.0 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/shared)) = 1.6.0 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/pageblob)) = 1.6.0 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/sas)) = 1.6.0 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/service)) = 1.6.0 +Provides: bundled(golang(github.com/beevik/etree)) = 1.5.0 +Provides: bundled(golang(github.com/containers/libhvee/pkg/kvp)) = 0.10.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 @@ -125,51 +137,53 @@ 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.6-0.20210604193023.gitd5e0c0615ace -Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.9.0 +Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.6 +Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.10.0 +Provides: bundled(golang(github.com/stretchr/testify/assert/yaml)) = 1.10.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.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(golang.org/x/net/bpf)) = 0.37.0 +Provides: bundled(golang(golang.org/x/net/http2)) = 0.37.0 +Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.37.0 +Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.37.0 +Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.37.0 +Provides: bundled(golang(golang.org/x/net/idna)) = 0.37.0 +Provides: bundled(golang(golang.org/x/net/internal/httpcommon)) = 0.37.0 +Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.37.0 +Provides: bundled(golang(golang.org/x/net/trace)) = 0.37.0 +Provides: bundled(golang(golang.org/x/oauth2)) = 0.28.0 +Provides: bundled(golang(golang.org/x/oauth2/authhandler)) = 0.28.0 +Provides: bundled(golang(golang.org/x/oauth2/google)) = 0.28.0 +Provides: bundled(golang(golang.org/x/oauth2/google/externalaccount)) = 0.28.0 +Provides: bundled(golang(golang.org/x/oauth2/google/internal/externalaccountauthorizeduser)) = 0.28.0 +Provides: bundled(golang(golang.org/x/oauth2/google/internal/impersonate)) = 0.28.0 +Provides: bundled(golang(golang.org/x/oauth2/google/internal/stsexchange)) = 0.28.0 +Provides: bundled(golang(golang.org/x/oauth2/internal)) = 0.28.0 +Provides: bundled(golang(golang.org/x/oauth2/jws)) = 0.28.0 +Provides: bundled(golang(golang.org/x/oauth2/jwt)) = 0.28.0 +Provides: bundled(golang(golang.org/x/sys/cpu)) = 0.31.0 +Provides: bundled(golang(golang.org/x/sys/unix)) = 0.31.0 +Provides: bundled(golang(golang.org/x/sys/windows)) = 0.31.0 +Provides: bundled(golang(golang.org/x/sys/windows/registry)) = 0.31.0 +Provides: bundled(golang(google.golang.org/api/googleapi)) = 0.224.0 +Provides: bundled(golang(google.golang.org/api/googleapi/transport)) = 0.224.0 +Provides: bundled(golang(google.golang.org/api/iamcredentials/v1)) = 0.224.0 +Provides: bundled(golang(google.golang.org/api/internal)) = 0.224.0 +Provides: bundled(golang(google.golang.org/api/internal/cert)) = 0.224.0 +Provides: bundled(golang(google.golang.org/api/internal/gensupport)) = 0.224.0 +Provides: bundled(golang(google.golang.org/api/internal/impersonate)) = 0.224.0 +Provides: bundled(golang(google.golang.org/api/internal/third_party/uritemplates)) = 0.224.0 +Provides: bundled(golang(google.golang.org/api/iterator)) = 0.224.0 +Provides: bundled(golang(google.golang.org/api/option)) = 0.224.0 +Provides: bundled(golang(google.golang.org/api/option/internaloption)) = 0.224.0 +Provides: bundled(golang(google.golang.org/api/storage/v1)) = 0.224.0 +Provides: bundled(golang(google.golang.org/api/transport)) = 0.224.0 +Provides: bundled(golang(google.golang.org/api/transport/grpc)) = 0.224.0 +Provides: bundled(golang(google.golang.org/api/transport/http)) = 0.224.0 Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1 %description @@ -368,6 +382,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_libdir}/bootupd/grub2-static/configs.d/ignition.cfg %changelog +* Fri Mar 14 2025 Steven Presti - 2.21.0-1 +- New Release + * Mon Jan 27 2025 David Jachimowicz - 2.20.0-5 - Update ignition-edge commit to include https://github.com/fedora-iot/ignition-edge/pull/3 diff --git a/sources b/sources index ab307d8..e88cec3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-2.20.0.tar.gz) = 96429a9ad98a54bcc66c65c2b6be8def67371eb70e9df295d44fb5ffdc1915a524772214f39409a0872c52521fdad8e1e4c6f80e019413c77ca3491afe754584 +SHA512 (ignition-2.21.0.tar.gz) = f388dff9f0bf0bbe54ec2e6c88f35fab886b2ca7de6828c10456c0bfa44412d41e624682df1271c153ac9f721b4ace1e70104ee48760e19e13c257b99f8ab453 SHA512 (ignition-edge-a258749.tar.gz) = 0566807f7f4cbf9715566c8c39ba699df00f4ee5d579269c695a4af13d75a4e1f4639b54be85d0703373221d67a3ad0c532c0e075831316e3eed7a33cf316833 From a295b467f5e27c829048a45ff93282a561da59b9 Mon Sep 17 00:00:00 2001 From: Steven Presti Date: Wed, 19 Mar 2025 11:22:53 -0400 Subject: [PATCH 158/172] grub2: update install dir to be explicitly /lib correctly install grub config into /lib dir ref:https://github.com/coreos/ignition/pull/2037 --- ignition.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ignition.spec b/ignition.spec index 15f18b4..e9dae69 100644 --- a/ignition.spec +++ b/ignition.spec @@ -307,8 +307,8 @@ ln -sf ../lib/dracut/modules.d/30ignition/ignition %{buildroot}/%{_libexecdir}/i ln -sf ../lib/dracut/modules.d/30ignition/ignition %{buildroot}/%{_libexecdir}/ignition-rmcfg # 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/ +install -d -p %{buildroot}%{_prefix}/lib/bootupd/grub2-static/configs.d +install -p -m 0644 grub2/ignition.cfg %{buildroot}%{_prefix}/lib/bootupd/grub2-static/configs.d/ # ignition install -d -p %{buildroot}%{_bindir} @@ -379,9 +379,13 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %files ignition-grub %doc README.md %license %{golicenses} -%{_libdir}/bootupd/grub2-static/configs.d/ignition.cfg +%{_prefix}/lib/bootupd/grub2-static/configs.d/ignition.cfg %changelog +* Wed Mar 19 2025 Steven Presti - 2.21.0-2 +- 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 - 2.21.0-1 - New Release From 8a3dc87da941725a369e2d92f485ee69701ccb80 Mon Sep 17 00:00:00 2001 From: Steven Presti Date: Wed, 19 Mar 2025 11:45:48 -0400 Subject: [PATCH 159/172] ignition-ignition-grub: subpackage rename to ignition-grub --- ignition.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/ignition.spec b/ignition.spec index e9dae69..d638cd0 100644 --- a/ignition.spec +++ b/ignition.spec @@ -22,7 +22,7 @@ Version: 2.21.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 1%{?dist} +Release: 2%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -242,14 +242,16 @@ License: Apache-2.0 This package contains dracut modules, services and binaries needed to enable Ignition on IoT/Edge systems. -############## ignition-grub subpackage ############## - -%package ignition-grub +############## grub subpackage ############## +%package grub Summary: Enablement glue for bootupd's grub2 config License: Apache-2.0 -%description ignition-grub +# `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. %prep @@ -306,7 +308,7 @@ 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 -# ignition-grub +# grub install -d -p %{buildroot}%{_prefix}/lib/bootupd/grub2-static/configs.d install -p -m 0644 grub2/ignition.cfg %{buildroot}%{_prefix}/lib/bootupd/grub2-static/configs.d/ @@ -376,13 +378,14 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_libexecdir}/coreos-ignition-write-issues %{_libexecdir}/coreos-check-ssh-keys -%files ignition-grub +%files grub %doc README.md %license %{golicenses} %{_prefix}/lib/bootupd/grub2-static/configs.d/ignition.cfg %changelog * Wed Mar 19 2025 Steven Presti - 2.21.0-2 +- 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 From 931d3944d9aab8fad317c1da0f97f28b102ad99d Mon Sep 17 00:00:00 2001 From: Steven Presti Date: Thu, 20 Mar 2025 08:41:15 -0400 Subject: [PATCH 160/172] ignition.cfg: rename to 05_ignition.cfg and backport upstream rename --- ...-Rename-ignition.cfg-05_ignition.cfg.patch | 49 +++++++++++++++++++ ignition.spec | 8 ++- 2 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 0001-Rename-ignition.cfg-05_ignition.cfg.patch 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/ignition.spec b/ignition.spec index d638cd0..537f48e 100644 --- a/ignition.spec +++ b/ignition.spec @@ -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 @@ -310,7 +312,7 @@ ln -sf ../lib/dracut/modules.d/30ignition/ignition %{buildroot}/%{_libexecdir}/i # grub install -d -p %{buildroot}%{_prefix}/lib/bootupd/grub2-static/configs.d -install -p -m 0644 grub2/ignition.cfg %{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} @@ -381,10 +383,12 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %files grub %doc README.md %license %{golicenses} -%{_prefix}/lib/bootupd/grub2-static/configs.d/ignition.cfg +%{_prefix}/lib/bootupd/grub2-static/configs.d/05_ignition.cfg %changelog * Wed Mar 19 2025 Steven Presti - 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 From 8c802480f9dbc1ad88dd25a796b0e7b0efb66323 Mon Sep 17 00:00:00 2001 From: yasminvalim Date: Tue, 8 Jul 2025 15:05:44 -0300 Subject: [PATCH 161/172] Update to 2.22.0 --- .gitignore | 1 + ignition.spec | 233 +++++++++++++++++++++++++------------------------- sources | 2 +- 3 files changed, 120 insertions(+), 116 deletions(-) diff --git a/.gitignore b/.gitignore index 07cc437..600043c 100644 --- a/.gitignore +++ b/.gitignore @@ -68,3 +68,4 @@ /ignition-2.20.0.tar.gz /ignition-edge-a258749.tar.gz /ignition-2.21.0.tar.gz +/ignition-2.22.0.tar.gz diff --git a/ignition.spec b/ignition.spec index 537f48e..dea6024 100644 --- a/ignition.spec +++ b/ignition.spec @@ -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 @@ -22,7 +22,7 @@ Version: 2.21.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 2%{?dist} +Release: 1%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -48,81 +48,81 @@ Requires: dracut Requires: dracut-network # Generated by `go-mods-to-bundled-provides.py | sort` -Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.6.0 -Provides: bundled(golang(cloud.google.com/go/storage)) = 1.50.0 -Provides: bundled(golang(cloud.google.com/go/storage/experimental)) = 1.50.0 -Provides: bundled(golang(cloud.google.com/go/storage/internal)) = 1.50.0 -Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2)) = 1.50.0 -Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2/storagepb)) = 1.50.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/arn)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/auth/bearer)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/processcreds)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ssocreds)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/csm)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/context)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/arn)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/s3err)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkmath)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/strings)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sync/singleflight)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/checksum)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/json/jsonutil)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/jsonrpc)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restjson)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/ssooidc)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso/ssoiface)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.55.6 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts/stsiface)) = 1.55.6 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/azidentity)) = 1.8.2 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/azidentity/internal)) = 1.8.2 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob)) = 1.6.0 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/appendblob)) = 1.6.0 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob)) = 1.6.0 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/bloberror)) = 1.6.0 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blockblob)) = 1.6.0 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container)) = 1.6.0 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/base)) = 1.6.0 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/exported)) = 1.6.0 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated)) = 1.6.0 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/shared)) = 1.6.0 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/pageblob)) = 1.6.0 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/sas)) = 1.6.0 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/service)) = 1.6.0 -Provides: bundled(golang(github.com/beevik/etree)) = 1.5.0 +Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.7.0 +Provides: bundled(golang(cloud.google.com/go/storage)) = 1.55.0 +Provides: bundled(golang(cloud.google.com/go/storage/experimental)) = 1.55.0 +Provides: bundled(golang(cloud.google.com/go/storage/internal)) = 1.55.0 +Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2)) = 1.55.0 +Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2/storagepb)) = 1.55.0 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/arn)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/auth/bearer)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/processcreds)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ssocreds)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/csm)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/context)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/arn)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/s3err)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkmath)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/strings)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sync/singleflight)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/checksum)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/json/jsonutil)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/jsonrpc)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restjson)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/ssooidc)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso/ssoiface)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.55.7 +Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts/stsiface)) = 1.55.7 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/azidentity)) = 1.10.1 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/azidentity/internal)) = 1.10.1 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob)) = 1.6.1 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/appendblob)) = 1.6.1 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob)) = 1.6.1 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/bloberror)) = 1.6.1 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blockblob)) = 1.6.1 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container)) = 1.6.1 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/base)) = 1.6.1 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/exported)) = 1.6.1 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated)) = 1.6.1 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/shared)) = 1.6.1 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/pageblob)) = 1.6.1 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/sas)) = 1.6.1 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/service)) = 1.6.1 +Provides: bundled(golang(github.com/beevik/etree)) = 1.5.1 Provides: bundled(golang(github.com/containers/libhvee/pkg/kvp)) = 0.10.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 @@ -148,44 +148,44 @@ Provides: bundled(golang(github.com/vmware/vmw-guestinfo/message)) = 0.0.0-20220 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.37.0 -Provides: bundled(golang(golang.org/x/net/http2)) = 0.37.0 -Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.37.0 -Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.37.0 -Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.37.0 -Provides: bundled(golang(golang.org/x/net/idna)) = 0.37.0 -Provides: bundled(golang(golang.org/x/net/internal/httpcommon)) = 0.37.0 -Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.37.0 -Provides: bundled(golang(golang.org/x/net/trace)) = 0.37.0 -Provides: bundled(golang(golang.org/x/oauth2)) = 0.28.0 -Provides: bundled(golang(golang.org/x/oauth2/authhandler)) = 0.28.0 -Provides: bundled(golang(golang.org/x/oauth2/google)) = 0.28.0 -Provides: bundled(golang(golang.org/x/oauth2/google/externalaccount)) = 0.28.0 -Provides: bundled(golang(golang.org/x/oauth2/google/internal/externalaccountauthorizeduser)) = 0.28.0 -Provides: bundled(golang(golang.org/x/oauth2/google/internal/impersonate)) = 0.28.0 -Provides: bundled(golang(golang.org/x/oauth2/google/internal/stsexchange)) = 0.28.0 -Provides: bundled(golang(golang.org/x/oauth2/internal)) = 0.28.0 -Provides: bundled(golang(golang.org/x/oauth2/jws)) = 0.28.0 -Provides: bundled(golang(golang.org/x/oauth2/jwt)) = 0.28.0 -Provides: bundled(golang(golang.org/x/sys/cpu)) = 0.31.0 -Provides: bundled(golang(golang.org/x/sys/unix)) = 0.31.0 -Provides: bundled(golang(golang.org/x/sys/windows)) = 0.31.0 -Provides: bundled(golang(golang.org/x/sys/windows/registry)) = 0.31.0 -Provides: bundled(golang(google.golang.org/api/googleapi)) = 0.224.0 -Provides: bundled(golang(google.golang.org/api/googleapi/transport)) = 0.224.0 -Provides: bundled(golang(google.golang.org/api/iamcredentials/v1)) = 0.224.0 -Provides: bundled(golang(google.golang.org/api/internal)) = 0.224.0 -Provides: bundled(golang(google.golang.org/api/internal/cert)) = 0.224.0 -Provides: bundled(golang(google.golang.org/api/internal/gensupport)) = 0.224.0 -Provides: bundled(golang(google.golang.org/api/internal/impersonate)) = 0.224.0 -Provides: bundled(golang(google.golang.org/api/internal/third_party/uritemplates)) = 0.224.0 -Provides: bundled(golang(google.golang.org/api/iterator)) = 0.224.0 -Provides: bundled(golang(google.golang.org/api/option)) = 0.224.0 -Provides: bundled(golang(google.golang.org/api/option/internaloption)) = 0.224.0 -Provides: bundled(golang(google.golang.org/api/storage/v1)) = 0.224.0 -Provides: bundled(golang(google.golang.org/api/transport)) = 0.224.0 -Provides: bundled(golang(google.golang.org/api/transport/grpc)) = 0.224.0 -Provides: bundled(golang(google.golang.org/api/transport/http)) = 0.224.0 +Provides: bundled(golang(golang.org/x/net/bpf)) = 0.41.0 +Provides: bundled(golang(golang.org/x/net/http2)) = 0.41.0 +Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.41.0 +Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.41.0 +Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.41.0 +Provides: bundled(golang(golang.org/x/net/idna)) = 0.41.0 +Provides: bundled(golang(golang.org/x/net/internal/httpcommon)) = 0.41.0 +Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.41.0 +Provides: bundled(golang(golang.org/x/net/trace)) = 0.41.0 +Provides: bundled(golang(golang.org/x/oauth2)) = 0.30.0 +Provides: bundled(golang(golang.org/x/oauth2/authhandler)) = 0.30.0 +Provides: bundled(golang(golang.org/x/oauth2/google)) = 0.30.0 +Provides: bundled(golang(golang.org/x/oauth2/google/externalaccount)) = 0.30.0 +Provides: bundled(golang(golang.org/x/oauth2/google/internal/externalaccountauthorizeduser)) = 0.30.0 +Provides: bundled(golang(golang.org/x/oauth2/google/internal/impersonate)) = 0.30.0 +Provides: bundled(golang(golang.org/x/oauth2/google/internal/stsexchange)) = 0.30.0 +Provides: bundled(golang(golang.org/x/oauth2/internal)) = 0.30.0 +Provides: bundled(golang(golang.org/x/oauth2/jws)) = 0.30.0 +Provides: bundled(golang(golang.org/x/oauth2/jwt)) = 0.30.0 +Provides: bundled(golang(golang.org/x/sys/cpu)) = 0.33.0 +Provides: bundled(golang(golang.org/x/sys/unix)) = 0.33.0 +Provides: bundled(golang(golang.org/x/sys/windows)) = 0.33.0 +Provides: bundled(golang(golang.org/x/sys/windows/registry)) = 0.33.0 +Provides: bundled(golang(google.golang.org/api/googleapi)) = 0.236.0 +Provides: bundled(golang(google.golang.org/api/googleapi/transport)) = 0.236.0 +Provides: bundled(golang(google.golang.org/api/iamcredentials/v1)) = 0.236.0 +Provides: bundled(golang(google.golang.org/api/internal)) = 0.236.0 +Provides: bundled(golang(google.golang.org/api/internal/cert)) = 0.236.0 +Provides: bundled(golang(google.golang.org/api/internal/gensupport)) = 0.236.0 +Provides: bundled(golang(google.golang.org/api/internal/impersonate)) = 0.236.0 +Provides: bundled(golang(google.golang.org/api/internal/third_party/uritemplates)) = 0.236.0 +Provides: bundled(golang(google.golang.org/api/iterator)) = 0.236.0 +Provides: bundled(golang(google.golang.org/api/option)) = 0.236.0 +Provides: bundled(golang(google.golang.org/api/option/internaloption)) = 0.236.0 +Provides: bundled(golang(google.golang.org/api/storage/v1)) = 0.236.0 +Provides: bundled(golang(google.golang.org/api/transport)) = 0.236.0 +Provides: bundled(golang(google.golang.org/api/transport/grpc)) = 0.236.0 +Provides: bundled(golang(google.golang.org/api/transport/http)) = 0.236.0 Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1 %description @@ -386,6 +386,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_prefix}/lib/bootupd/grub2-static/configs.d/05_ignition.cfg %changelog +* Tue Jul 8 2025 Yasmin Valim - 2.22.0-1 +- New Release + * Wed Mar 19 2025 Steven Presti - 2.21.0-2 - Rename ignition.cfg -> 05_ignition.cfg to mirror upstream additionally backport rename. diff --git a/sources b/sources index e88cec3..502267a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-2.21.0.tar.gz) = f388dff9f0bf0bbe54ec2e6c88f35fab886b2ca7de6828c10456c0bfa44412d41e624682df1271c153ac9f721b4ace1e70104ee48760e19e13c257b99f8ab453 +SHA512 (ignition-2.22.0.tar.gz) = fd9fbe28b77c0593c4ca3f7d08fcb46c56c29d8fd4365c37856b8ccfd178d3cbb44dbe15effcfada3da851bece893edfe2b4de2c4873a90c909322a8c806143a SHA512 (ignition-edge-a258749.tar.gz) = 0566807f7f4cbf9715566c8c39ba699df00f4ee5d579269c695a4af13d75a4e1f4639b54be85d0703373221d67a3ad0c532c0e075831316e3eed7a33cf316833 From 5235d93136d90dffe6c64be9404d861e2b656e18 Mon Sep 17 00:00:00 2001 From: yasminvalim Date: Wed, 9 Jul 2025 11:30:36 -0300 Subject: [PATCH 162/172] Remove obsolete patch Remove 0001-Rename-ignition.cfg-05_ignition.cfg.patch from spec --- ...-Rename-ignition.cfg-05_ignition.cfg.patch | 49 ------------------- ignition.spec | 2 - 2 files changed, 51 deletions(-) delete mode 100644 0001-Rename-ignition.cfg-05_ignition.cfg.patch diff --git a/0001-Rename-ignition.cfg-05_ignition.cfg.patch b/0001-Rename-ignition.cfg-05_ignition.cfg.patch deleted file mode 100644 index e3fe17f..0000000 --- a/0001-Rename-ignition.cfg-05_ignition.cfg.patch +++ /dev/null @@ -1,49 +0,0 @@ -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/ignition.spec b/ignition.spec index dea6024..e0340e0 100644 --- a/ignition.spec +++ b/ignition.spec @@ -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 From 09c7f065753dd55d8649e58d80bcecfab51d9fea Mon Sep 17 00:00:00 2001 From: Tiago Bueno Date: Tue, 15 Jul 2025 12:57:13 -0300 Subject: [PATCH 163/172] Backport fix for OracleCloud error handling Signed-off-by: Tiago Bueno --- ...o-not-wrap-errors-from-FetchToBuffer.patch | 46 +++++++++++++++++++ ignition.spec | 8 +++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 0001-oraclecloud-do-not-wrap-errors-from-FetchToBuffer.patch diff --git a/0001-oraclecloud-do-not-wrap-errors-from-FetchToBuffer.patch b/0001-oraclecloud-do-not-wrap-errors-from-FetchToBuffer.patch new file mode 100644 index 0000000..8c8241b --- /dev/null +++ b/0001-oraclecloud-do-not-wrap-errors-from-FetchToBuffer.patch @@ -0,0 +1,46 @@ +From f90e2ed3002faaa434111eb45e2ebaf504834b1e Mon Sep 17 00:00:00 2001 +From: Leorize +Date: Fri, 11 Jul 2025 14:51:55 -0500 +Subject: [PATCH] oraclecloud: do not wrap errors from FetchToBuffer + +Ignition internal machinery relies on being able to match against an +error directly, in this case, `ErrNeedNet`. By wrapping errors from +FetchToBuffer, ignition would not be able to detect the lack of +networking during `fetch-offline` phase and fail to run. + +Signed-off-by: Leorize +Signed-off-by: Tiago Bueno +--- + docs/release-notes.md | 1 + + internal/providers/oraclecloud/oraclecloud.go | 3 ++- + 2 files changed, 3 insertions(+), 1 deletion(-) + +diff --git a/docs/release-notes.md b/docs/release-notes.md +index da586fc8..bdd8900f 100644 +--- a/docs/release-notes.md ++++ b/docs/release-notes.md +@@ -14,6 +14,7 @@ nav_order: 9 + + ### Bug fixes + ++- Fix fetch-offline for Oracle Cloud Infrastructure + + ## Ignition 2.22.0 (2025-07-08) + Starting with this release, ignition-validate binaries are signed with the +diff --git a/internal/providers/oraclecloud/oraclecloud.go b/internal/providers/oraclecloud/oraclecloud.go +index 33db95c3..fb06caf5 100644 +--- a/internal/providers/oraclecloud/oraclecloud.go ++++ b/internal/providers/oraclecloud/oraclecloud.go +@@ -53,7 +53,8 @@ func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { + RetryCodes: []int{http.StatusTooManyRequests}, + }) + if err != nil && err != resource.ErrNotFound { +- return types.Config{}, report.Report{}, fmt.Errorf("fetching to buffer: %w", err) ++ // Do not wrap these errors, ignition uses direct comparsion to distinguish them. ++ return types.Config{}, report.Report{}, err + } + + userdata := make([]byte, base64.StdEncoding.DecodedLen(len(data))) +-- +2.50.1 + diff --git a/ignition.spec b/ignition.spec index e0340e0..e18469d 100644 --- a/ignition.spec +++ b/ignition.spec @@ -22,7 +22,7 @@ Version: 2.22.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 1%{?dist} +Release: 2%{?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 +# Backporting https://github.com/coreos/ignition/pull/2104 +Patch0: 0001-oraclecloud-do-not-wrap-errors-from-FetchToBuffer.patch + BuildRequires: libblkid-devel BuildRequires: systemd-rpm-macros @@ -384,6 +387,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_prefix}/lib/bootupd/grub2-static/configs.d/05_ignition.cfg %changelog +* Tue Jul 15 2025 Tiago Bueno - 2.22.0-2 +- Backport fix for OracleCloud do not wrap errors from FetchToBuffer + * Tue Jul 8 2025 Yasmin Valim - 2.22.0-1 - New Release From 9d428601e9b71424555182dcd4821a98872097c1 Mon Sep 17 00:00:00 2001 From: Tiago Bueno Date: Wed, 16 Jul 2025 14:27:10 -0300 Subject: [PATCH 164/172] Fix rpminspect debug symbols failure This adds a new configuration file for rpminspect to ensure that debug symbols are correctly handled in the RPM subpackage. Signed-off-by: Tiago Bueno --- ignition.spec | 5 ++++- rpminspect.yaml | 5 +++++ 2 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 rpminspect.yaml diff --git a/ignition.spec b/ignition.spec index e18469d..10c2f1e 100644 --- a/ignition.spec +++ b/ignition.spec @@ -22,7 +22,7 @@ Version: 2.22.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 2%{?dist} +Release: 3%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -387,6 +387,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_prefix}/lib/bootupd/grub2-static/configs.d/05_ignition.cfg %changelog +* Wed Jul 16 2025 Tiago Bueno - 2.22.0-3 +- Fix rpminspect debug symbols failure + * Tue Jul 15 2025 Tiago Bueno - 2.22.0-2 - Backport fix for OracleCloud do not wrap errors from FetchToBuffer diff --git a/rpminspect.yaml b/rpminspect.yaml new file mode 100644 index 0000000..79ee3ee --- /dev/null +++ b/rpminspect.yaml @@ -0,0 +1,5 @@ +--- +debuginfo: + ignore: + - /usr/share/ignition/ignition-validate-*-unknown-linux-gnu-static + From 9f25eef1c817482f41fee7431ea2580c4a51e01c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 17:35:10 +0000 Subject: [PATCH 165/172] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- ignition.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index 10c2f1e..d788137 100644 --- a/ignition.spec +++ b/ignition.spec @@ -22,7 +22,7 @@ Version: 2.22.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 3%{?dist} +Release: 4%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -387,6 +387,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_prefix}/lib/bootupd/grub2-static/configs.d/05_ignition.cfg %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 2.22.0-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Wed Jul 16 2025 Tiago Bueno - 2.22.0-3 - Fix rpminspect debug symbols failure From 14f8fd597a45d34e562796d67d47025fb14c9c57 Mon Sep 17 00:00:00 2001 From: Maxwell G Date: Fri, 15 Aug 2025 17:59:34 -0500 Subject: [PATCH 166/172] Rebuild for golang-1.25.0 --- ignition.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index d788137..7099568 100644 --- a/ignition.spec +++ b/ignition.spec @@ -22,7 +22,7 @@ Version: 2.22.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 4%{?dist} +Release: 5%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -387,6 +387,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_prefix}/lib/bootupd/grub2-static/configs.d/05_ignition.cfg %changelog +* Fri Aug 15 2025 Maxwell G - 2.22.0-5 +- Rebuild for golang-1.25.0 + * Thu Jul 24 2025 Fedora Release Engineering - 2.22.0-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From aeab9876fbc9a0e929ef76cd09f60731ca3454c5 Mon Sep 17 00:00:00 2001 From: Steven Presti Date: Wed, 10 Sep 2025 15:13:15 -0400 Subject: [PATCH 167/172] Update to 2.23.0 relates to: https://github.com/coreos/ignition/issues/2126 --- .gitignore | 1 + ...o-not-wrap-errors-from-FetchToBuffer.patch | 46 ---- ignition.spec | 201 +++++++++--------- sources | 2 +- 4 files changed, 99 insertions(+), 151 deletions(-) delete mode 100644 0001-oraclecloud-do-not-wrap-errors-from-FetchToBuffer.patch diff --git a/.gitignore b/.gitignore index 600043c..1b89f1b 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,4 @@ /ignition-edge-a258749.tar.gz /ignition-2.21.0.tar.gz /ignition-2.22.0.tar.gz +/ignition-2.23.0.tar.gz diff --git a/0001-oraclecloud-do-not-wrap-errors-from-FetchToBuffer.patch b/0001-oraclecloud-do-not-wrap-errors-from-FetchToBuffer.patch deleted file mode 100644 index 8c8241b..0000000 --- a/0001-oraclecloud-do-not-wrap-errors-from-FetchToBuffer.patch +++ /dev/null @@ -1,46 +0,0 @@ -From f90e2ed3002faaa434111eb45e2ebaf504834b1e Mon Sep 17 00:00:00 2001 -From: Leorize -Date: Fri, 11 Jul 2025 14:51:55 -0500 -Subject: [PATCH] oraclecloud: do not wrap errors from FetchToBuffer - -Ignition internal machinery relies on being able to match against an -error directly, in this case, `ErrNeedNet`. By wrapping errors from -FetchToBuffer, ignition would not be able to detect the lack of -networking during `fetch-offline` phase and fail to run. - -Signed-off-by: Leorize -Signed-off-by: Tiago Bueno ---- - docs/release-notes.md | 1 + - internal/providers/oraclecloud/oraclecloud.go | 3 ++- - 2 files changed, 3 insertions(+), 1 deletion(-) - -diff --git a/docs/release-notes.md b/docs/release-notes.md -index da586fc8..bdd8900f 100644 ---- a/docs/release-notes.md -+++ b/docs/release-notes.md -@@ -14,6 +14,7 @@ nav_order: 9 - - ### Bug fixes - -+- Fix fetch-offline for Oracle Cloud Infrastructure - - ## Ignition 2.22.0 (2025-07-08) - Starting with this release, ignition-validate binaries are signed with the -diff --git a/internal/providers/oraclecloud/oraclecloud.go b/internal/providers/oraclecloud/oraclecloud.go -index 33db95c3..fb06caf5 100644 ---- a/internal/providers/oraclecloud/oraclecloud.go -+++ b/internal/providers/oraclecloud/oraclecloud.go -@@ -53,7 +53,8 @@ func fetchConfig(f *resource.Fetcher) (types.Config, report.Report, error) { - RetryCodes: []int{http.StatusTooManyRequests}, - }) - if err != nil && err != resource.ErrNotFound { -- return types.Config{}, report.Report{}, fmt.Errorf("fetching to buffer: %w", err) -+ // Do not wrap these errors, ignition uses direct comparsion to distinguish them. -+ return types.Config{}, report.Report{}, err - } - - userdata := make([]byte, base64.StdEncoding.DecodedLen(len(data))) --- -2.50.1 - diff --git a/ignition.spec b/ignition.spec index 7099568..a2c7bc1 100644 --- a/ignition.spec +++ b/ignition.spec @@ -13,7 +13,7 @@ # https://github.com/coreos/ignition %global goipath github.com/coreos/ignition %global gomodulesmode GO111MODULE=on -Version: 2.22.0 +Version: 2.23.0 %gometa @@ -22,7 +22,7 @@ Version: 2.22.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 5%{?dist} +Release: 1%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -31,8 +31,6 @@ URL: %{gourl} Source0: %{gosource} Source1: https://github.com/fedora-iot/ignition-edge/archive/%{ignedgecommit}/ignition-edge-%{ignedgeshortcommit}.tar.gz -# Backporting https://github.com/coreos/ignition/pull/2104 -Patch0: 0001-oraclecloud-do-not-wrap-errors-from-FetchToBuffer.patch BuildRequires: libblkid-devel BuildRequires: systemd-rpm-macros @@ -50,79 +48,71 @@ Requires: dracut-network # Generated by `go-mods-to-bundled-provides.py | sort` Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.7.0 -Provides: bundled(golang(cloud.google.com/go/storage)) = 1.55.0 -Provides: bundled(golang(cloud.google.com/go/storage/experimental)) = 1.55.0 -Provides: bundled(golang(cloud.google.com/go/storage/internal)) = 1.55.0 -Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2)) = 1.55.0 -Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2/storagepb)) = 1.55.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/arn)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/auth/bearer)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awserr)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/awsutil)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/client/metadata)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/corehandlers)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ec2rolecreds)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/endpointcreds)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/processcreds)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/ssocreds)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/credentials/stscreds)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/csm)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/defaults)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/ec2metadata)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/endpoints)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/request)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/session)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/aws/signer/v4)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/context)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/ini)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/arn)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/s3shared/s3err)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkio)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkmath)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkrand)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sdkuri)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/shareddefaults)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/strings)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/internal/sync/singleflight)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/checksum)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/eventstream/eventstreamapi)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/json/jsonutil)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/jsonrpc)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/query/queryutil)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/rest)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restjson)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/restxml)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/private/protocol/xml/xmlutil)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3iface)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/s3/s3manager)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/ssooidc)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sso/ssoiface)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts)) = 1.55.7 -Provides: bundled(golang(github.com/aws/aws-sdk-go/service/sts/stsiface)) = 1.55.7 +Provides: bundled(golang(cloud.google.com/go/storage)) = 1.56.0 +Provides: bundled(golang(cloud.google.com/go/storage/experimental)) = 1.56.0 +Provides: bundled(golang(cloud.google.com/go/storage/internal)) = 1.56.0 +Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2)) = 1.56.0 +Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2/storagepb)) = 1.56.0 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/arn)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/defaults)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/middleware)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/eventstreamapi)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/protocol/xml)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/ratelimit)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/retry)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/signer/internal/v4)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/signer/v4)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/transport/http)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/credentials/ec2rolecreds)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/feature/ec2/imds)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/feature/ec2/imds/internal/config)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/feature/s3/manager)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/auth)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/auth/smithy)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/awsutil)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/configsources)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/context)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/endpoints)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/endpoints/awsrulesfn)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/endpoints/v2)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/middleware)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/rand)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/sdk)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/sdkio)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/strings)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/sync/singleflight)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/timeconv)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/v4a)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/v4a/internal/crypto)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/v4a/internal/v4)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/checksum)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/presigned-url)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/s3shared)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/s3shared/arn)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/s3shared/config)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/internal/arn)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/internal/endpoints)) = 1.38.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/types)) = 1.38.2 Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/azidentity)) = 1.10.1 Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/azidentity/internal)) = 1.10.1 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob)) = 1.6.1 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/appendblob)) = 1.6.1 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob)) = 1.6.1 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/bloberror)) = 1.6.1 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blockblob)) = 1.6.1 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container)) = 1.6.1 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/base)) = 1.6.1 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/exported)) = 1.6.1 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated)) = 1.6.1 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/shared)) = 1.6.1 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/pageblob)) = 1.6.1 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/sas)) = 1.6.1 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/service)) = 1.6.1 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob)) = 1.6.2 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/appendblob)) = 1.6.2 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob)) = 1.6.2 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/bloberror)) = 1.6.2 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blockblob)) = 1.6.2 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container)) = 1.6.2 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/base)) = 1.6.2 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/exported)) = 1.6.2 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated)) = 1.6.2 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/shared)) = 1.6.2 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/pageblob)) = 1.6.2 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/sas)) = 1.6.2 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/service)) = 1.6.2 Provides: bundled(golang(github.com/beevik/etree)) = 1.5.1 Provides: bundled(golang(github.com/containers/libhvee/pkg/kvp)) = 0.10.0 Provides: bundled(golang(github.com/coreos/go-semver/semver)) = 0.3.1 @@ -140,7 +130,7 @@ 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.6 +Provides: bundled(golang(github.com/spf13/pflag)) = 1.0.7 Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.10.0 Provides: bundled(golang(github.com/stretchr/testify/assert/yaml)) = 1.10.0 Provides: bundled(golang(github.com/vincent-petithory/dataurl)) = 1.0.0 @@ -149,15 +139,15 @@ Provides: bundled(golang(github.com/vmware/vmw-guestinfo/message)) = 0.0.0-20220 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.41.0 -Provides: bundled(golang(golang.org/x/net/http2)) = 0.41.0 -Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.41.0 -Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.41.0 -Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.41.0 -Provides: bundled(golang(golang.org/x/net/idna)) = 0.41.0 -Provides: bundled(golang(golang.org/x/net/internal/httpcommon)) = 0.41.0 -Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.41.0 -Provides: bundled(golang(golang.org/x/net/trace)) = 0.41.0 +Provides: bundled(golang(golang.org/x/net/bpf)) = 0.42.0 +Provides: bundled(golang(golang.org/x/net/http2)) = 0.42.0 +Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.42.0 +Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.42.0 +Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.42.0 +Provides: bundled(golang(golang.org/x/net/idna)) = 0.42.0 +Provides: bundled(golang(golang.org/x/net/internal/httpcommon)) = 0.42.0 +Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.42.0 +Provides: bundled(golang(golang.org/x/net/trace)) = 0.42.0 Provides: bundled(golang(golang.org/x/oauth2)) = 0.30.0 Provides: bundled(golang(golang.org/x/oauth2/authhandler)) = 0.30.0 Provides: bundled(golang(golang.org/x/oauth2/google)) = 0.30.0 @@ -168,25 +158,25 @@ Provides: bundled(golang(golang.org/x/oauth2/google/internal/stsexchange)) = 0.3 Provides: bundled(golang(golang.org/x/oauth2/internal)) = 0.30.0 Provides: bundled(golang(golang.org/x/oauth2/jws)) = 0.30.0 Provides: bundled(golang(golang.org/x/oauth2/jwt)) = 0.30.0 -Provides: bundled(golang(golang.org/x/sys/cpu)) = 0.33.0 -Provides: bundled(golang(golang.org/x/sys/unix)) = 0.33.0 -Provides: bundled(golang(golang.org/x/sys/windows)) = 0.33.0 -Provides: bundled(golang(golang.org/x/sys/windows/registry)) = 0.33.0 -Provides: bundled(golang(google.golang.org/api/googleapi)) = 0.236.0 -Provides: bundled(golang(google.golang.org/api/googleapi/transport)) = 0.236.0 -Provides: bundled(golang(google.golang.org/api/iamcredentials/v1)) = 0.236.0 -Provides: bundled(golang(google.golang.org/api/internal)) = 0.236.0 -Provides: bundled(golang(google.golang.org/api/internal/cert)) = 0.236.0 -Provides: bundled(golang(google.golang.org/api/internal/gensupport)) = 0.236.0 -Provides: bundled(golang(google.golang.org/api/internal/impersonate)) = 0.236.0 -Provides: bundled(golang(google.golang.org/api/internal/third_party/uritemplates)) = 0.236.0 -Provides: bundled(golang(google.golang.org/api/iterator)) = 0.236.0 -Provides: bundled(golang(google.golang.org/api/option)) = 0.236.0 -Provides: bundled(golang(google.golang.org/api/option/internaloption)) = 0.236.0 -Provides: bundled(golang(google.golang.org/api/storage/v1)) = 0.236.0 -Provides: bundled(golang(google.golang.org/api/transport)) = 0.236.0 -Provides: bundled(golang(google.golang.org/api/transport/grpc)) = 0.236.0 -Provides: bundled(golang(google.golang.org/api/transport/http)) = 0.236.0 +Provides: bundled(golang(golang.org/x/sys/cpu)) = 0.34.0 +Provides: bundled(golang(golang.org/x/sys/unix)) = 0.34.0 +Provides: bundled(golang(golang.org/x/sys/windows)) = 0.34.0 +Provides: bundled(golang(golang.org/x/sys/windows/registry)) = 0.34.0 +Provides: bundled(golang(google.golang.org/api/googleapi)) = 0.243.0 +Provides: bundled(golang(google.golang.org/api/googleapi/transport)) = 0.243.0 +Provides: bundled(golang(google.golang.org/api/iamcredentials/v1)) = 0.243.0 +Provides: bundled(golang(google.golang.org/api/internal)) = 0.243.0 +Provides: bundled(golang(google.golang.org/api/internal/cert)) = 0.243.0 +Provides: bundled(golang(google.golang.org/api/internal/gensupport)) = 0.243.0 +Provides: bundled(golang(google.golang.org/api/internal/impersonate)) = 0.243.0 +Provides: bundled(golang(google.golang.org/api/internal/third_party/uritemplates)) = 0.243.0 +Provides: bundled(golang(google.golang.org/api/iterator)) = 0.243.0 +Provides: bundled(golang(google.golang.org/api/option)) = 0.243.0 +Provides: bundled(golang(google.golang.org/api/option/internaloption)) = 0.243.0 +Provides: bundled(golang(google.golang.org/api/storage/v1)) = 0.243.0 +Provides: bundled(golang(google.golang.org/api/transport)) = 0.243.0 +Provides: bundled(golang(google.golang.org/api/transport/grpc)) = 0.243.0 +Provides: bundled(golang(google.golang.org/api/transport/http)) = 0.243.0 Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1 %description @@ -387,6 +377,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_prefix}/lib/bootupd/grub2-static/configs.d/05_ignition.cfg %changelog +* Wed Sep 10 2025 Steven Presti - 2.23.0-1 +- New Release + * Fri Aug 15 2025 Maxwell G - 2.22.0-5 - Rebuild for golang-1.25.0 diff --git a/sources b/sources index 502267a..802f1a5 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-2.22.0.tar.gz) = fd9fbe28b77c0593c4ca3f7d08fcb46c56c29d8fd4365c37856b8ccfd178d3cbb44dbe15effcfada3da851bece893edfe2b4de2c4873a90c909322a8c806143a +SHA512 (ignition-2.23.0.tar.gz) = feacfa3efd18886eb577b77e0ebe26415fcb3f2493cf9058501b9fff3f9bf32c54320e013f65a8987e20271567b8fdc91ae2de162c8ea908a10adf2848c3ddc5 SHA512 (ignition-edge-a258749.tar.gz) = 0566807f7f4cbf9715566c8c39ba699df00f4ee5d579269c695a4af13d75a4e1f4639b54be85d0703373221d67a3ad0c532c0e075831316e3eed7a33cf316833 From 72fea80cc7321eb6d2a414999c1d0eb8e75652c8 Mon Sep 17 00:00:00 2001 From: Steven Presti Date: Wed, 1 Oct 2025 12:54:58 -0400 Subject: [PATCH 168/172] Rebuild ignition with goexperiment=strictfipsruntime --- ignition.spec | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/ignition.spec b/ignition.spec index a2c7bc1..2f206bf 100644 --- a/ignition.spec +++ b/ignition.spec @@ -22,7 +22,7 @@ Version: 2.23.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 1%{?dist} +Release: 2%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -270,7 +270,7 @@ LDFLAGS+=' -compressdwarf=false ' export GOFLAGS="-mod=vendor" echo "Building ignition..." -%gobuild -o ./ignition internal/main.go +GOEXPERIMENT=strictfipsruntime %gobuild -o ./ignition internal/main.go echo "Building ignition-validate..." %gobuild -o ./ignition-validate validate/main.go @@ -279,17 +279,17 @@ echo "Building ignition-validate..." %if 0%{?fedora} echo "Building statically-linked Linux ignition-validate..." -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 +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 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 +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 echo "Building Windows ignition-validate..." -GOARCH=amd64 GOOS=windows %gocrossbuild -o ./ignition-validate-x86_64-pc-windows-gnu.exe validate/main.go +GOEXPERIMENT= GOARCH=amd64 GOOS=windows %gocrossbuild -o ./ignition-validate-x86_64-pc-windows-gnu.exe validate/main.go %endif %install @@ -377,6 +377,10 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_prefix}/lib/bootupd/grub2-static/configs.d/05_ignition.cfg %changelog +* Wed Oct 01 2025 Steven Presti - 2.23.0-2 +- Build Ignition with GOEXPERIMENT=strictfipsruntime +- Ignition-validate non-FIPS + * Wed Sep 10 2025 Steven Presti - 2.23.0-1 - New Release From da6e188921d9f2526f0742e72daf0518623afe82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20S=C3=A1ez?= Date: Fri, 10 Oct 2025 14:40:27 +0200 Subject: [PATCH 169/172] rebuild --- ignition.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ignition.spec b/ignition.spec index 2f206bf..34041c7 100644 --- a/ignition.spec +++ b/ignition.spec @@ -22,7 +22,7 @@ Version: 2.23.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 2%{?dist} +Release: 3%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -377,6 +377,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_prefix}/lib/bootupd/grub2-static/configs.d/05_ignition.cfg %changelog +* Fri Oct 10 2025 Alejandro Sáez - 2.23.0-3 +- rebuild + * Wed Oct 01 2025 Steven Presti - 2.23.0-2 - Build Ignition with GOEXPERIMENT=strictfipsruntime - Ignition-validate non-FIPS From c968de9bf574e5cfabb1a368cd2032201a07d805 Mon Sep 17 00:00:00 2001 From: Steven Presti Date: Tue, 14 Oct 2025 15:41:26 -0400 Subject: [PATCH 170/172] Update to 2.24.0 Relates to: https://github.com/coreos/ignition/issues/2137 --- .gitignore | 1 + ignition.spec | 203 +++++++++++++++++++++++++------------------------- sources | 2 +- 3 files changed, 105 insertions(+), 101 deletions(-) diff --git a/.gitignore b/.gitignore index 1b89f1b..bef7f5a 100644 --- a/.gitignore +++ b/.gitignore @@ -70,3 +70,4 @@ /ignition-2.21.0.tar.gz /ignition-2.22.0.tar.gz /ignition-2.23.0.tar.gz +/ignition-2.24.0.tar.gz diff --git a/ignition.spec b/ignition.spec index 34041c7..54a7768 100644 --- a/ignition.spec +++ b/ignition.spec @@ -13,7 +13,7 @@ # https://github.com/coreos/ignition %global goipath github.com/coreos/ignition %global gomodulesmode GO111MODULE=on -Version: 2.23.0 +Version: 2.24.0 %gometa @@ -22,7 +22,7 @@ Version: 2.23.0 %global dracutlibdir %{_prefix}/lib/dracut Name: ignition -Release: 3%{?dist} +Release: 1%{?dist} Summary: First boot installer and configuration tool # Upstream license specification: Apache-2.0 @@ -47,59 +47,14 @@ Requires: dracut Requires: dracut-network # Generated by `go-mods-to-bundled-provides.py | sort` -Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.7.0 -Provides: bundled(golang(cloud.google.com/go/storage)) = 1.56.0 -Provides: bundled(golang(cloud.google.com/go/storage/experimental)) = 1.56.0 -Provides: bundled(golang(cloud.google.com/go/storage/internal)) = 1.56.0 -Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2)) = 1.56.0 -Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2/storagepb)) = 1.56.0 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/arn)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/defaults)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/middleware)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/eventstreamapi)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/protocol/xml)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/ratelimit)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/retry)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/signer/internal/v4)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/signer/v4)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/transport/http)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/credentials/ec2rolecreds)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/feature/ec2/imds)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/feature/ec2/imds/internal/config)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/feature/s3/manager)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/auth)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/auth/smithy)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/awsutil)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/configsources)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/context)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/endpoints)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/endpoints/awsrulesfn)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/endpoints/v2)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/middleware)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/rand)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/sdk)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/sdkio)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/strings)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/sync/singleflight)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/timeconv)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/v4a)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/v4a/internal/crypto)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/v4a/internal/v4)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/checksum)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/presigned-url)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/s3shared)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/s3shared/arn)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/s3shared/config)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/internal/arn)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/internal/endpoints)) = 1.38.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/types)) = 1.38.2 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/azidentity)) = 1.10.1 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/azidentity/internal)) = 1.10.1 +Provides: bundled(golang(cloud.google.com/go/compute/metadata)) = 0.9.0 +Provides: bundled(golang(cloud.google.com/go/storage)) = 1.57.0 +Provides: bundled(golang(cloud.google.com/go/storage/experimental)) = 1.57.0 +Provides: bundled(golang(cloud.google.com/go/storage/internal)) = 1.57.0 +Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2)) = 1.57.0 +Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2/storagepb)) = 1.57.0 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/azidentity)) = 1.13.0 +Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/azidentity/internal)) = 1.13.0 Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob)) = 1.6.2 Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/appendblob)) = 1.6.2 Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob)) = 1.6.2 @@ -113,12 +68,57 @@ Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/in Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/pageblob)) = 1.6.2 Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/sas)) = 1.6.2 Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/service)) = 1.6.2 -Provides: bundled(golang(github.com/beevik/etree)) = 1.5.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/arn)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/defaults)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/middleware)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/protocol/xml)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/ratelimit)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/retry)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/signer/internal/v4)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/signer/v4)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/transport/http)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/auth)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/auth/smithy)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/awsutil)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/context)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/endpoints)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/endpoints/awsrulesfn)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/middleware)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/rand)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/sdk)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/sdkio)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/strings)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/sync/singleflight)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/timeconv)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/eventstreamapi)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/credentials/ec2rolecreds)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/feature/ec2/imds)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/feature/ec2/imds/internal/config)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/feature/s3/manager)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/configsources)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/endpoints/v2)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/v4a)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/v4a/internal/crypto)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/v4a/internal/v4)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/checksum)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/presigned-url)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/s3shared)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/s3shared/arn)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/s3shared/config)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/internal/arn)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/internal/endpoints)) = 1.39.2 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/types)) = 1.39.2 +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(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 -Provides: bundled(golang(github.com/coreos/go-systemd/v22/unit)) = 22.5.0 +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/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 @@ -130,53 +130,53 @@ 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.7 -Provides: bundled(golang(github.com/stretchr/testify/assert)) = 1.10.0 -Provides: bundled(golang(github.com/stretchr/testify/assert/yaml)) = 1.10.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/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.42.0 -Provides: bundled(golang(golang.org/x/net/http2)) = 0.42.0 -Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.42.0 -Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.42.0 -Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.42.0 -Provides: bundled(golang(golang.org/x/net/idna)) = 0.42.0 -Provides: bundled(golang(golang.org/x/net/internal/httpcommon)) = 0.42.0 -Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.42.0 -Provides: bundled(golang(golang.org/x/net/trace)) = 0.42.0 -Provides: bundled(golang(golang.org/x/oauth2)) = 0.30.0 -Provides: bundled(golang(golang.org/x/oauth2/authhandler)) = 0.30.0 -Provides: bundled(golang(golang.org/x/oauth2/google)) = 0.30.0 -Provides: bundled(golang(golang.org/x/oauth2/google/externalaccount)) = 0.30.0 -Provides: bundled(golang(golang.org/x/oauth2/google/internal/externalaccountauthorizeduser)) = 0.30.0 -Provides: bundled(golang(golang.org/x/oauth2/google/internal/impersonate)) = 0.30.0 -Provides: bundled(golang(golang.org/x/oauth2/google/internal/stsexchange)) = 0.30.0 -Provides: bundled(golang(golang.org/x/oauth2/internal)) = 0.30.0 -Provides: bundled(golang(golang.org/x/oauth2/jws)) = 0.30.0 -Provides: bundled(golang(golang.org/x/oauth2/jwt)) = 0.30.0 -Provides: bundled(golang(golang.org/x/sys/cpu)) = 0.34.0 -Provides: bundled(golang(golang.org/x/sys/unix)) = 0.34.0 -Provides: bundled(golang(golang.org/x/sys/windows)) = 0.34.0 -Provides: bundled(golang(golang.org/x/sys/windows/registry)) = 0.34.0 -Provides: bundled(golang(google.golang.org/api/googleapi)) = 0.243.0 -Provides: bundled(golang(google.golang.org/api/googleapi/transport)) = 0.243.0 -Provides: bundled(golang(google.golang.org/api/iamcredentials/v1)) = 0.243.0 -Provides: bundled(golang(google.golang.org/api/internal)) = 0.243.0 -Provides: bundled(golang(google.golang.org/api/internal/cert)) = 0.243.0 -Provides: bundled(golang(google.golang.org/api/internal/gensupport)) = 0.243.0 -Provides: bundled(golang(google.golang.org/api/internal/impersonate)) = 0.243.0 -Provides: bundled(golang(google.golang.org/api/internal/third_party/uritemplates)) = 0.243.0 -Provides: bundled(golang(google.golang.org/api/iterator)) = 0.243.0 -Provides: bundled(golang(google.golang.org/api/option)) = 0.243.0 -Provides: bundled(golang(google.golang.org/api/option/internaloption)) = 0.243.0 -Provides: bundled(golang(google.golang.org/api/storage/v1)) = 0.243.0 -Provides: bundled(golang(google.golang.org/api/transport)) = 0.243.0 -Provides: bundled(golang(google.golang.org/api/transport/grpc)) = 0.243.0 -Provides: bundled(golang(google.golang.org/api/transport/http)) = 0.243.0 +Provides: bundled(golang(golang.org/x/net/bpf)) = 0.46.0 +Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.46.0 +Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.46.0 +Provides: bundled(golang(golang.org/x/net/http2)) = 0.46.0 +Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.46.0 +Provides: bundled(golang(golang.org/x/net/idna)) = 0.46.0 +Provides: bundled(golang(golang.org/x/net/internal/httpcommon)) = 0.46.0 +Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.46.0 +Provides: bundled(golang(golang.org/x/net/trace)) = 0.46.0 +Provides: bundled(golang(golang.org/x/oauth2)) = 0.32.0 +Provides: bundled(golang(golang.org/x/oauth2/authhandler)) = 0.32.0 +Provides: bundled(golang(golang.org/x/oauth2/google)) = 0.32.0 +Provides: bundled(golang(golang.org/x/oauth2/google/externalaccount)) = 0.32.0 +Provides: bundled(golang(golang.org/x/oauth2/google/internal/externalaccountauthorizeduser)) = 0.32.0 +Provides: bundled(golang(golang.org/x/oauth2/google/internal/impersonate)) = 0.32.0 +Provides: bundled(golang(golang.org/x/oauth2/google/internal/stsexchange)) = 0.32.0 +Provides: bundled(golang(golang.org/x/oauth2/internal)) = 0.32.0 +Provides: bundled(golang(golang.org/x/oauth2/jws)) = 0.32.0 +Provides: bundled(golang(golang.org/x/oauth2/jwt)) = 0.32.0 +Provides: bundled(golang(golang.org/x/sys/cpu)) = 0.37.0 +Provides: bundled(golang(golang.org/x/sys/unix)) = 0.37.0 +Provides: bundled(golang(golang.org/x/sys/windows)) = 0.37.0 +Provides: bundled(golang(golang.org/x/sys/windows/registry)) = 0.37.0 +Provides: bundled(golang(google.golang.org/api/googleapi)) = 0.252.0 +Provides: bundled(golang(google.golang.org/api/googleapi/transport)) = 0.252.0 +Provides: bundled(golang(google.golang.org/api/iamcredentials/v1)) = 0.252.0 +Provides: bundled(golang(google.golang.org/api/internal)) = 0.252.0 +Provides: bundled(golang(google.golang.org/api/internal/cert)) = 0.252.0 +Provides: bundled(golang(google.golang.org/api/internal/gensupport)) = 0.252.0 +Provides: bundled(golang(google.golang.org/api/internal/impersonate)) = 0.252.0 +Provides: bundled(golang(google.golang.org/api/internal/third_party/uritemplates)) = 0.252.0 +Provides: bundled(golang(google.golang.org/api/iterator)) = 0.252.0 +Provides: bundled(golang(google.golang.org/api/option)) = 0.252.0 +Provides: bundled(golang(google.golang.org/api/option/internaloption)) = 0.252.0 +Provides: bundled(golang(google.golang.org/api/storage/v1)) = 0.252.0 +Provides: bundled(golang(google.golang.org/api/transport)) = 0.252.0 +Provides: bundled(golang(google.golang.org/api/transport/grpc)) = 0.252.0 +Provides: bundled(golang(google.golang.org/api/transport/http)) = 0.252.0 Provides: bundled(golang(gopkg.in/yaml.v3)) = 3.0.1 %description @@ -377,6 +377,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_prefix}/lib/bootupd/grub2-static/configs.d/05_ignition.cfg %changelog +* Tue Oct 14 2025 Steven Presti - 2.24.0-1 +- New Release + * Fri Oct 10 2025 Alejandro Sáez - 2.23.0-3 - rebuild diff --git a/sources b/sources index 802f1a5..4aee28e 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-2.23.0.tar.gz) = feacfa3efd18886eb577b77e0ebe26415fcb3f2493cf9058501b9fff3f9bf32c54320e013f65a8987e20271567b8fdc91ae2de162c8ea908a10adf2848c3ddc5 +SHA512 (ignition-2.24.0.tar.gz) = 45316c9ae10588ab6615e719d3ab8096ac67320d7c046c6777f502637fd05f1b9aecd00dddec352d18cfdd537c0a4f5fb42160b4697deccd401b67a8939fabd3 SHA512 (ignition-edge-a258749.tar.gz) = 0566807f7f4cbf9715566c8c39ba699df00f4ee5d579269c695a4af13d75a4e1f4639b54be85d0703373221d67a3ad0c532c0e075831316e3eed7a33cf316833 From 72b778259903beb19b76c7878212d2803ed95bf4 Mon Sep 17 00:00:00 2001 From: Steven Presti Date: Fri, 12 Dec 2025 14:17:49 -0500 Subject: [PATCH 171/172] Update to 2.25.0 Relates to: https://github.com/coreos/ignition/issues/2170 --- .gitignore | 1 + ignition.spec | 213 +++++++++++++++++++++++++------------------------- sources | 2 +- 3 files changed, 110 insertions(+), 106 deletions(-) diff --git a/.gitignore b/.gitignore index bef7f5a..d6cceb1 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,4 @@ /ignition-2.22.0.tar.gz /ignition-2.23.0.tar.gz /ignition-2.24.0.tar.gz +/ignition-2.25.0.tar.gz diff --git a/ignition.spec b/ignition.spec index 54a7768..3ffab57 100644 --- a/ignition.spec +++ b/ignition.spec @@ -13,7 +13,7 @@ # https://github.com/coreos/ignition %global goipath github.com/coreos/ignition %global gomodulesmode GO111MODULE=on -Version: 2.24.0 +Version: 2.25.0 %gometa @@ -48,71 +48,71 @@ 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.57.0 -Provides: bundled(golang(cloud.google.com/go/storage/experimental)) = 1.57.0 -Provides: bundled(golang(cloud.google.com/go/storage/internal)) = 1.57.0 -Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2)) = 1.57.0 -Provides: bundled(golang(cloud.google.com/go/storage/internal/apiv2/storagepb)) = 1.57.0 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/azidentity)) = 1.13.0 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/azidentity/internal)) = 1.13.0 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob)) = 1.6.2 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/appendblob)) = 1.6.2 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blob)) = 1.6.2 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/bloberror)) = 1.6.2 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/blockblob)) = 1.6.2 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/container)) = 1.6.2 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/base)) = 1.6.2 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/exported)) = 1.6.2 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/generated)) = 1.6.2 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/internal/shared)) = 1.6.2 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/pageblob)) = 1.6.2 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/sas)) = 1.6.2 -Provides: bundled(golang(github.com/Azure/azure-sdk-for-go/sdk/storage/azblob/service)) = 1.6.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/arn)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/defaults)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/middleware)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/protocol/xml)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/ratelimit)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/retry)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/signer/internal/v4)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/signer/v4)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/transport/http)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/auth)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/auth/smithy)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/awsutil)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/context)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/endpoints)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/endpoints/awsrulesfn)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/middleware)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/rand)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/sdk)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/sdkio)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/strings)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/sync/singleflight)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/timeconv)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/eventstreamapi)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/credentials/ec2rolecreds)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/feature/ec2/imds)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/feature/ec2/imds/internal/config)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/feature/s3/manager)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/configsources)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/endpoints/v2)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/v4a)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/v4a/internal/crypto)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/v4a/internal/v4)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/checksum)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/presigned-url)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/s3shared)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/s3shared/arn)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/s3shared/config)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/internal/arn)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/internal/endpoints)) = 1.39.2 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/types)) = 1.39.2 +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.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/arn)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/defaults)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/middleware)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/eventstreamapi)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/protocol/xml)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/ratelimit)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/retry)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/signer/internal/v4)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/signer/v4)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/transport/http)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/credentials/ec2rolecreds)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/feature/ec2/imds)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/feature/ec2/imds/internal/config)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/feature/s3/manager)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/auth)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/auth/smithy)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/awsutil)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/configsources)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/context)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/endpoints)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/endpoints/awsrulesfn)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/endpoints/v2)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/middleware)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/rand)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/sdk)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/sdkio)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/strings)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/sync/singleflight)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/timeconv)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/v4a)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/v4a/internal/crypto)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/v4a/internal/v4)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/checksum)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/presigned-url)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/s3shared)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/s3shared/arn)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/s3shared/config)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/internal/arn)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/internal/endpoints)) = 1.40.1 +Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/types)) = 1.40.1 +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(github.com/coreos/go-semver/semver)) = 0.3.1 @@ -124,7 +124,7 @@ Provides: bundled(golang(github.com/coreos/vcontext/path)) = 0.0.0-2023020118101 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.0 +Provides: bundled(golang(github.com/google/renameio/v2)) = 2.0.1 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 @@ -139,44 +139,44 @@ Provides: bundled(golang(github.com/vmware/vmw-guestinfo/message)) = 0.0.0-20220 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.46.0 -Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.46.0 -Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.46.0 -Provides: bundled(golang(golang.org/x/net/http2)) = 0.46.0 -Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.46.0 -Provides: bundled(golang(golang.org/x/net/idna)) = 0.46.0 -Provides: bundled(golang(golang.org/x/net/internal/httpcommon)) = 0.46.0 -Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.46.0 -Provides: bundled(golang(golang.org/x/net/trace)) = 0.46.0 -Provides: bundled(golang(golang.org/x/oauth2)) = 0.32.0 -Provides: bundled(golang(golang.org/x/oauth2/authhandler)) = 0.32.0 -Provides: bundled(golang(golang.org/x/oauth2/google)) = 0.32.0 -Provides: bundled(golang(golang.org/x/oauth2/google/externalaccount)) = 0.32.0 -Provides: bundled(golang(golang.org/x/oauth2/google/internal/externalaccountauthorizeduser)) = 0.32.0 -Provides: bundled(golang(golang.org/x/oauth2/google/internal/impersonate)) = 0.32.0 -Provides: bundled(golang(golang.org/x/oauth2/google/internal/stsexchange)) = 0.32.0 -Provides: bundled(golang(golang.org/x/oauth2/internal)) = 0.32.0 -Provides: bundled(golang(golang.org/x/oauth2/jws)) = 0.32.0 -Provides: bundled(golang(golang.org/x/oauth2/jwt)) = 0.32.0 -Provides: bundled(golang(golang.org/x/sys/cpu)) = 0.37.0 -Provides: bundled(golang(golang.org/x/sys/unix)) = 0.37.0 -Provides: bundled(golang(golang.org/x/sys/windows)) = 0.37.0 -Provides: bundled(golang(golang.org/x/sys/windows/registry)) = 0.37.0 -Provides: bundled(golang(google.golang.org/api/googleapi)) = 0.252.0 -Provides: bundled(golang(google.golang.org/api/googleapi/transport)) = 0.252.0 -Provides: bundled(golang(google.golang.org/api/iamcredentials/v1)) = 0.252.0 -Provides: bundled(golang(google.golang.org/api/internal)) = 0.252.0 -Provides: bundled(golang(google.golang.org/api/internal/cert)) = 0.252.0 -Provides: bundled(golang(google.golang.org/api/internal/gensupport)) = 0.252.0 -Provides: bundled(golang(google.golang.org/api/internal/impersonate)) = 0.252.0 -Provides: bundled(golang(google.golang.org/api/internal/third_party/uritemplates)) = 0.252.0 -Provides: bundled(golang(google.golang.org/api/iterator)) = 0.252.0 -Provides: bundled(golang(google.golang.org/api/option)) = 0.252.0 -Provides: bundled(golang(google.golang.org/api/option/internaloption)) = 0.252.0 -Provides: bundled(golang(google.golang.org/api/storage/v1)) = 0.252.0 -Provides: bundled(golang(google.golang.org/api/transport)) = 0.252.0 -Provides: bundled(golang(google.golang.org/api/transport/grpc)) = 0.252.0 -Provides: bundled(golang(google.golang.org/api/transport/http)) = 0.252.0 +Provides: bundled(golang(golang.org/x/net/bpf)) = 0.47.0 +Provides: bundled(golang(golang.org/x/net/http2)) = 0.47.0 +Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.47.0 +Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.47.0 +Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.47.0 +Provides: bundled(golang(golang.org/x/net/idna)) = 0.47.0 +Provides: bundled(golang(golang.org/x/net/internal/httpcommon)) = 0.47.0 +Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.47.0 +Provides: bundled(golang(golang.org/x/net/trace)) = 0.47.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.38.0 +Provides: bundled(golang(golang.org/x/sys/unix)) = 0.38.0 +Provides: bundled(golang(golang.org/x/sys/windows)) = 0.38.0 +Provides: bundled(golang(golang.org/x/sys/windows/registry)) = 0.38.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(gopkg.in/yaml.v3)) = 3.0.1 %description @@ -377,6 +377,9 @@ install -p -m 0755 ./ignition %{buildroot}/%{dracutlibdir}/modules.d/30ignition %{_prefix}/lib/bootupd/grub2-static/configs.d/05_ignition.cfg %changelog +* Fri Dec 12 2025 Steven Presti - 2.25.0-1 +- New Release + * Tue Oct 14 2025 Steven Presti - 2.24.0-1 - New Release diff --git a/sources b/sources index 4aee28e..eba629c 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-2.24.0.tar.gz) = 45316c9ae10588ab6615e719d3ab8096ac67320d7c046c6777f502637fd05f1b9aecd00dddec352d18cfdd537c0a4f5fb42160b4697deccd401b67a8939fabd3 +SHA512 (ignition-2.25.0.tar.gz) = 1f93f5b5b3ecc86141344c111f0970623dd8dd05a01685e1ca6fd2b6efe8f6b90f43b67249ec9c19536d8c879771eb4122348cda5f1f1b8dc240bb6354fc2271 SHA512 (ignition-edge-a258749.tar.gz) = 0566807f7f4cbf9715566c8c39ba699df00f4ee5d579269c695a4af13d75a4e1f4639b54be85d0703373221d67a3ad0c532c0e075831316e3eed7a33cf316833 From c94991707084a37e4030d74490683b08389e791e Mon Sep 17 00:00:00 2001 From: Yasmin de Souza Date: Mon, 29 Dec 2025 22:18:45 -0300 Subject: [PATCH 172/172] Update to 2.25.1 --- .gitignore | 1 + ignition.spec | 119 +++++++++++++++++++++++++------------------------- sources | 2 +- 3 files changed, 62 insertions(+), 60 deletions(-) diff --git a/.gitignore b/.gitignore index d6cceb1..f3efa89 100644 --- a/.gitignore +++ b/.gitignore @@ -72,3 +72,4 @@ /ignition-2.23.0.tar.gz /ignition-2.24.0.tar.gz /ignition-2.25.0.tar.gz +/ignition-2.25.1.tar.gz diff --git a/ignition.spec b/ignition.spec index 3ffab57..91f5dda 100644 --- a/ignition.spec +++ b/ignition.spec @@ -13,7 +13,7 @@ # https://github.com/coreos/ignition %global goipath github.com/coreos/ignition %global gomodulesmode GO111MODULE=on -Version: 2.25.0 +Version: 2.25.1 %gometa @@ -47,57 +47,58 @@ 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.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/arn)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/defaults)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/middleware)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream/eventstreamapi)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/protocol/xml)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/ratelimit)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/retry)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/signer/internal/v4)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/signer/v4)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/aws/transport/http)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/credentials/ec2rolecreds)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/feature/ec2/imds)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/feature/ec2/imds/internal/config)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/feature/s3/manager)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/auth)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/auth/smithy)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/awsutil)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/configsources)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/context)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/endpoints)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/endpoints/awsrulesfn)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/endpoints/v2)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/middleware)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/rand)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/sdk)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/sdkio)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/strings)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/sync/singleflight)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/timeconv)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/v4a)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/v4a/internal/crypto)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/internal/v4a/internal/v4)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/checksum)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/presigned-url)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/s3shared)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/s3shared/arn)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/internal/s3shared/config)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/internal/arn)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/internal/customizations)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/internal/endpoints)) = 1.40.1 -Provides: bundled(golang(github.com/aws/aws-sdk-go-v2/service/s3/types)) = 1.40.1 +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 @@ -139,15 +140,15 @@ Provides: bundled(golang(github.com/vmware/vmw-guestinfo/message)) = 0.0.0-20220 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.47.0 -Provides: bundled(golang(golang.org/x/net/http2)) = 0.47.0 -Provides: bundled(golang(golang.org/x/net/http2/hpack)) = 0.47.0 -Provides: bundled(golang(golang.org/x/net/http/httpguts)) = 0.47.0 -Provides: bundled(golang(golang.org/x/net/http/httpproxy)) = 0.47.0 -Provides: bundled(golang(golang.org/x/net/idna)) = 0.47.0 -Provides: bundled(golang(golang.org/x/net/internal/httpcommon)) = 0.47.0 -Provides: bundled(golang(golang.org/x/net/internal/timeseries)) = 0.47.0 -Provides: bundled(golang(golang.org/x/net/trace)) = 0.47.0 +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 @@ -158,10 +159,10 @@ Provides: bundled(golang(golang.org/x/oauth2/google/internal/stsexchange)) = 0.3 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.38.0 -Provides: bundled(golang(golang.org/x/sys/unix)) = 0.38.0 -Provides: bundled(golang(golang.org/x/sys/windows)) = 0.38.0 -Provides: bundled(golang(golang.org/x/sys/windows/registry)) = 0.38.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 diff --git a/sources b/sources index eba629c..848d645 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (ignition-2.25.0.tar.gz) = 1f93f5b5b3ecc86141344c111f0970623dd8dd05a01685e1ca6fd2b6efe8f6b90f43b67249ec9c19536d8c879771eb4122348cda5f1f1b8dc240bb6354fc2271 +SHA512 (ignition-2.25.1.tar.gz) = 8ca2bd96cdff8986e09371a9357975883c655dc6c16eb481ffd2772de37515fe64060ca575b3e4ac25a626b4701c65e5f5a8707ff62f37791f65ec321f7bb3a6 SHA512 (ignition-edge-a258749.tar.gz) = 0566807f7f4cbf9715566c8c39ba699df00f4ee5d579269c695a4af13d75a4e1f4639b54be85d0703373221d67a3ad0c532c0e075831316e3eed7a33cf316833