The package rpms/stratisd.git has added or updated architecture specific content in its
spec file (ExclusiveArch/ExcludeArch or %ifarch/%ifnarch) in commit(s):
https://src.fedoraproject.org/cgit/rpms/stratisd.git/commit/?id=411335056....
Change:
+ExclusiveArch: %{rust_arches}
Thanks.
Full change:
============
commit 4113350565dcedc77f9b560444885176f16dae8d
Author: mulhern <amulhern(a)redhat.com>
Date: Wed May 25 20:35:54 2022 -0400
Update to 3.1.0
diff --git a/.gitignore b/.gitignore
index 14448fd..c25cc06 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,6 @@
/stratisd-3.0.4.tar.gz
/stratisd-3.0.4-vendor.tar.gz
/stratisd-3.0.4.crate
+/stratisd-3.1.0.tar.gz
+/stratisd-3.1.0-vendor.tar.gz
+/stratisd-3.1.0.crate
diff --git a/rpminspect.yaml b/rpminspect.yaml
new file mode 100644
index 0000000..a5f2e02
--- /dev/null
+++ b/rpminspect.yaml
@@ -0,0 +1,19 @@
+---
+metadata:
+ buildhost_subdomain:
+ - .redhat.com
+ - .localdomain
+inspections:
+ # none of our compiled code has an ABI
+ abidiff: off
+ # at present the wrong debuginfo files are being used to run this check
+ annocheck: off
+ # the project does not use .desktop files
+ desktop: off
+ # the project uses no Java
+ javabytecode: off
+
+rpmdeps:
+ # ignore auto dependencies like: (crate(bindgen/default) >= 0.59.0 with
crate(bindgen/default) < 0.60.0~)'
+ ignore:
+ requires: ^\(crate\(.*\)$
diff --git a/sources b/sources
index 4d50259..19c48dc 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
-SHA512 (stratisd-3.0.4.crate) =
fa6edd7d9051bbd5c3e1aefb0301993f32271804cf5002f293a13e9b18409d65ce878d543d64e02299d97764930ae4fc0143f33026378b26bd4cb347fd056481
-SHA512 (stratisd-3.0.4.tar.gz) =
2da560302f6b7c6cd502fa521259cb5b265bc952556523af5cba1440a9e7bcd2ac61d6e341fff1320eb4e4d5aca84b9f555af62c268360b1014af78e97f15025
-SHA512 (stratisd-3.0.4-vendor.tar.gz) =
4c2adf231e3361c80d0eea93f7d55e35989641fe17b87e9c8f62420e2b2c360d56c656f147573e4a6f238a62fc0fe567320861e22f98fd5df178dd56cedbecf1
+SHA512 (stratisd-3.1.0.tar.gz) =
3a0e5fc3e1dcf19dbbf060324fe19637a50ef0ff219aa5c8e6d5d8a84b8d98f939c10d602edd999a01cf9c9be503bfe88d1a7aa66ded1e3ff142021aa40fe239
+SHA512 (stratisd-3.1.0-vendor.tar.gz) =
e8b5e78f24453133f21559a2824a185efac39cfa2397e12c621d189b1c5f55a4529f930e4cc77bcd423d98ab440d595ec95612546f37857205a4fc35a5664ddb
+SHA512 (stratisd-3.1.0.crate) =
9f1eaab6df58fd162d47e5213129ff46be6eaaf0c72b2bb1ef51bdebeb0ba7e625d546ac0068b2deb1a14bf676f9b7c205f63ae548837d8908405fc57fee4b92
diff --git a/stratisd.spec b/stratisd.spec
index 3eba9ee..604bc33 100644
--- a/stratisd.spec
+++ b/stratisd.spec
@@ -1,25 +1,20 @@
-# Generated by rust2rpm
%bcond_without check
-%global __cargo_skip_build 0
+
%global udevdir %(pkg-config --variable=udevdir udev)
%global dracutdir %(pkg-config --variable=dracutdir dracut)
-# Not interested in packaging lib
-# stratisd is supposed to be daemon used through dbus
-%global __cargo_is_lib() false
-
Name: stratisd
-Version: 3.0.4
-Release: 2%{?dist}
+Version: 3.1.0
+Release: 1%{?dist}
Summary: Daemon that manages block devices to create filesystems
-# 0BSD or MIT or ASL 2.0
# ASL 2.0
# ASL 2.0 or Boost
+# ASL 2.0 or MIT
# BSD
+# ISC
# MIT
# MIT or ASL 2.0
-# MIT or zlib or ASL 2.0
# MPLv2.0
# Unlicense or MIT
License: MPLv2.0 and ASL 2.0 and BSD and MIT
@@ -32,21 +27,27 @@ ExclusiveArch: %{rust_arches}
%if 0%{?rhel} && !0%{?eln}
BuildRequires: rust-toolset
-BuildRequires: systemd-devel
-BuildRequires: dbus-devel
-BuildRequires: clang
-BuildRequires: /usr/bin/a2x
-BuildRequires: pkgconfig(libcryptsetup) >= 2.3.0
-BuildRequires: pkgconfig(blkid) >= 2.32.0
%else
BuildRequires: rust-packaging
%endif
+BuildRequires: rust-srpm-macros
+BuildRequires: systemd-devel
+BuildRequires: dbus-devel
+BuildRequires: libblkid-devel
+BuildRequires: cryptsetup-devel
+BuildRequires: clang
+BuildRequires: %{_bindir}/a2x
+
+# Required to calculate install directories
BuildRequires: systemd
BuildRequires: dracut
-%{?systemd_requires}
Requires: xfsprogs
Requires: device-mapper-persistent-data
+Requires: systemd-libs
+Requires: dbus-libs
+Requires: cryptsetup-libs
+Requires: libblkid
Recommends: clevis-luks >= 18
@@ -56,82 +57,48 @@ Recommends: clevis-luks >= 18
%package dracut
Summary: Dracut modules for use with stratisd
-ExclusiveArch: ${rust_arches}
+ExclusiveArch: %{rust_arches}
Requires: stratisd
Requires: dracut >= 051
Requires: plymouth
%description dracut
-
-This package contains dracut modules to be used with stratisd
-to enable using Stratis filesystems as the root filesystem for
-a Linux install.
+%{summary}.
%prep
%setup -q
-tar xvf %{SOURCE2} --strip-components=1
-# Patches must be applied after the upstream package is extracted
+tar --strip-components=1 --extract --verbose --file %{SOURCE2}
+# Patches must be applied after the upstream package is extracted.
%if 0%{?rhel} && !0%{?eln}
# Source1 is vendored dependencies
%cargo_prep -V 1
%else
%cargo_prep
-
%generate_buildrequires
%cargo_generate_buildrequires -f dbus_enabled,min,systemd_compat
-echo '/usr/bin/a2x'
-echo 'pkgconfig(libcryptsetup) >= 2.3.0'
-echo 'pkgconfig(blkid) >= 2.32.0'
%endif
%build
+%if 0%{?rhel} && !0%{?eln}
+%{cargo_build} --bin=stratisd
+%{cargo_build} --bin=stratis-min --bin=stratisd-min --bin=stratis-utils
--no-default-features --features min,systemd_compat
+%else
%{__cargo} build %{?__cargo_common_opts} --release --bin=stratisd
%{__cargo} build %{?__cargo_common_opts} --release --bin=stratis-min --bin=stratisd-min
--bin=stratis-utils --no-default-features --features min,systemd_compat
+%endif
a2x -f manpage docs/stratisd.txt
%install
-install -Dpm0644 -t %{buildroot}%{_datadir}/dbus-1/system.d stratisd.conf
-
-# Daemon should be really private
-install -Dpm0755 -t %{buildroot}%{_libexecdir} target/release/stratisd
-
-install -Dpm0644 -t %{buildroot}%{_mandir}/man8 docs/stratisd.8
-install -Dpm0644 -t %{buildroot}%{_udevrulesdir} udev/61-stratisd.rules
-install -Dpm0644 -t %{buildroot}%{_unitdir} systemd/stratisd.service
-
-mkdir -p %{buildroot}%{dracutdir}/modules.d/90stratis
-install -Dpm0755 -t %{buildroot}%{dracutdir}/modules.d/90stratis
dracut/90stratis/module-setup.sh
-install -Dpm0755 -t %{buildroot}%{dracutdir}/modules.d/90stratis
dracut/90stratis/stratis-rootfs-setup
-install -Dpm0644 -t %{buildroot}%{dracutdir}/modules.d/90stratis
dracut/90stratis/stratisd-min.service
-install -Dpm0644 -t %{buildroot}%{dracutdir}/modules.d/90stratis
dracut/90stratis/61-stratisd.rules
-
-mkdir -p %{buildroot}%{dracutdir}/modules.d/90stratis-clevis
-install -Dpm0755 -t %{buildroot}%{dracutdir}/modules.d/90stratis-clevis
dracut/90stratis-clevis/module-setup.sh
-install -Dpm0755 -t %{buildroot}%{dracutdir}/modules.d/90stratis-clevis
dracut/90stratis-clevis/stratis-clevis-rootfs-setup
-
-install -Dpm0644 -t %{buildroot}%{_unitdir} systemd/stratisd-min-postinitrd.service
-install -Dpm0644 -t %{buildroot}%{_unitdir} systemd/stratis-fstab-setup\@.service
-
-cp target/release/stratis-utils target/release/stratis-str-cmp
-install -Dpm0755 -t %{buildroot}%{udevdir} target/release/stratis-str-cmp
-ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{udevdir}/stratis-base32-decode
-ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{udevdir}/identify-stratis-dev
-ln %{buildroot}%{udevdir}/stratis-str-cmp
%{buildroot}%{udevdir}/identify-stratis-luks-dev
-mkdir -p %{buildroot}%{_bindir}
-ln %{buildroot}%{udevdir}/stratis-str-cmp %{buildroot}%{_bindir}/stratis-predict-usage
-
-mkdir -p %{buildroot}%{_systemdgeneratordir}
-ln %{buildroot}%{udevdir}/stratis-str-cmp
%{buildroot}%{_systemdgeneratordir}/stratis-clevis-setup-generator
-ln %{buildroot}%{udevdir}/stratis-str-cmp
%{buildroot}%{_systemdgeneratordir}/stratis-setup-generator
-install -Dpm0755 -t %{buildroot}%{_bindir} target/release/stratis-min
-install -Dpm0755 -t %{buildroot}%{_libexecdir} target/release/stratisd-min
-install -Dpm0755 -t %{buildroot}%{_systemd_util_dir} systemd/stratis-fstab-setup
-
+%make_install DRACUTDIR=%{dracutdir} PROFILEDIR=release
%if %{with check}
%check
-%cargo_test -- -- --skip real_ --skip loop_ --skip travis_
+%if 0%{?rhel} && !0%{?eln}
+%cargo_test --no-run
+%else
+%cargo_test -- --no-run
+%endif
%endif
%post
@@ -155,8 +122,6 @@ install -Dpm0755 -t %{buildroot}%{_systemd_util_dir}
systemd/stratis-fstab-setup
%{_udevrulesdir}/61-stratisd.rules
%{udevdir}/stratis-str-cmp
%{udevdir}/stratis-base32-decode
-%{udevdir}/identify-stratis-dev
-%{udevdir}/identify-stratis-luks-dev
%{_bindir}/stratis-predict-usage
%{_unitdir}/stratisd-min-postinitrd.service
%{_unitdir}/stratis-fstab-setup@.service
@@ -172,10 +137,13 @@ install -Dpm0755 -t %{buildroot}%{_systemd_util_dir}
systemd/stratis-fstab-setup
%{dracutdir}/modules.d/90stratis/module-setup.sh
%{dracutdir}/modules.d/90stratis/stratis-rootfs-setup
%{dracutdir}/modules.d/90stratis/stratisd-min.service
-%{_systemdgeneratordir}/stratis-clevis-setup-generator
-%{_systemdgeneratordir}/stratis-setup-generator
+%{_systemd_util_dir}/system-generators/stratis-clevis-setup-generator
+%{_systemd_util_dir}/system-generators/stratis-setup-generator
%changelog
+* Wed May 25 2022 mulhern <amulhern(a)redhat.com> - 3.1.0-1
+- Update to 3.1.0
+
* Tue Mar 15 2022 mulhern <amulhern(a)redhat.com> - 3.0.4-2
- Use upstream crate for Rust source; install two scripts