diff --git a/.gitignore b/.gitignore index 61e0dc6..9a81a92 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ /coreos-installer-0.14.0-vendor.tar.gz /coreos-installer-0.15.0.crate /coreos-installer-0.15.0-vendor.tar.gz +/coreos-installer-dracut-89d5789.tar.gz diff --git a/rust-coreos-installer.spec b/rust-coreos-installer.spec index e912346..a74954b 100644 --- a/rust-coreos-installer.spec +++ b/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 9332fe55e1439abc88a4362248533437f7e767c3 +%global dracutcommit 89d5789ef30ee35c7d083f425c7a083459989dbd %global dracutshortcommit %(c=%{dracutcommit}; echo ${c:0:7}) %global crate coreos-installer Name: rust-%{crate} Version: 0.15.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Installer for Fedora CoreOS and RHEL CoreOS # Upstream license specification: Apache-2.0 @@ -112,14 +112,7 @@ sed -i 's/"-Ccodegen-units=1",//' .cargo/config %if 0%{?rhel} && !0%{?eln} %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/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-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 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 @@ -184,6 +177,9 @@ from the initramfs. %endif %changelog +* Sun Jul 10 2022 Benjamin Gilbert - 0.15.0-2 +- Sync coreos-installer-dracut with CentOS Stream 9 + * Fri Jun 17 2022 Michael Armijo - 0.15.0-1 - New release - Install non-binary files using Makefile install targets diff --git a/sources b/sources index 0abfa3e..c722a76 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ SHA512 (coreos-installer-0.15.0.crate) = b1ef91e5710eb10ff06b2fb0bc0f3f78c28796e863caebd89d3ffac35a6347dfb107a072403e2c9a0b129ee32d0f73c331fd3a19d0476f4dcbb8836a1ea1b70a SHA512 (coreos-installer-0.15.0-vendor.tar.gz) = c1fec1b196622cf1710b27d220aa748eb4322fb69f899f34037ae266883e7d63d6986f8d31bd3eaeeceeaa2a13f728f2e4e310697d6dc271e6ddc370d0c99160 -SHA512 (coreos-installer-dracut-9332fe5.tar.gz) = 2cd481c4aacddcb51726a2d7e84879e7cb7623b5d984b1bd496362bfb3dc7ea6fb232864d696b7b72900d797674d14754222532167da545f445d8092ec2fe6ea +SHA512 (coreos-installer-dracut-89d5789.tar.gz) = deed6561a922382f781c14fe3ba3c322c7ad2c4e5cc353e54b443b9bf0a0f6a3ab4a32e42e600371b157963fb7fa0ff4f1c9418c74999225b972674b3b992cfb