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.
This commit is contained in:
Jonathan Lebon 2020-01-31 10:08:49 -05:00
parent 895ede441f
commit 12436a7180
5 changed files with 12 additions and 8 deletions

1
.gitignore vendored
View File

@ -32,3 +32,4 @@
/ignition-dracut-8bf2cbd.tar.gz /ignition-dracut-8bf2cbd.tar.gz
/ignition-a8f91fa.tar.gz /ignition-a8f91fa.tar.gz
/ignition-dracut-736459e.tar.gz /ignition-dracut-736459e.tar.gz
/ignition-dracut-14808e2.tar.gz

View File

@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
set -xeuo pipefail 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

View File

@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
set -xeuo pipefail 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

View File

@ -67,13 +67,13 @@
# https://github.com/coreos/ignition-dracut spec2x branch # https://github.com/coreos/ignition-dracut spec2x branch
%global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo} %global dracutprovider_prefix %{dracutprovider}.%{dracutprovider_tld}/%{dracutproject}/%{dracutrepo}
%global dracutimport_path %{dracutprovider_prefix} %global dracutimport_path %{dracutprovider_prefix}
%global dracutcommit 736459e788b73ba62b8a04d0395519c033ddbcf5 %global dracutcommit 14808e25d77681d252cd0bac18803cce51758a93
%global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7})
Name: ignition Name: ignition
Version: 2.1.1 Version: 2.1.1
Release: 4.git%{shortcommit}%{?dist} Release: 5.git%{shortcommit}%{?dist}
Summary: First boot installer and configuration tool Summary: First boot installer and configuration tool
License: ASL 2.0 and BSD License: ASL 2.0 and BSD
URL: https://%{provider_prefix} URL: https://%{provider_prefix}
@ -420,11 +420,9 @@ export GOOS=linux
# ignition-dracut # ignition-dracut
install -d -p %{buildroot}/%{dracutlibdir}/modules.d install -d -p %{buildroot}/%{dracutlibdir}/modules.d
install -d -p %{buildroot}/%{_prefix}/lib/systemd/system install -d -p %{buildroot}/%{_prefix}/lib/systemd/system
install -d -p %{buildroot}/%{_sysconfdir}/grub.d
pushd %{dracutrepo}-%{dracutcommit} >/dev/null pushd %{dracutrepo}-%{dracutcommit} >/dev/null
cp -r dracut/* %{buildroot}/%{dracutlibdir}/modules.d/ cp -r dracut/* %{buildroot}/%{dracutlibdir}/modules.d/
install -m 0644 -t %{buildroot}/%{_prefix}/lib/systemd/system/ systemd/* install -m 0644 -t %{buildroot}/%{_prefix}/lib/systemd/system/ systemd/*
install -m 0755 -t %{buildroot}/%{_sysconfdir}/grub.d/ grub/*
popd >/dev/null popd >/dev/null
# ignition # ignition
@ -517,7 +515,6 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%license LICENSE LICENSE.dracut %license LICENSE LICENSE.dracut
%doc README.md doc/ %doc README.md doc/
%{dracutlibdir}/modules.d/* %{dracutlibdir}/modules.d/*
%{_sysconfdir}/grub.d/*
%{_prefix}/lib/systemd/system/*.service %{_prefix}/lib/systemd/system/*.service
%files validate %files validate
@ -546,6 +543,12 @@ export GOPATH=%{buildroot}/%{gopath}:$(pwd)/vendor:%{gopath}
%endif %endif
%changelog %changelog
* Fri Jan 31 2020 Jonathan Lebon <jonathan@jlebon.com> - 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 <releng@fedoraproject.org> - 2.1.1-4.git40c0b57 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2.1.1-4.git40c0b57
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild

View File

@ -1,2 +1,2 @@
SHA512 (ignition-dracut-736459e.tar.gz) = e76b97d77fe8efc0a190d43f0eb22a9d5f29d2bd49fd77d744cf386b69e354ac3ead61393d161874a8703dac352e99d37d97a10b3d2ecf33638ebdc733cb0730 SHA512 (ignition-dracut-14808e2.tar.gz) = 9376730777a4859d1d60f99aacd59bbcb0c8194cf120bea40015a0d8451946ddcf5c7ec2043227c0c57a0e4f8c89445f20656ab2de6bc03f07f8bf8fea3a7df3
SHA512 (ignition-40c0b57.tar.gz) = aeb195281378c2f531c442214cb4fe735e4ac91d5cd9ac1ae0b9f41ea7d9b5d78a9be85d77399152c863ebf8ad246d53753153eee6ebf1d9aae80fc6f65299d9 SHA512 (ignition-40c0b57.tar.gz) = aeb195281378c2f531c442214cb4fe735e4ac91d5cd9ac1ae0b9f41ea7d9b5d78a9be85d77399152c863ebf8ad246d53753153eee6ebf1d9aae80fc6f65299d9