diff --git a/.gitignore b/.gitignore index 35a7372..c118aa7 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ -SOURCES/coreos-installer-0.10.1-vendor.tar.gz -SOURCES/coreos-installer-0.10.1.crate -SOURCES/coreos-installer-dracut-9332fe5.tar.gz +SOURCES/coreos-installer-0.11.0-vendor.tar.gz +SOURCES/coreos-installer-0.11.0.crate +SOURCES/coreos-installer-dracut-ce0fe1e.tar.gz diff --git a/.rust-coreos-installer.metadata b/.rust-coreos-installer.metadata index 387d16b..f0cf35b 100644 --- a/.rust-coreos-installer.metadata +++ b/.rust-coreos-installer.metadata @@ -1,3 +1,3 @@ -19c823fcddba372dd7d897b93fda539c2e0bc101 SOURCES/coreos-installer-0.10.1-vendor.tar.gz -026193aadb28e0d70ce4f71b29e90d90dbc999c4 SOURCES/coreos-installer-0.10.1.crate -ab4a196d90af037303bacad800ff99ad333bae78 SOURCES/coreos-installer-dracut-9332fe5.tar.gz +2a876f160edceed577652d36f61c32b27e2bd734 SOURCES/coreos-installer-0.11.0-vendor.tar.gz +4ab40027b2ec1716b95a47090f750d7760c5bd90 SOURCES/coreos-installer-0.11.0.crate +285c221d28b23a7a2ca16009c36e92ffb71d3026 SOURCES/coreos-installer-dracut-ce0fe1e.tar.gz diff --git a/SOURCES/disable-lto.patch b/SOURCES/disable-lto.patch index 5ab72aa..f709656 100644 --- a/SOURCES/disable-lto.patch +++ b/SOURCES/disable-lto.patch @@ -1,12 +1,10 @@ ---- coreos-installer-0.10.0/Cargo.toml 2021-09-02 10:50:54.538578470 +0200 -+++ coreos-installer-0.10.0/Cargo.toml 2021-09-02 10:51:20.779926148 +0200 -@@ -35,9 +35,6 @@ - [profile.dev.package.miniz_oxide] +--- 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] + [profile.release] -lto = true -- + debug = true + [lib] - name = "libcoreinst" - path = "src/lib.rs" diff --git a/SOURCES/enable-rdcore.patch b/SOURCES/enable-rdcore.patch index 950c0f7..2352682 100644 --- a/SOURCES/enable-rdcore.patch +++ b/SOURCES/enable-rdcore.patch @@ -1,6 +1,6 @@ ---- coreos-installer-0.10.0/Cargo.toml 2021-09-02 10:48:49.577922841 +0200 -+++ coreos-installer-0.10.0/Cargo.toml 2021-09-02 10:49:23.366370513 +0200 -@@ -129,6 +129,7 @@ +--- 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" [features] diff --git a/SPECS/rust-coreos-installer.spec b/SPECS/rust-coreos-installer.spec index f101ee4..3a500fe 100644 --- a/SPECS/rust-coreos-installer.spec +++ b/SPECS/rust-coreos-installer.spec @@ -5,20 +5,21 @@ # The library is for internal code reuse and is not a public API %global __cargo_is_lib 0 -%global dracutcommit 9332fe55e1439abc88a4362248533437f7e767c3 +%global dracutcommit ce0fe1ef3352827acc660a0c53156f68dc44bca7 %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) %global crate coreos-installer Name: rust-%{crate} -Version: 0.10.1 -Release: 6%{?dist} +Version: 0.11.0 +Release: 3%{?dist} Summary: Installer for Fedora CoreOS and RHEL CoreOS # Upstream license specification: Apache-2.0 License: ASL 2.0 URL: https://crates.io/crates/coreos-installer Source0: https://crates.io/api/v1/crates/%{crate}/%{version}/download#/%{crate}-%{version}.crate +# not used on Fedora 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 @@ -130,8 +131,10 @@ install -D -m 0755 -t %{buildroot}%{dracutlibdir}/modules.d/51coreos-installer c 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 %else %cargo_install -f rdcore @@ -170,7 +173,7 @@ This subpackage contains boot-time infrastructure for Fedora CoreOS and RHEL CoreOS. It is not needed on other platforms. %files -n %{crate}-bootinfra -%{dracutlibdir}/modules.d/* +%{dracutlibdir}/modules.d/50rdcore %{_libexecdir}/* %{_unitdir}/* %{_systemdgeneratordir}/* @@ -185,7 +188,7 @@ This subpackage contains files and configuration to run coreos-installer from the initramfs. %files -n %{crate}-dracut -%{dracutlibdir}/modules.d/51coreos-installer/* +%{dracutlibdir}/modules.d/51coreos-installer %endif %if %{with check} @@ -198,6 +201,17 @@ from the initramfs. %endif %changelog +* Thu Feb 10 2022 Antonio Murdaca - 0.11.0-3 +- update coi-dracut to support default poweroff behavior + +* Wed Jan 26 2022 Antonio Murdaca - 0.11.0-2 +- Bump coreos-installer-dracut to support encrypted rootfs + +* Wed Dec 15 2021 Sohan Kunkerkar - 0.11.0-1 +- New release +- Fix inadvertent inclusion of coreos-installer-dracut in -bootinfra on RHEL +- Have -dracut own 51coreos-installer directory on RHEL + * Tue Nov 30 2021 Sohan Kunkerkar - 0.10.1-6 - Vendor rust dependencies on RHEL only - Add coreos-installer-dracut subpackage on RHEL only