diff --git a/.gitignore b/.gitignore index 5f43e53..0bb6155 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -SOURCES/coreos-installer-0.11.0-vendor.tar.gz -SOURCES/coreos-installer-0.11.0.crate -SOURCES/coreos-installer-dracut-1a262bd.tar.gz +SOURCES/coreos-installer-0.15.0-vendor.tar.gz +SOURCES/coreos-installer-0.15.0.crate +SOURCES/coreos-installer-dracut-38d9f61.tar.gz diff --git a/.rust-coreos-installer.metadata b/.rust-coreos-installer.metadata index bbb06fd..d410daa 100644 --- a/.rust-coreos-installer.metadata +++ b/.rust-coreos-installer.metadata @@ -1,3 +1,3 @@ -2a876f160edceed577652d36f61c32b27e2bd734 SOURCES/coreos-installer-0.11.0-vendor.tar.gz -4ab40027b2ec1716b95a47090f750d7760c5bd90 SOURCES/coreos-installer-0.11.0.crate -01dc4e66374b6239963bfcf6d80724b0cddd7b75 SOURCES/coreos-installer-dracut-1a262bd.tar.gz +8e250257f77d3c5c42ce433c5d5f424a22580a3a SOURCES/coreos-installer-0.15.0-vendor.tar.gz +981cfec7af755b78700c0e470a9e539a7fc1538c SOURCES/coreos-installer-0.15.0.crate +5a36af3d6018cd244b9dad5b031d2a2c07529e34 SOURCES/coreos-installer-dracut-38d9f61.tar.gz diff --git a/SOURCES/disable-lto.patch b/SOURCES/disable-lto.patch deleted file mode 100644 index f709656..0000000 --- a/SOURCES/disable-lto.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- coreos-installer-0.11.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ coreos-installer-0.11.0/Cargo.toml 2021-12-15T20:16:00.065634+00:00 -@@ -39,7 +39,6 @@ - opt-level = 3 - - [profile.release] --lto = true - debug = true - - [lib] diff --git a/SOURCES/enable-rdcore.patch b/SOURCES/enable-rdcore.patch index 2352682..f3e06f9 100644 --- a/SOURCES/enable-rdcore.patch +++ b/SOURCES/enable-rdcore.patch @@ -1,9 +1,9 @@ ---- coreos-installer-0.11.0/Cargo.toml 1970-01-01T00:00:01+00:00 -+++ coreos-installer-0.11.0/Cargo.toml 2021-12-15T20:13:31.152703+00:00 -@@ -139,6 +139,7 @@ - version = "^1.0" +--- coreos-installer-0.15.0/Cargo.toml.old 2022-06-30 14:41:55.017099085 -0400 ++++ coreos-installer-0.15.0/Cargo.toml 2022-06-30 14:44:20.754046186 -0400 +@@ -156,6 +156,7 @@ [features] + mangen = ["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 9e2d566..351ac61 100644 --- a/SPECS/rust-coreos-installer.spec +++ b/SPECS/rust-coreos-installer.spec @@ -1,18 +1,18 @@ -# Generated by rust2rpm 16 +# Originally generated by rust2rpm 16 %define dracutlibdir %{_prefix}/lib/dracut %bcond_without check %global __cargo_skip_build 0 # The library is for internal code reuse and is not a public API %global __cargo_is_lib 0 -%global dracutcommit 1a262bd9553ee0b3607b4d1982947a1fd6567c35 +%global dracutcommit 38d9f618cd6817ec7c1f1797b273d6f1f46852cb %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) %global crate coreos-installer Name: rust-%{crate} -Version: 0.11.0 -Release: 4%{?dist} +Version: 0.15.0 +Release: 2%{?dist} Summary: Installer for Fedora CoreOS and RHEL CoreOS # Upstream license specification: Apache-2.0 @@ -26,16 +26,12 @@ Source2: https://github.com/coreos/coreos-installer-dracut/archive/%{drac # 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 -# LTO causes runtime crashes on s390x -# https://github.com/coreos/coreos-installer/pull/360 -# https://github.com/coreos/coreos-installer/issues/372 -# https://bugzilla.redhat.com/show_bug.cgi?id=1863466 -Patch1: disable-lto.patch ExclusiveArch: %{rust_arches} %if 0%{?rhel} && !0%{?eln} BuildRequires: rust-toolset BuildRequires: openssl-devel +# To ensure we're not bundling system libraries BuildRequires: xz-devel %else BuildRequires: rust-packaging @@ -85,11 +81,6 @@ Obsoletes: coreos-installer-dracut < 0.0.1 %description -n %{crate} %{_description} -%files -n %{crate} -%license LICENSE -%doc README.md -%{_bindir}/coreos-installer - %prep %autosetup -n %{crate}-%{version} -p1 -a 2 %if 0%{?rhel} && !0%{?eln} @@ -123,33 +114,16 @@ sed -i 's/"-Ccodegen-units=1",//' .cargo/config %install %if 0%{?rhel} && !0%{?eln} -%make_install +%make_install RELEASE=1 # 51coreos-installer for coreos-installer-dracut -install -D -m 0755 -t %{buildroot}%{dracutlibdir}/modules.d/51coreos-installer coreos-installer-dracut-%{dracutcommit}/dracut/51coreos-installer/module-setup.sh -install -D -m 0755 -t %{buildroot}%{dracutlibdir}/modules.d/51coreos-installer coreos-installer-dracut-%{dracutcommit}/dracut/systemd/coreos-installer.target -install -D -m 0755 -t %{buildroot}%{dracutlibdir}/modules.d/51coreos-installer coreos-installer-dracut-%{dracutcommit}/dracut/scripts/coreos-installer-service -install -D -m 0755 -t %{buildroot}%{dracutlibdir}/modules.d/51coreos-installer coreos-installer-dracut-%{dracutcommit}/dracut/scripts/coreos-installer-growfs -install -D -m 0644 -t %{buildroot}%{dracutlibdir}/modules.d/51coreos-installer coreos-installer-dracut-%{dracutcommit}/dracut/systemd/coreos-installer.service -install -D -m 0644 -t %{buildroot}%{dracutlibdir}/modules.d/51coreos-installer coreos-installer-dracut-%{dracutcommit}/dracut/systemd/coreos-installer-growfs.service -install -D -m 0644 -t %{buildroot}%{dracutlibdir}/modules.d/51coreos-installer coreos-installer-dracut-%{dracutcommit}/dracut/systemd/coreos-installer-luks-open.service -install -D -m 0644 -t %{buildroot}%{dracutlibdir}/modules.d/51coreos-installer coreos-installer-dracut-%{dracutcommit}/dracut/systemd/coreos-installer-reboot.service -install -D -m 0644 -t %{buildroot}%{dracutlibdir}/modules.d/51coreos-installer coreos-installer-dracut-%{dracutcommit}/dracut/systemd/coreos-installer-noreboot.service -install -D -m 0644 -t %{buildroot}%{dracutlibdir}/modules.d/51coreos-installer coreos-installer-dracut-%{dracutcommit}/dracut/systemd/coreos-installer-poweroff.service -install -D -m 0755 -t %{buildroot}%{dracutlibdir}/modules.d/51coreos-installer coreos-installer-dracut-%{dracutcommit}/dracut/systemd/coreos-installer-generator +%make_install -C coreos-installer-dracut-%{dracutcommit} %else %cargo_install -f rdcore # Install binaries, dracut modules, units, targets, generators for running via systemd install -D -m 0755 -t %{buildroot}%{dracutlibdir}/modules.d/50rdcore dracut/50rdcore/module-setup.sh -install -D -m 0755 -t %{buildroot}%{_libexecdir} scripts/coreos-installer-service -install -D -m 0755 -t %{buildroot}%{_libexecdir} scripts/coreos-installer-disable-device-auto-activation -install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/coreos-installer-disable-device-auto-activation.service -install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/coreos-installer.service -install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/coreos-installer-reboot.service -install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/coreos-installer-noreboot.service -install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/coreos-installer-pre.target -install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/coreos-installer.target -install -D -m 0644 -t %{buildroot}%{_unitdir} systemd/coreos-installer-post.target -install -D -m 0755 -t %{buildroot}%{_systemdgeneratordir} systemd/coreos-installer-generator +make install-scripts DESTDIR=%{buildroot} +make install-systemd DESTDIR=%{buildroot} +make install-man DESTDIR=%{buildroot} mv %{buildroot}%{_bindir}/rdcore %{buildroot}%{dracutlibdir}/modules.d/50rdcore/ %endif @@ -191,6 +165,12 @@ from the initramfs. %{dracutlibdir}/modules.d/51coreos-installer %endif +%files -n %{crate} +%license LICENSE +%doc README.md +%{_bindir}/coreos-installer +%{_mandir}/man8/* + %if %{with check} %check %if 0%{?rhel} && !0%{?eln} @@ -201,6 +181,14 @@ from the initramfs. %endif %changelog +* Thu Aug 18 2022 Antonio Murdaca - 0.15.0-2 +- update coi-dracut to support LVM backed growfs service + +* Tue Jul 12 2022 Michael Armijo - 0.15.0-1 +- New release +- Sync with Fedora package +- Install coreos-installer-dracut with "make install" + * Thu Feb 24 2022 Antonio Murdaca - 0.11.0-4 - update coi-dracut to fix growfs service Before