From 0d4597fdc915cac739b0234c4658cfa2e33df7e8 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 7 Oct 2024 21:15:45 +0300 Subject: [PATCH] import rust-coreos-installer-0.22.1-1.el9 --- .gitignore | 6 ++-- .rust-coreos-installer.metadata | 6 ++-- SOURCES/enable-rdcore.patch | 10 ------- SPECS/rust-coreos-installer.spec | 49 ++++++++++++++++++++------------ 4 files changed, 37 insertions(+), 34 deletions(-) delete mode 100644 SOURCES/enable-rdcore.patch diff --git a/.gitignore b/.gitignore index ca1655e..1e1a536 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -SOURCES/coreos-installer-0.16.1-vendor.tar.gz -SOURCES/coreos-installer-0.16.1.crate -SOURCES/coreos-installer-dracut-5a456ad.tar.gz +SOURCES/coreos-installer-0.22.1-vendor.tar.gz +SOURCES/coreos-installer-0.22.1.crate +SOURCES/coreos-installer-dracut-7181733.tar.gz diff --git a/.rust-coreos-installer.metadata b/.rust-coreos-installer.metadata index 73071cc..c0371e8 100644 --- a/.rust-coreos-installer.metadata +++ b/.rust-coreos-installer.metadata @@ -1,3 +1,3 @@ -c5696c7f7e9da590855ec835e928f3f7e6303529 SOURCES/coreos-installer-0.16.1-vendor.tar.gz -51565a808a2349b49f5ef5f15be23d87313df146 SOURCES/coreos-installer-0.16.1.crate -6dd225c4d210b3a2e6ded364e243471934483e30 SOURCES/coreos-installer-dracut-5a456ad.tar.gz +4970b2d2690f9bd98864bd66e8f543275f4a7878 SOURCES/coreos-installer-0.22.1-vendor.tar.gz +6d16f08bdec253d65c293df24f73bd6dfb8cf2de SOURCES/coreos-installer-0.22.1.crate +81f96c32efa9e32730e1f3bda5a820d33229f006 SOURCES/coreos-installer-dracut-7181733.tar.gz diff --git a/SOURCES/enable-rdcore.patch b/SOURCES/enable-rdcore.patch deleted file mode 100644 index 36a500f..0000000 --- a/SOURCES/enable-rdcore.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/Cargo2.toml 2022-09-21 11:19:37.605292726 -0400 -+++ b/Cargo.toml 2022-09-21 11:22:29.029020709 -0400 -@@ -194,6 +194,7 @@ - - [features] - docgen = ["clap_mangen"] -+default = ["rdcore"] - rdcore = [] - - [target."cfg(target_arch = \"s390x\")".dependencies.mbrman] diff --git a/SPECS/rust-coreos-installer.spec b/SPECS/rust-coreos-installer.spec index 5cec9d4..dcebd97 100644 --- a/SPECS/rust-coreos-installer.spec +++ b/SPECS/rust-coreos-installer.spec @@ -5,14 +5,14 @@ # The library is for internal code reuse and is not a public API %global __cargo_is_lib 0 -%global dracutcommit 5a456ad690acffb43d49abed9f1940c915d68694 +%global dracutcommit 71817332483aad341ffc666ed69b7869a7a90652 %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) %global crate coreos-installer Name: rust-%{crate} -Version: 0.16.1 -Release: 2%{?dist} +Version: 0.22.1 +Release: 1%{?dist} Summary: Installer for Fedora CoreOS and RHEL CoreOS # 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 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,21 +81,13 @@ 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 -[source.crates-io] -replace-with = "vendored-sources" - -[source.vendored-sources] -directory = "vendor" -EOF +%cargo_prep -v vendor %else %cargo_prep %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} %generate_buildrequires @@ -185,6 +173,31 @@ from the initramfs. %endif %changelog +* Fri Jul 26 2024 Packit - 0.22.1-1 +- New upstream release + +* Mon Feb 26 2024 Steven Presti - 0.21.0-1 +- New release + +* 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 + +* Mon Sep 11 2023 Antonio Murdaca - 0.17.0-4 +- rebuilt to use rhel-target=exception + +* Fri Sep 08 2023 Antonio Murdaca - 0.17.0-3 +- rebuilt to hopefully fix up builds for 9.3 + +* Fri Sep 01 2023 Antonio Murdaca - 0.17.0-2 +- Fix rhbz#2236826 + +* Tue Mar 14 2023 Benjamin Gilbert - 0.17.0-1 +- New release + * Wed Dec 07 2022 Irene Diez - 0.16.1-2 - Add ignition support to coi-dracut - Fix usb installation