diff --git a/.gitignore b/.gitignore index 85a004b..0252171 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,5 @@ /coreos-installer-dracut-7181733.tar.gz /coreos-installer-0.18.0.crate /coreos-installer-0.18.0-vendor.tar.gz +/coreos-installer-0.20.0.crate +/coreos-installer-0.20.0-vendor.tar.gz diff --git a/enable-rdcore.patch b/enable-rdcore.patch deleted file mode 100644 index e71d447..0000000 --- a/enable-rdcore.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/Cargo.toml b/Cargo.toml -index 0296f53..d280b86 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -199,6 +199,7 @@ docgen = [ - "clap/string", - "dep:clap_mangen", - ] -+default = ["rdcore"] - rdcore = [] - - [target."cfg(target_arch = \"s390x\")".dependencies.mbrman] diff --git a/rust-coreos-installer.spec b/rust-coreos-installer.spec index 347b784..2e0dd38 100644 --- a/rust-coreos-installer.spec +++ b/rust-coreos-installer.spec @@ -11,7 +11,7 @@ %global crate coreos-installer Name: rust-%{crate} -Version: 0.18.0 +Version: 0.20.0 Release: 1%{?dist} Summary: Installer for Fedora CoreOS and RHEL CoreOS @@ -23,10 +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 -# The RHEL 8 rust-toolset macros don't let us enable features from the -# %%cargo_* macros. Enable rdcore directly in Cargo.toml. -Patch0: enable-rdcore.patch - ExclusiveArch: %{rust_arches} %if 0%{?rhel} && !0%{?eln} BuildRequires: rust-toolset @@ -85,6 +81,8 @@ Obsoletes: coreos-installer-dracut < 0.0.1 %prep %autosetup -n %{crate}-%{version} -p1 -a 2 %if 0%{?rhel} && !0%{?eln} +# Hackily enable rdcore manually on RHEL (RHEL macros do not take -f) +sed -i '/^\[features\]/a \ \ default = ["rdcore"]' Cargo.toml tar xvf %{SOURCE1} mkdir -p .cargo cat >.cargo/config << EOF @@ -185,6 +183,10 @@ from the initramfs. %endif %changelog +* Thu Jan 04 2024 Steven Presti - 0.20.0-1 +- New version +- Remove rdcore patch, and move its logic into %prep + * Tue Nov 28 2023 Steven Presti - 0.18.0-1 - New version diff --git a/sources b/sources index 77dbb97..27c65ec 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (coreos-installer-0.18.0.crate) = 1da3fda20e8f22d8a59ac86254f29fba9e6b44f7c182c47a335a508e8b0dcb9f4c26d65f128e0b619873c6f2d1f7181e9b1eb6ffe57e9c970ba4d5f61740ee17 -SHA512 (coreos-installer-0.18.0-vendor.tar.gz) = 964b100985a11c4e0670fe0995b771702634e0ffbbb37fa2d22033ef05c411c0f3a7026145ed21413f02a5211d5a36117e46860ce1e3e4396ad25c42e9da1b63 +SHA512 (coreos-installer-0.20.0.crate) = 8ad94b27e431b51222bd14c39ddd41c9577eb05d4b22855efb2741a9d1a71030070c370ac4477cd26fa7e9c96acf9146c1b3ec6f3c9a0e5055cf3c7ba7d625e5 +SHA512 (coreos-installer-0.20.0-vendor.tar.gz) = 4556679728b52579306fc54ef50de93a32c1708a8d5cf9f8c70eb9d6f0d7b3492ef65a4e22442251d105408f47f3508e1b7ae9c88d3485305b0799ca80ef8eb7 SHA512 (coreos-installer-dracut-7181733.tar.gz) = a03e3e90f355690eda974335e2189c69837f7f0ceb456a449b2de6ce4b24ca098d3f0ea51ddcab35ab354a5070e4b0525188dfbbff8056cfc62bbcdded10647c