The package rpms/rust-scx_utils.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/rust-scx_utils.git/commit/?id=d6f....
Change:
+ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit ecca877e3e97513d7c743239514d3538aeabcd84
Author: Jordan Rome <jordalgo(a)fedoraproject.org>
Date: Wed Jan 17 11:28:24 2024 -0500
Updated to 0.5.0
diff --git a/.gitignore b/.gitignore
index 2ee3006..1e761d3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/scx_utils-0.4.1.crate
+/scx_utils-0.5.0.crate
diff --git a/rust-scx_utils.spec b/rust-scx_utils.spec
index 84c3aae..323c2b7 100644
--- a/rust-scx_utils.spec
+++ b/rust-scx_utils.spec
@@ -5,16 +5,13 @@
%global crate scx_utils
Name: rust-scx_utils
-Version: 0.4.1
+Version: 0.5.0
Release: %autorelease
Summary: Utilities for sched_ext schedulers
License: GPL-2.0-only
URL:
https://crates.io/crates/scx_utils
Source: %{crates_source}
-# The original patch required editing due to the different paths
-# in the rust crate:
https://patch-diff.githubusercontent.com/raw/sched-ext/scx/pull/65.patch#...
-Patch: sched-ext-fix-mappings.patch
BuildRequires: cargo-rpm-macros >= 24
diff --git a/sources b/sources
index deb6c4c..f06a32f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (scx_utils-0.4.1.crate) =
856971c5c7f882ff205ef30fa2f89d9e0554cc1a7a156550cb6d0c0577c8acf325223bea5070ddb3b3366a18f07833f2a0405acf0d589c548ddd7d28964dc6e3
+SHA512 (scx_utils-0.5.0.crate) =
b1b72adee89cba8e22dd87b19359c5bbd093bb5895906cfa604a44944e0c23dba7002314b341eba9b612e22b170675e1046a62caded70d9ebbbf49cd3d0ee5da
commit d6fc166fb70cab68180366d7cac5025446b0e5be
Author: Jordan Rome <jordalgo(a)fedoraproject.org>
Date: Wed Jan 3 17:03:13 2024 -0500
add spec file and patch to fix builds
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..2ee3006
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/scx_utils-0.4.1.crate
diff --git a/rust-scx_utils.spec b/rust-scx_utils.spec
new file mode 100644
index 0000000..84c3aae
--- /dev/null
+++ b/rust-scx_utils.spec
@@ -0,0 +1,73 @@
+# Generated by rust2rpm 25
+%bcond_without check
+%global debug_package %{nil}
+
+%global crate scx_utils
+
+Name: rust-scx_utils
+Version: 0.4.1
+Release: %autorelease
+Summary: Utilities for sched_ext schedulers
+
+License: GPL-2.0-only
+URL:
https://crates.io/crates/scx_utils
+Source: %{crates_source}
+# The original patch required editing due to the different paths
+# in the rust crate:
https://patch-diff.githubusercontent.com/raw/sched-ext/scx/pull/65.patch#...
+Patch: sched-ext-fix-mappings.patch
+
+BuildRequires: cargo-rpm-macros >= 24
+
+%global _description %{expand:
+Utilities for sched_ext schedulers.}
+
+%description %{_description}
+
+%package devel
+Summary: %{summary}
+BuildArch: noarch
+ExcludeArch: %{ix86}
+
+%description devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "%{crate}" crate.
+
+%files devel
+%license %{crate_instdir}/LICENSE
+%doc %{crate_instdir}/README.md
+%{crate_instdir}/
+
+%package -n %{name}+default-devel
+Summary: %{summary}
+BuildArch: noarch
+
+%description -n %{name}+default-devel %{_description}
+
+This package contains library source intended for building other packages which
+use the "default" feature of the "%{crate}" crate.
+
+%files -n %{name}+default-devel
+%ghost %{crate_instdir}/Cargo.toml
+
+%prep
+%autosetup -n %{crate}-%{version} -p1
+%cargo_prep
+
+%generate_buildrequires
+%cargo_generate_buildrequires
+
+%build
+%cargo_build
+
+%install
+%cargo_install
+
+%if %{with check}
+%check
+# * skip failing test
+%cargo_test -- -- --skip bpf_builder::tests::test_vmlinux_h_ver_sha1
+%endif
+
+%changelog
+%autochangelog
diff --git a/sched-ext-fix-mappings.patch b/sched-ext-fix-mappings.patch
new file mode 100644
index 0000000..62e6d7e
--- /dev/null
+++ b/sched-ext-fix-mappings.patch
@@ -0,0 +1,39 @@
+From 6caf6c5c99cbb1a5cf80e2e7e606504740a4c0dc Mon Sep 17 00:00:00 2001
+From: Jordan Rome <linux(a)jordanrome.com>
+Date: Wed, 3 Jan 2024 10:50:33 -0800
+Subject: [PATCH] Add new archs for bpf_builder
+
+This is to fix fedora build failures for these archs:
+s390x and ppc64le
+
+Error:
+```
+---- bpf_builder::tests::test_bpf_builder_new stdout ----
+thread 'bpf_builder::tests::test_bpf_builder_new' panicked at
src/bpf_builder.rs:592:9:
+Failed to create BpfBuilder (Err(CPU arch "s390x" not found in ARCH_MAP))
+```
+
+https://koji.fedoraproject.org/koji/taskinfo?taskID=111114326
+---
+ src/bpf_builder.rs | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/bpf_builder.rs b/src/bpf_builder.rs
+index d7faa41..0637924 100644
+--- a/src/bpf_builder.rs
++++ b/src/bpf_builder.rs
+@@ -24,12 +24,14 @@ lazy_static::lazy_static! {
+ ("x86", "x86"),
+ ("x86_64", "x86"),
+ ("s390", "s390"),
++ ("s390x", "s390"),
+ ("arm", "arm"),
+ ("aarch64", "arm64"),
+ ("mips", "mips"),
+ ("mips64", "mips"),
+ ("ppc32", "powerpc"),
+ ("ppc64", "powerpc"),
++ ("ppc64le", "powerpc"),
+ ("sparc", "sparc"),
+ ("sparcv9", "sparc"),
+ ("riscv32", "riscv"),
diff --git a/sources b/sources
new file mode 100644
index 0000000..deb6c4c
--- /dev/null
+++ b/sources
@@ -0,0 +1 @@
+SHA512 (scx_utils-0.4.1.crate) =
856971c5c7f882ff205ef30fa2f89d9e0554cc1a7a156550cb6d0c0577c8acf325223bea5070ddb3b3366a18f07833f2a0405acf0d589c548ddd7d28964dc6e3