The package rpms/rust-below.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-below.git/commit/?id=f22f672eb….
Change:
+ExcludeArch: %{ix86}
Thanks.
Full change:
============
commit f22f672eb49335ffb5f25ae145d225706dd168d5
Author: Michel Lind <salimma(a)fedoraproject.org>
Date: Wed Feb 26 18:06:51 2025 -0600
Update to 0.9.0; Fixes: RHBZ#2347633
Signed-off-by: Michel Lind <salimma(a)fedoraproject.org>
diff --git a/.gitignore b/.gitignore
index fc9965c..8b37ec2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -11,3 +11,4 @@
/below-0.6.3.crate
/below-0.7.1.crate
/below-0.8.1.crate
+/below-0.9.0.crate
diff --git a/below-fix-metadata.diff b/below-fix-metadata.diff
index 1bdc543..956a8b5 100644
--- a/below-fix-metadata.diff
+++ b/below-fix-metadata.diff
@@ -1,10 +1,26 @@
---- below-0.8.1/Cargo.toml 1970-01-01T00:00:01+00:00
-+++ below-0.8.1/Cargo.toml 2024-05-21T17:41:06.860284+00:00
-@@ -132,7 +132,6 @@
+--- below-0.9.0/Cargo.toml 1970-01-01T00:00:01+00:00
++++ below-0.9.0/Cargo.toml 2025-02-27T00:08:43.816482+00:00
+@@ -90,7 +90,7 @@
+ ]
+
+ [dependencies.libbpf-rs]
+-version = "=0.25.0-beta.1"
++version = ">=0.24,<0.26"
+ default-features = false
+
+ [dependencies.libc]
+@@ -148,7 +148,6 @@
features = [
"full",
"test-util",
- "tracing",
]
- [dependencies.uzers]
+ [dependencies.view]
+@@ -162,5 +161,5 @@
+ version = "0.1.1"
+
+ [build-dependencies.libbpf-cargo]
+-version = "=0.25.0-beta.1"
++version = ">=0.24,<0.26"
+ default-features = false
diff --git a/below.service b/below.service
index 443235b..0f18e02 100644
--- a/below.service
+++ b/below.service
@@ -1,9 +1,24 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
[Unit]
Description=below system monitor recording daemon
After=time-sync.target
[Service]
-ExecStart=/bin/below record --retain-for-s 604800 --compress
+LogsDirectory=below
+ExecStart=/usr/bin/below record --retain-for-s 604800 --compress
# Enable backtraces in errors
Environment=RUST_LIB_BACKTRACE=1
Restart=always
diff --git a/rust-below.spec b/rust-below.spec
index dbf3cf6..063e109 100644
--- a/rust-below.spec
+++ b/rust-below.spec
@@ -1,12 +1,12 @@
-# Generated by rust2rpm 26
-%bcond_without check
+# Generated by rust2rpm 27
+%bcond check 1
%global crate below
%global forgeurl https://github.com/facebookincubator/below
Name: rust-below
-Version: 0.8.1
+Version: 0.9.0
Release: %autorelease
Summary: Interactive tool to view and record historical system data
@@ -17,11 +17,12 @@ Source: %{crates_source}
Source1: %{forgeurl}/raw/v%{version}/etc/below.service
Source2: %{forgeurl}/raw/v%{version}/etc/logrotate.conf
# Manually created patch for downstream crate metadata changes
+# * temporarily loosen version bound on libbpf-* to allow 0.24 and 0.25
# * remove dependency on unstable tokio/tracing
Patch: below-fix-metadata.diff
# Many dependencies not available
-ExcludeArch: %{arm32} %{ix86}
+ExcludeArch: %{ix86}
BuildRequires: cargo-rpm-macros >= 24
BuildRequires: systemd-rpm-macros
@@ -49,19 +50,32 @@ atop's design and style decisions.}
%package -n %{crate}
Summary: %{summary}
# (MIT OR Apache-2.0) AND Unicode-DFS-2016
+# 0BSD
# 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
# BSD-2-Clause OR Apache-2.0 OR MIT
-# BSD-3-Clause OR MIT OR Apache-2.0
# LGPL-2.1-only OR BSD-2-Clause
# MIT
+# MIT AND (MIT OR Apache-2.0)
# MIT OR Apache-2.0
# MPL-2.0 OR MIT OR Apache-2.0
# Unlicense OR MIT
-License: Apache-2.0 AND (MIT OR Apache-2.0) AND Unicode-DFS-2016 AND (Apache-2.0 OR BSL-1.0) AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT) AND BSD-2-Clause AND (BSD-2-Clause OR Apache-2.0 OR MIT) AND (BSD-3-Clause OR MIT OR Apache-2.0) AND (LGPL-2.1-only OR BSD-2-Clause) AND MIT AND (MPL-2.0 OR MIT OR Apache-2.0) AND (Unlicense OR MIT)
+License: %{shrink:
+ Apache-2.0
+ AND (MIT OR Apache-2.0) AND Unicode-DFS-2016
+ AND 0BSD
+ AND (Apache-2.0 OR BSL-1.0)
+ AND (Apache-2.0 WITH LLVM-exception OR Apache-2.0 OR MIT)
+ AND BSD-2-Clause
+ AND (BSD-2-Clause OR Apache-2.0 OR MIT)
+ AND (LGPL-2.1-only OR BSD-2-Clause)
+ AND MIT
+ AND (MPL-2.0 OR MIT OR Apache-2.0)
+ AND (Unlicense OR MIT)
+ }
# LICENSE.dependencies contains a full license breakdown
Recommends: logrotate
diff --git a/rust2rpm.toml b/rust2rpm.toml
index 146ad68..c3d6c0f 100644
--- a/rust2rpm.toml
+++ b/rust2rpm.toml
@@ -1,5 +1,6 @@
[package]
cargo-toml-patch-comments = [
+ "temporarily loosen version bound on libbpf-* to allow 0.24 and 0.25",
"remove dependency on unstable tokio/tracing",
]
@@ -21,12 +22,6 @@ below does not have support for cgroup1.
The name "below" stems from the fact that the below developers rejected many of
atop's design and style decisions."""
-extra-sources = [
- { "number" = 1, "file" = "%{forgeurl}/raw/v%{version}/etc/below.service", comments = [
- "Get these from the repo as they aren't included in the crate",]},
- { "number" = 2, "file" = "%{forgeurl}/raw/v%{version}/etc/logrotate.conf", comments = []},
-]
-
extra-files = [
"%{_unitdir}/%{crate}.service",
"%dir %{_sysconfdir}/logrotate.d",
@@ -34,6 +29,18 @@ extra-files = [
"%dir %{_localstatedir}/log/%{crate}",
]
+[[package.extra-sources]]
+number = 1
+file = "%{forgeurl}/raw/v%{version}/etc/below.service"
+comments = [
+ "Get these from the repo as they aren't included in the crate",
+]
+
+[[package.extra-sources]]
+number = 2
+file = "%{forgeurl}/raw/v%{version}/etc/logrotate.conf"
+comments = []
+
[requires]
build = [
"systemd-rpm-macros",
diff --git a/sources b/sources
index 7b069a7..7ef5ba4 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (below-0.8.1.crate) = 9a7c91b66a120d719707cf25f5b74c800ff5700e60310af39089aecb28d7ca26cc50be0b59fd7e6a5c8e4eb812775fc0c02a690dde618c068109bdb77a983ff8
+SHA512 (below-0.9.0.crate) = 5a87c015748d8937575691588bd6ef10c8046101befe634521263154d78d18b2e0e16088c10ef7ab268e5ce1d092885992b621c6667f8faaecb2573eb8ac9cde