This commit is contained in:
Nikita Dubrovskii 2023-09-13 09:30:44 +02:00
parent d0e4d4307c
commit a3ec0a71f9
5 changed files with 17 additions and 67 deletions

2
.gitignore vendored
View File

@ -33,3 +33,5 @@
/coreos-installer-0.17.0.crate /coreos-installer-0.17.0.crate
/coreos-installer-0.17.0-vendor.tar.gz /coreos-installer-0.17.0-vendor.tar.gz
/coreos-installer-dracut-a4be31d.tar.gz /coreos-installer-dracut-a4be31d.tar.gz
/coreos-installer-0.18.0.crate
/coreos-installer-0.18.0-vendor.tar.gz

View File

@ -1,53 +0,0 @@
From 40449c94139a384a00a4a4d0e597a078eda501c5 Mon Sep 17 00:00:00 2001
From: Aashish Radhakrishnan <aaradhak@redhat.com>
Date: Mon, 14 Aug 2023 11:02:38 -0400
Subject: [PATCH] signing-keys: add Fedora 40 key
We branched F39 from rawhide so rawhide is now F40.
---
src/signing-keys.asc | 31 +++++++++++++++++++++++++++++++
1 file changed, 31 insertions(+)
diff --git a/src/signing-keys.asc b/src/signing-keys.asc
index 1ba6ac9..0bb894c 100644
--- a/src/signing-keys.asc
+++ b/src/signing-keys.asc
@@ -121,3 +121,34 @@ A4ipWraXDW0bK/wXI7yHMkc6WYrdV3SIXEqJBTp7npimv3JC+exWEbTLcgvV70FP
X55M9nDtzUSayJuEcfFP2c9KQCE=
=J4qZ
-----END PGP PUBLIC KEY BLOCK-----
+
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Comment: RPM-GPG-KEY-fedora-40-primary
+
+mQINBGPQTCwBEADFUL0EQLzwpKHtlPkacVI156F2LnWp6K69g/6yzllidHI3b7EV
+QgQ9/Kdou6wNuOahNKa6WcEi6grEXexD7pAcu4xdRUp79XxQy5pC7Aq2/Dwf0vRL
+2y0kqof+C7iSzhHsfLoaqKKeh2njAo1KLZXYTHAWAMbXEyO/FJevaHLXe2+yYd7j
+luD58gyXgGDXXJ2lymLqs2jobjWdmGPNZGFl36RP3Dnk0FpbdH78kyIIsc2foYuF
+00rnuumwCtK3V58VOZo6IkaYk2irdyeetmJjVHwLHwJB3EaAwGy9Z2oAH3LxxFfk
+rQb0DH0Nzb3fpEziopOOqSi+6guV4RHUKAkCUMu+Mo5XwFVPUAIfNRTVqoIaEasC
+WO26lhkB87wwIvyb/TPGSeh6laHPRf0QOUOLkugdkSHoaJFWoTCcu9Y4aeDpf+ZQ
+fMVmkJNRS1tXONgz+pDk1rro/tNrkusYG18xjvSZTB0P0C4b4+jgK5l7me0NU6G3
+Ww/hIng5lxWfXgE9bpxlN834v1xy5Z3v17guJu1ec/jzKzQQ4356wyegXURjYoWe
+awcnK1S+9gxivnkOk1bGLNxrEh5vB6PDcI1VQ1ECH50EHyvE1IXJDaaStdAkacv2
+qHcd15CnlBW1LYFj0CHs/sGu9FD0iSF95OVRX4gjg9Wa4f8KvtEO/f+FeQARAQAB
+tDFGZWRvcmEgKDQwKSA8ZmVkb3JhLTQwLXByaW1hcnlAZmVkb3JhcHJvamVjdC5v
+cmc+iQJOBBMBCAA4FiEEEV35rvhXhT7oRF0KBydwfqFbecwFAmPQTCwCGw8FCwkI
+BwIGFQoJCAsCBBYCAwECHgECF4AACgkQBydwfqFbecxJOw//XaoJG3zN01bVM63H
+nFmMW/EnLzKrZqH8ZNq8CP9ycoc4q8SYcMprHKG9jufzj5/FhtpYecp3kBMpSYHt
+Vu46LS9NajJDwdfvUMezVbieNIQ8icTR5s5IUYFlc47eG6PRe3k0n5fOPcIb6q82
+byrK3dQnanOcVdoGU7QO9LAAHO9hg0zgZa0MxQAlDQov3dZcr7u7qGcQmU5JzcRS
+JgfDxHxDuMjmq6Kd0/UwD00kd2ptZgRls0ntXdm9CZGtQ/Q0baJ3eRzccpd/8bxy
+RWF9MnOdmV6ojcFKYECjEzcuheUlcKQH9rLkeBSfgrIlK3L7LG8bg5ouZLdx17rQ
+XABNQGmJTaGAiEnS/48G3roMS8R7fhUljcKr6t63QQQJ2qWdPvI6EMC2xKZsLHK4
+XiUvrmJpUprvEQSKBUOf/2zuXDBshtAnoKh7h5aG+TvozL4yNG5DKpSH3MRj1E43
+KoMsP/GN/X5h+vJnvhiCWxNMPP81Op0czBAgukBm627FTnsvieJOOrzyxb1s75+W
+56gJombmhzUfzr88AYY9mFy7diTw/oldDZcfwa8rvOAGJVDlyr2hqkLoGl+5jPex
+slt3NF4caE/wP9wPMgFRkmMOr8eiRhjlWLrO6mQdBp7Qsj3kEXioP+CZ1cv/sbaK
+4DM7VidB4PLrMFQMaf0LpjpC2DM=
+=wOl2
+-----END PGP PUBLIC KEY BLOCK-----
\ No newline at end of file
--
2.41.0

