diff --git a/.gitignore b/.gitignore index a17dbc6..f743837 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,5 @@ /coreos-installer-0.16.1.crate /coreos-installer-0.16.1-vendor.tar.gz /coreos-installer-dracut-38d9f61.tar.gz +/coreos-installer-0.17.0.crate +/coreos-installer-0.17.0-vendor.tar.gz diff --git a/0001-signing-keys-add-Fedora-39-key.patch b/0001-signing-keys-add-Fedora-39-key.patch deleted file mode 100644 index 1c875a1..0000000 --- a/0001-signing-keys-add-Fedora-39-key.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 4d56a2f6379ec69e2c5376ec5373be8c4b64d69e Mon Sep 17 00:00:00 2001 -From: Aashish Radhakrishnan -Date: Wed, 15 Feb 2023 17:54:20 -0500 -Subject: [PATCH] signing-keys: add Fedora 39 key We branched F38 from rawhide - so rawhide is now F39. - ---- - docs/release-notes.md | 2 ++ - src/signing-keys.asc | 31 +++++++++++++++++++++++++++++++ - 2 files changed, 33 insertions(+) - -diff --git a/src/signing-keys.asc b/src/signing-keys.asc -index 4f93010..90593b4 100644 ---- a/src/signing-keys.asc -+++ b/src/signing-keys.asc -@@ -121,3 +121,34 @@ n0BjqsWDnCKVFHydZ0TZSpeADmXMg2VYZPcp/cQR1KjoBoDxAscis7b1XPQUg7CB - zquq5jBVAnsNIhs7g47GWKyDUJM= - =aCLl - -----END PGP PUBLIC KEY BLOCK----- -+ -+-----BEGIN PGP PUBLIC KEY BLOCK----- -+Comment: RPM-GPG-KEY-fedora-39-primary -+ -+mQINBGLykg8BEADURjKtgQpQNoluifXia+U3FuqGCTQ1w7iTqx1UvNhLX6tb9Qjy -+l/vjl1iXxucrd2JBnrT/21BdtaABhu2hPy7bpcGEkG8MDinAMZBzcyzHcS/JiGHZ -+d/YmMWQUgbDlApbxFSGWiXMgT0Js5QdcywHI5oiCmV0lkZ+khZ4PkVWmk6uZgYWf -+JOG5wp5TDPnoYXlA4CLb6hu2691aDm9b99XYqEjhbeIzS9bFQrdrQzRMKyzLr8NW -+s8Pq2tgyzu8txlWdBXJyAMKldTPstqtygLL9UUdo7CIQQzWqeDbAnv+WdOmiI/hR -+etbbwNV+thkLJz0WD90C2L3JEeUJX5Qa4oPvfNLDeCKmJFEFUTCEdm0AYoQDjLJQ -+3d3q9M09thXO/jYM0cSnJDclssLNsNWfjJAerLadLwNnYRuralw7f74QSLYdJAJU -+SFShBlctWKnlhQ7ehockqtgXtWckkqPZZjGiMXwHde9b9Yyi+VqtUQWxSWny+9g9 -+6tcoa3AdnmpqSTHQxYajD0EGXJ0z0NXfqxkI0lo8UxzypEBy4sARZ4XhTU73Zwk0 -+LGhEUHlfyxXgRs6RRvM2UIoo+gou2M9rn/RWkhuHJNSfgrM0BmIBCjhjwGiS33Qh -+ysLDWJMdch8lsu1fTmLEFQrOB93oieOJQ0Ysi5gQY8TOT+oZvVi9pSMJuwARAQAB -+tDFGZWRvcmEgKDM5KSA8ZmVkb3JhLTM5LXByaW1hcnlAZmVkb3JhcHJvamVjdC5v -+cmc+iQJOBBMBCAA4FiEE6PI5lvIyGGQMtEy+dc9axBi450wFAmLykg8CGw8FCwkI -+BwIGFQoJCAsCBBYCAwECHgECF4AACgkQdc9axBi450yd4w//ZtghbZX5KFstOdBS -+rcbBfCK9zmRvzeejzGl6lPKfqwx7OOHYxFlRa9MYLl8QG7Aq6yRRWzzEHiSb0wJw -+WXz5tbkAmV/fpS4wnb3FDArD44u317UAnaU+UlhgK1g62lwI2dGpvTSvohMBMeBY -+B5aBd+sLi3UtiSRM2XhxvxaWwr/oFLjKDukgrPQzeV3F/XdxGhSz/GZUVFVprcrB -+h/dIo4k0Za7YVRhlVM0coOIcKbcjxAK9CCZ8+jtdIh3/BN5zJ0RFMgqSsrWYWeft -+BI3KWLbyMfRwEtp7xSi17WXbRfsSoqwIVgP+RCSaAdVuiYs/GCRsT3ydYcDvutuJ -+YZoE53yczemM/1HZZFI04zI7KBsKm9NFH0o4K2nBWuowBm59iFvWHFpX6em54cq4 -+45NwY01FkSQUqntfqCWFSowwFHAZM4gblOikq2B5zHoIntCiJlPGuaJiVSw9ZpEc -++IEQfmXJjKGSkMbU9tmNfLR9skVQJizMTtoUQ12DWC+14anxnnR2hxnhUDAabV6y -+J5dGeb/ArmxQj3IMrajdNwjuk9GMeMSSS2EMY8ryOuYwRbFhBOLhGAnmM5OOSUxv -+A4ipWraXDW0bK/wXI7yHMkc6WYrdV3SIXEqJBTp7npimv3JC+exWEbTLcgvV70FP -+X55M9nDtzUSayJuEcfFP2c9KQCE= -+=J4qZ -+-----END PGP PUBLIC KEY BLOCK----- --- -2.39.1 - diff --git a/mbrman-0.5.0.patch b/mbrman-0.5.0.patch deleted file mode 100644 index 25bc02d..0000000 --- a/mbrman-0.5.0.patch +++ /dev/null @@ -1,19 +0,0 @@ ---- coreos-installer-0.16.1/Cargo.toml.old 2022-10-14 01:32:13.064282069 -0400 -+++ coreos-installer-0.16.1/Cargo.toml 2022-10-14 01:32:44.416313454 -0400 -@@ -199,4 +199,3 @@ rdcore = [] - [target."cfg(target_arch = \"s390x\")".dependencies.mbrman] --version = ">= 0.3, < 0.5" --default-features = false -+version = ">= 0.5, < 0.6" - ---- a/src/s390x/fba.rs -+++ b/src/s390x/fba.rs -@@ -39,7 +39,7 @@ pub(crate) fn fba_make_partitions( - length: blocks * bytes_per_block as u64, - }); - mbr[idx + 1] = MBRPartitionEntry { -- boot: false, -+ boot: mbrman::BOOT_INACTIVE, - first_chs: CHS::empty(), - sys: 0x83, // MBR_LINUX_DATA_PARTITION - last_chs: CHS::empty(), diff --git a/rust-coreos-installer.spec b/rust-coreos-installer.spec index cc6f44c..7c2de74 100644 --- a/rust-coreos-installer.spec +++ b/rust-coreos-installer.spec @@ -11,8 +11,8 @@ %global crate coreos-installer Name: rust-%{crate} -Version: 0.16.1 -Release: 6%{?dist} +Version: 0.17.0 +Release: 1%{?dist} Summary: Installer for Fedora CoreOS and RHEL CoreOS # Upstream license specification: Apache-2.0 @@ -23,13 +23,6 @@ Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{ Source1: https://github.com/coreos/%{crate}/releases/download/v%{version}/%{crate}-%{version}-vendor.tar.gz Source2: https://github.com/coreos/coreos-installer-dracut/archive/%{dracutcommit}/coreos-installer-dracut-%{dracutshortcommit}.tar.gz -# Build with mbrman 0.5.x -# https://github.com/coreos/coreos-installer/pull/1019 -Patch0: mbrman-0.5.0.patch - -# https://github.com/coreos/coreos-installer/pull/1113 -Patch1: 0001-signing-keys-add-Fedora-39-key.patch - ExclusiveArch: %{rust_arches} %if 0%{?rhel} && !0%{?eln} BuildRequires: rust-toolset @@ -187,6 +180,9 @@ from the initramfs in IoT/Edge and is supported by the community. %endif %changelog +* Fri Mar 10 2023 Benjamin Gilbert - 0.17.0-1 +- New release + * Tue Feb 21 2023 Paul Whalen - 0.16.1-6 - Enable coreos-installer-dracut in Fedora diff --git a/sources b/sources index ac3e037..5e45147 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (coreos-installer-0.16.1.crate) = d9bb2c348b2c4f9d021c31a69decf97cb6b98d3fe8ca4a0e0765708afd5a6e9bb61a5ccc49c6a116229830dd901536f235c9a010e539a239e964a91a475efd6d -SHA512 (coreos-installer-0.16.1-vendor.tar.gz) = ab12bcc7a1d60f3c507feac1153f43b0a744e76e41c0068727dcd7371b74401b8085af943162ab1901adab780c3309d21417e1acef91469ec68ba35c88221d8d +SHA512 (coreos-installer-0.17.0.crate) = 78deef9b7ebf1277255e2f17a868ba0dd09f40152aeb3380cdc1387c0daa93715a0f9089f27d2a3b70464fe14e2e4764f6da222ff7bfbdfed880b0e3794d92db +SHA512 (coreos-installer-0.17.0-vendor.tar.gz) = 66af1322276cba44b974c536b3277b1e69893bd53f87f97a79fe9a8746fdd5d9230e88434d1c8f9c333e146deadd5e8122d9732fbba2f82aabbacf154d7ea68f SHA512 (coreos-installer-dracut-38d9f61.tar.gz) = a86f19bedd006ca47a2e9a7832182756cfec9d0d4718a1d7d3c699776236cd3a6a5be67b27212456e0893d65ab09ecb976484f588b8e2d8208d0a39464794af1