From 129954626931ed28d82c71c89c3fb36023b7f172 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 01:49:51 +0000 Subject: [PATCH 1/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From ce2b59face9dc7ec2f266086271cf3f88a1d3be3 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 5 Dec 2024 11:36:22 -0500 Subject: [PATCH 2/9] Allow procfs 0.17 --- rd-agent-fix-metadata.diff | 11 ++++++++++- rust-rd-agent.spec | 6 ++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/rd-agent-fix-metadata.diff b/rd-agent-fix-metadata.diff index 2807508..288f100 100644 --- a/rd-agent-fix-metadata.diff +++ b/rd-agent-fix-metadata.diff @@ -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 2024-12-05T16:35:27.976983+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.18" + + [dependencies.rd-agent-intf] + version = "2.2.5" diff --git a/rust-rd-agent.spec b/rust-rd-agent.spec index 70d39c7..2f37c23 100644 --- a/rust-rd-agent.spec +++ b/rust-rd-agent.spec @@ -1,5 +1,5 @@ -# Generated by rust2rpm 26 -%bcond_without check +# Generated by rust2rpm 27 +%bcond check 1 %global crate rd-agent @@ -18,6 +18,8 @@ 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 Patch: rd-agent-fix-metadata.diff # https://github.com/facebookexperimental/resctl-demo/commit/f65eedf9017332255ef0a48649664c26b45b9c07 Patch: rd-agent-enum-iterator.patch From fea015f6475fd7f36a5d45a88c87034c3f73dd35 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 5 Dec 2024 11:38:03 -0500 Subject: [PATCH 3/9] 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] --- rust-rd-agent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-rd-agent.spec b/rust-rd-agent.spec index 2f37c23..44e6341 100644 --- a/rust-rd-agent.spec +++ b/rust-rd-agent.spec @@ -4,7 +4,7 @@ %global crate rd-agent %global selinuxtype targeted -%bcond_without selinux +%bcond selinux 1 Name: rust-rd-agent Version: 2.2.5 From ccad1edf86e4a8d1ad9e25d823376f6052a75640 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 5 Dec 2024 11:38:40 -0500 Subject: [PATCH 4/9] Use consistent style when branching on bconds [skip changelog] --- rust-rd-agent.spec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/rust-rd-agent.spec b/rust-rd-agent.spec index 44e6341..ff488ea 100644 --- a/rust-rd-agent.spec +++ b/rust-rd-agent.spec @@ -54,7 +54,7 @@ Summary: %{summary} 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.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} @@ -86,7 +86,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 @@ -118,7 +118,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 @@ -130,7 +130,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 @@ -140,7 +140,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 From b70659717faa3ff9dbf70f8b5224975b5e808591 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 5 Dec 2024 11:46:09 -0500 Subject: [PATCH 5/9] Update License Use the latest %cargo_license_summary output. --- rust-rd-agent.spec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/rust-rd-agent.spec b/rust-rd-agent.spec index ff488ea..f74e424 100644 --- a/rust-rd-agent.spec +++ b/rust-rd-agent.spec @@ -42,16 +42,18 @@ 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: ((MIT OR Apache-2.0) AND Unicode-DFS-2016) AND 0BSD 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 (BSD-2-Clause 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.dependencies contains a full license breakdown %if %{with selinux} From 86131092cf924f426f60b04575bc7907aa01a917 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Thu, 5 Dec 2024 15:37:02 -0500 Subject: [PATCH 6/9] Deduplicate the License expression --- rust-rd-agent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rust-rd-agent.spec b/rust-rd-agent.spec index f74e424..02468c2 100644 --- a/rust-rd-agent.spec +++ b/rust-rd-agent.spec @@ -53,7 +53,7 @@ Summary: %{summary} # 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 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 (BSD-2-Clause 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 %{with selinux} From 484fc8760450e80185f5cda5b89d42f311e0660f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 06:49:49 +0000 Subject: [PATCH 7/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 05ee9e5059403e0688c301925a0b9b1c88e4bfaf Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 16:13:57 +0000 Subject: [PATCH 8/9] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From dd5a0ac0e4475721beaeb7523dcc4bec0954f001 Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Mon, 5 Jan 2026 10:01:36 +0000 Subject: [PATCH 9/9] Allow procfs 0.18 --- rd-agent-fix-metadata.diff | 4 ++-- rust-rd-agent.spec | 7 ++++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/rd-agent-fix-metadata.diff b/rd-agent-fix-metadata.diff index 288f100..f15bc30 100644 --- a/rd-agent-fix-metadata.diff +++ b/rd-agent-fix-metadata.diff @@ -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-12-05T16:35:27.976983+00:00 ++++ rd-agent-2.2.5/Cargo.toml 2026-01-05T10:01:01.383431+00:00 @@ -30,7 +30,7 @@ version = "0.8" @@ -14,7 +14,7 @@ [dependencies.procfs] -version = "0.16" -+version = ">=0.16, <0.18" ++version = ">=0.16, <0.19" [dependencies.rd-agent-intf] version = "2.2.5" diff --git a/rust-rd-agent.spec b/rust-rd-agent.spec index 02468c2..88b45fe 100644 --- a/rust-rd-agent.spec +++ b/rust-rd-agent.spec @@ -1,4 +1,4 @@ -# Generated by rust2rpm 27 +# Generated by rust2rpm 28 %bcond check 1 %global crate rd-agent @@ -18,8 +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 +# * 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