rpms/rust-rd-agent
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

merge into: rpms:f39
Branches Tags
rpms:rawhide
rpms:epel9
rpms:f42
rpms:f43
rpms:main
rpms:f40
rpms:f41
rpms:f39
rpms:f38
rpms:f36
rpms:f37
rpms:epel8
rpms:f34
rpms:f35
...
pull from: rpms:rawhide
Branches Tags
rpms:epel9
rpms:f42
rpms:f43
rpms:main
rpms:rawhide
rpms:f40
rpms:f41
rpms:f39
rpms:f38
rpms:f36
rpms:f37
rpms:epel8
rpms:f34
rpms:f35
Sign in to create a new pull request.

9 commits
f39 ... rawhide

Author SHA1 Message Date
Benjamin A. Beasley
dd5a0ac0e4 Allow procfs 0.18 2026-01-05 10:01:36 +00:00
Fedora Release Engineering
05ee9e5059 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-25 16:13:57 +00:00
Fedora Release Engineering
484fc87604 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-19 06:49:49 +00:00
Benjamin A. Beasley
86131092cf Deduplicate the License expression 2024-12-05 15:37:02 -05:00
Benjamin A. Beasley
b70659717f Update License 
Use the latest %cargo_license_summary output.
 2024-12-05 11:46:09 -05:00
Benjamin A. Beasley
ccad1edf86 Use consistent style when branching on bconds 
[skip changelog]
 2024-12-05 11:39:05 -05:00
Benjamin A. Beasley
fea015f647 Use the same bcond style for selinux that rust2rpm 27 uses for check 
This works in EPEL9 and later, and is less confusing than
bcond_with/bcond_without.

[skip changelog]
 2024-12-05 11:38:56 -05:00
Benjamin A. Beasley
ce2b59face Allow procfs 0.17 2024-12-05 11:36:22 -05:00
Fedora Release Engineering
1299546269 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-20 01:49:51 +00:00
2 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

11
rd-agent-fix-metadata.diff
View file

@ -1,5 +1,5 @@
--- rd-agent-2.2.5/Cargo.toml 1970-01-01T00:00:01+00:00
+++ rd-agent-2.2.5/Cargo.toml 2024-04-25T18:33:02.024271+00:00
+++ rd-agent-2.2.5/Cargo.toml 2026-01-05T10:01:01.383431+00:00
@@ -30,7 +30,7 @@
version = "0.8"
@ -9,3 +9,12 @@
[dependencies.glob]
version = "0.3"
@@ -61,7 +61,7 @@
version = "0.3"
[dependencies.procfs]
-version = "0.16"
+version = ">=0.16, <0.19"
[dependencies.rd-agent-intf]
version = "2.2.5"

23
rust-rd-agent.spec
View file

@ -1,10 +1,10 @@
# Generated by rust2rpm 26
%bcond_without check
# Generated by rust2rpm 28
%bcond check 1
%global crate rd-agent
%global selinuxtype targeted
%bcond_without selinux
%bcond selinux 1
Name: rust-rd-agent
Version: 2.2.5
@ -18,6 +18,9 @@ Source: %{crates_source}
Source: https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.8.11.tar.xz
# Manually created patch for downstream crate metadata changes
# * bump enum-iterator to 2.0
# * allow procfs 0.17,
# https://github.com/facebookexperimental/resctl-demo/pull/326, and 0.18,
# https://github.com/facebookexperimental/resctl-demo/pull/335
Patch: rd-agent-fix-metadata.diff
# https://github.com/facebookexperimental/resctl-demo/commit/f65eedf9017332255ef0a48649664c26b45b9c07
Patch: rd-agent-enum-iterator.patch
@ -40,19 +43,21 @@ Management agent for resctl-demo.}
%package -n %{crate}
Summary: %{summary}
# (MIT OR Apache-2.0) AND Unicode-DFS-2016
# 0BSD
# 0BSD OR MIT OR Apache-2.0
# Apache-2.0
# Apache-2.0 OR BSL-1.0
# Apache-2.0 OR MIT
# Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT
# BSD-2-Clause OR Apache-2.0 OR MIT
# MIT
# MIT OR Apache-2.0
# MIT OR Zlib OR Apache-2.0
# Unlicense OR MIT
License: ((MIT OR Apache-2.0) AND Unicode-DFS-2016) AND (0BSD OR MIT OR Apache-2.0) AND Apache-2.0 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND MIT AND (MIT OR Apache-2.0) AND (MIT OR Zlib OR Apache-2.0) AND (Unlicense OR MIT)
License: 0BSD AND Apache-2.0 AND MIT AND Unicode-DFS-2016 AND (0BSD OR MIT OR Apache-2.0) AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 OR MIT) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (MIT OR Zlib OR Apache-2.0) AND (Unlicense OR MIT)
# LICENSE.dependencies contains a full license breakdown
%if 0%{?with_selinux}
%if %{with selinux}
Requires: (%{crate}-selinux if selinux-policy-%{selinuxtype})
%endif
Recommends: rd-hashd = %{version}
@ -84,7 +89,7 @@ This package contains data files for %{crate}.
%files -n %{crate}-data
%{_datadir}/resctl-demo
%if 0%{?with_selinux}
%if %{with selinux}
%package -n %{crate}-selinux
Summary: SELinux policy for %{crate}
BuildArch: noarch
@ -116,7 +121,7 @@ fi
%prep
%autosetup -n %{crate}-%{version} -p1
%cargo_prep
%if 0%{?with_selinux}
%if %{with selinux}
mkdir selinux
cp -p %{SOURCE10} %{SOURCE11} %{SOURCE12} selinux
%endif
@ -128,7 +133,7 @@ cp -p %{SOURCE10} %{SOURCE11} %{SOURCE12} selinux
%cargo_build
%{cargo_license_summary}
%{cargo_license} > LICENSE.dependencies
%if 0%{?with_selinux}
%if %{with selinux}
make -C selinux -f %{_datadir}/selinux/devel/Makefile %{crate}.pp
bzip2 -9 selinux/%{crate}.pp
%endif
@ -138,7 +143,7 @@ bzip2 -9 selinux/%{crate}.pp
install -Dpm0644 %SOURCE1 %{buildroot}%{_datadir}/resctl-demo/linux.tar.xz
mkdir -p %{buildroot}%{_sharedstatedir}/resctl-demo
%if 0%{?with_selinux}
%if %{with selinux}
install -Dm0644 selinux/%{crate}.pp.bz2 \
%{buildroot}%{_datadir}/selinux/packages/%{selinuxtype}/%{crate}.pp.bz2
%endif