View File

@ -1,11 +1,12 @@
diff -ur a/Cargo.toml b/Cargo.toml diff --git a/Cargo.toml b/Cargo.toml
--- a/Cargo.toml 1969-12-31 19:00:01.000000000 -0500 index 3eb81f7..011116a 100644
+++ b/Cargo.toml 2023-03-14 07:57:14.025021766 -0400 --- a/Cargo.toml
@@ -195,6 +195,7 @@ +++ b/Cargo.toml
@@ -26,6 +26,7 @@ all-features = true
[features] [features]
docgen = ["dep:clap_mangen"] # rdcore is only useful inside the initrd of a CoreOS system
+default = ["rdcore"] +default = ["rdcore"]
rdcore = [] rdcore = []
docgen = ["clap/string", "dep:clap_mangen"]
[target."cfg(target_arch = \"s390x\")".dependencies.mbrman]

View File

@ -11,8 +11,8 @@
%global crate coreos-installer %global crate coreos-installer
Name: rust-%{crate} Name: rust-%{crate}
Version: 0.17.0 Version: 0.18.0
Release: 5%{?dist} Release: 1%{?dist}
Summary: Installer for Fedora CoreOS and RHEL CoreOS Summary: Installer for Fedora CoreOS and RHEL CoreOS
# Upstream license specification: Apache-2.0 # Upstream license specification: Apache-2.0
@ -25,10 +25,7 @@ Source2: https://github.com/coreos/coreos-installer-dracut/archive/%{drac
## RHEL specific patches ## RHEL specific patches
# enable rdcore in default feature set (RHEL macros do not take -f) # enable rdcore in default feature set (RHEL macros do not take -f)
Patch0: enable-rdcore.patch Patch1000: enable-rdcore.patch
# https://github.com/coreos/coreos-installer/pull/1264
Patch1: 0001-signing-keys-add-Fedora-40-key.patch
ExclusiveArch: %{rust_arches} ExclusiveArch: %{rust_arches}
%if 0%{?rhel} %if 0%{?rhel}
@ -180,6 +177,9 @@ from the initramfs in IoT/Edge and is supported by the community.
%endif %endif
%changelog %changelog
* Fri Sep 8 2023 Nikita Dubrovskii <nikita@linux.ibm.com> - 0.18.0-1
- New release
* Mon Aug 14 2023 Aashish Radhakrishnan <aaradhak@redhat.com> - 0.17.0-5 * Mon Aug 14 2023 Aashish Radhakrishnan <aaradhak@redhat.com> - 0.17.0-5
- Backport patch that adds F40 signing key - Backport patch that adds F40 signing key

View File

@ -1,3 +1,3 @@
SHA512 (coreos-installer-0.17.0.crate) = 78deef9b7ebf1277255e2f17a868ba0dd09f40152aeb3380cdc1387c0daa93715a0f9089f27d2a3b70464fe14e2e4764f6da222ff7bfbdfed880b0e3794d92db SHA512 (coreos-installer-0.18.0.crate) = 1da3fda20e8f22d8a59ac86254f29fba9e6b44f7c182c47a335a508e8b0dcb9f4c26d65f128e0b619873c6f2d1f7181e9b1eb6ffe57e9c970ba4d5f61740ee17
SHA512 (coreos-installer-0.17.0-vendor.tar.gz) = 66af1322276cba44b974c536b3277b1e69893bd53f87f97a79fe9a8746fdd5d9230e88434d1c8f9c333e146deadd5e8122d9732fbba2f82aabbacf154d7ea68f SHA512 (coreos-installer-0.18.0-vendor.tar.gz) = 964b100985a11c4e0670fe0995b771702634e0ffbbb37fa2d22033ef05c411c0f3a7026145ed21413f02a5211d5a36117e46860ce1e3e4396ad25c42e9da1b63
SHA512 (coreos-installer-dracut-a4be31d.tar.gz) = 4466599020cba8119750e5793f69c9e0c5cddb79edd771d2ef1e4f5dc4956fb9a4389b25c31d2e85ee165682d402922195e1dd642986df29ebeadb17f36239eb SHA512 (coreos-installer-dracut-a4be31d.tar.gz) = 4466599020cba8119750e5793f69c9e0c5cddb79edd771d2ef1e4f5dc4956fb9a4389b25c31d2e85ee165682d402922195e1dd642986df29ebeadb17f36239eb