Compare commits
2 Commits
d23d874d52
...
8b8f302945
Author | SHA1 | Date |
---|---|---|
Steven Presti | 8b8f302945 | |
Steven Presti | 2510c7ec97 |
|
@ -37,3 +37,7 @@
|
|||
/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
|
||||
/coreos-installer-0.21.0.crate
|
||||
/coreos-installer-0.21.0-vendor.tar.gz
|
||||
|
|
|
@ -0,0 +1,2 @@
|
|||
9929a21d59a54ce99cd4b152cd6c473cfc500fee coreos-installer-0.21.0.crate
|
||||
fe23218c1231918cc4a02ee9f6b523f00f34d083 coreos-installer-0.21.0-vendor.tar.gz
|
|
@ -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]
|
|
@ -11,7 +11,7 @@
|
|||
%global crate coreos-installer
|
||||
|
||||
Name: rust-%{crate}
|
||||
Version: 0.18.0
|
||||
Version: 0.21.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,13 @@ from the initramfs.
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Feb 26 2024 Steven Presti <spresti@redhat.com> - 0.21.0-1
|
||||
- New release
|
||||
|
||||
* Thu Jan 04 2024 Steven Presti <spresti@redhat.com> - 0.20.0-1
|
||||
- New version
|
||||
- Remove rdcore patch, and move its logic into %prep
|
||||
|
||||
* Tue Nov 28 2023 Steven Presti <spresti@redhat.com> - 0.18.0-1
|
||||
- New version
|
||||
|
||||
|
|
4
sources
4
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.21.0.crate) = 40a5f8bb49ae16bd578329fc757f6d8e3785f34513665d8080171ab12cacb943182cab5e86142904472c1984548f7fa933c2e7cf405c3b013f4f589af4c64f8c
|
||||
SHA512 (coreos-installer-0.21.0-vendor.tar.gz) = 795d0070ec9dac45cb3d8ddac2425afc073bd596a870529e2898108b77a6a28b5dac9de580c34c3ee5a0e81e6d4f0debe9527979b611ab86e4219075bb51439f
|
||||
SHA512 (coreos-installer-dracut-7181733.tar.gz) = a03e3e90f355690eda974335e2189c69837f7f0ceb456a449b2de6ce4b24ca098d3f0ea51ddcab35ab354a5070e4b0525188dfbbff8056cfc62bbcdded10647c
|
||||
|
|
Loading…
Reference in New Issue