|
|
@ -5,14 +5,14 @@
|
|
|
|
# The library is for internal code reuse and is not a public API
|
|
|
|
# The library is for internal code reuse and is not a public API
|
|
|
|
%global __cargo_is_lib 0
|
|
|
|
%global __cargo_is_lib 0
|
|
|
|
|
|
|
|
|
|
|
|
%global dracutcommit 5a456ad690acffb43d49abed9f1940c915d68694
|
|
|
|
%global dracutcommit 71817332483aad341ffc666ed69b7869a7a90652
|
|
|
|
%global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7})
|
|
|
|
%global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7})
|
|
|
|
|
|
|
|
|
|
|
|
%global crate coreos-installer
|
|
|
|
%global crate coreos-installer
|
|
|
|
|
|
|
|
|
|
|
|
Name: rust-%{crate}
|
|
|
|
Name: rust-%{crate}
|
|
|
|
Version: 0.16.1
|
|
|
|
Version: 0.22.1
|
|
|
|
Release: 2%{?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
|
|
|
@ -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
|
|
|
|
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
|
|
|
|
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}
|
|
|
|
ExclusiveArch: %{rust_arches}
|
|
|
|
%if 0%{?rhel} && !0%{?eln}
|
|
|
|
%if 0%{?rhel} && !0%{?eln}
|
|
|
|
BuildRequires: rust-toolset
|
|
|
|
BuildRequires: rust-toolset
|
|
|
@ -85,21 +81,13 @@ Obsoletes: coreos-installer-dracut < 0.0.1
|
|
|
|
%prep
|
|
|
|
%prep
|
|
|
|
%autosetup -n %{crate}-%{version} -p1 -a 2
|
|
|
|
%autosetup -n %{crate}-%{version} -p1 -a 2
|
|
|
|
%if 0%{?rhel} && !0%{?eln}
|
|
|
|
%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}
|
|
|
|
tar xvf %{SOURCE1}
|
|
|
|
mkdir -p .cargo
|
|
|
|
%cargo_prep -v vendor
|
|
|
|
cat >.cargo/config << EOF
|
|
|
|
|
|
|
|
[source.crates-io]
|
|
|
|
|
|
|
|
replace-with = "vendored-sources"
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
[source.vendored-sources]
|
|
|
|
|
|
|
|
directory = "vendor"
|
|
|
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
%else
|
|
|
|
%else
|
|
|
|
%cargo_prep
|
|
|
|
%cargo_prep
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
# Fix SIGSEGV in tests on s390x
|
|
|
|
|
|
|
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1883457
|
|
|
|
|
|
|
|
sed -i 's/"-Ccodegen-units=1",//' .cargo/config
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
%if !0%{?rhel} || 0%{?eln}
|
|
|
|
%if !0%{?rhel} || 0%{?eln}
|
|
|
|
%generate_buildrequires
|
|
|
|
%generate_buildrequires
|
|
|
@ -185,6 +173,31 @@ from the initramfs.
|
|
|
|
%endif
|
|
|
|
%endif
|
|
|
|
|
|
|
|
|
|
|
|
%changelog
|
|
|
|
%changelog
|
|
|
|
|
|
|
|
* Fri Jul 26 2024 Packit <hello@packit.dev> - 0.22.1-1
|
|
|
|
|
|
|
|
- New upstream release
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* 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
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Mon Sep 11 2023 Antonio Murdaca <antoniomurdaca@gmail.com> - 0.17.0-4
|
|
|
|
|
|
|
|
- rebuilt to use rhel-target=exception
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Fri Sep 08 2023 Antonio Murdaca <antoniomurdaca@gmail.com> - 0.17.0-3
|
|
|
|
|
|
|
|
- rebuilt to hopefully fix up builds for 9.3
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Fri Sep 01 2023 Antonio Murdaca <antoniomurdaca@gmail.com> - 0.17.0-2
|
|
|
|
|
|
|
|
- Fix rhbz#2236826
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
* Tue Mar 14 2023 Benjamin Gilbert <bgilbert@redhat.com> - 0.17.0-1
|
|
|
|
|
|
|
|
- New release
|
|
|
|
|
|
|
|
|
|
|
|
* Wed Dec 07 2022 Irene Diez <idiez@redhat.com> - 0.16.1-2
|
|
|
|
* Wed Dec 07 2022 Irene Diez <idiez@redhat.com> - 0.16.1-2
|
|
|
|
- Add ignition support to coi-dracut
|
|
|
|
- Add ignition support to coi-dracut
|
|
|
|
- Fix usb installation
|
|
|
|
- Fix usb installation
|
|
|
|