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=3cd5a25....
Change:
-ExcludeArch: s390x
Thanks.
Full change:
============
commit 17b671b2b1440837196698632a9701835a5160ad
Author: Davide Cavalca <dcavalca(a)fedoraproject.org>
Date: Fri Oct 22 14:06:43 2021 -0700
Update to 0.4.0; Fixes: RHBZ#2016559
diff --git a/.gitignore b/.gitignore
index 50a66e6..3d768e2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,5 @@
/below-0.2.0-vendor.tar.gz
/below-0.3.0.crate
/below-0.3.0-vendor.tar.gz
+/below-0.4.0.crate
+/below-0.4.0-vendor.tar.gz
diff --git a/README-upstream.md b/README-upstream.md
index 899a20a..b213dca 100644
--- a/README-upstream.md
+++ b/README-upstream.md
@@ -1,6 +1,6 @@
-# below
+![below](img/below_logo_horizontal.png)
-[![CI](https://github.com/facebookincubator/below/workflows/CI/badge.svg)](https://github.com/facebookincubator/below/actions?query=workflow%3ACI+branch%3Amaster+)
+[![CI](https://github.com/facebookincubator/below/workflows/CI/badge.svg)](https://github.com/facebookincubator/below/actions?query=workflow%3ACI+branch%3Amain+)
[![Matrix
chat](https://img.shields.io/matrix/below:matrix.org)](https://matrix.to/#/!SrWxtbLuRUMrDbftgA:matrix.org?via=matrix.org)
`below` is an interactive tool to view and record historical system data. It
diff --git a/below.service b/below.service
index 6ef4b40..443235b 100644
--- a/below.service
+++ b/below.service
@@ -3,7 +3,7 @@ Description=below system monitor recording daemon
After=time-sync.target
[Service]
-ExecStart=/bin/below record --retain-for-s 604800
+ExecStart=/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 3ed4f84..7078b37 100644
--- a/rust-below.spec
+++ b/rust-below.spec
@@ -15,7 +15,7 @@
%global forgeurl
https://github.com/facebookincubator/below
Name: rust-%{crate}
-Version: 0.3.0
+Version: 0.4.0
Release: %autorelease
Summary: Interactive tool to view and record historical system data
diff --git a/sources b/sources
index fe7517e..771749f 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (below-0.3.0.crate) =
92b905735ad98ba52a0450a2b914214666172028f116bea56b7a52238d9614964fb8d41f3dfd6d695832662b39017a502886d4974fbfc88dce2326e758b2497a
-SHA512 (below-0.3.0-vendor.tar.gz) =
96c2192eea217e232fddf6bedb91dcbdb66a8720de31f934f2a09002b9e1090c2410302a34a44b3e49108f0957ca089abfa7131ddb676f11ede7bd75be5e3c72
+SHA512 (below-0.4.0.crate) =
ce536583048c4866b890f1298e3ca45071594f10c84b313f566725b747ccccd4ec39ad2d1560a63cebcc4c574989c57d73e64ec9e619ba93bea3b399271ed540
+SHA512 (below-0.4.0-vendor.tar.gz) =
b32e92a7b97e4a6dc139779b0435acfd04bc64258152ccc45ebc5d4bdd155d5975a02662bce7ff5af849db5816fd8c3be53d796ba723100977cb0c76d09fc439
commit 3cd5a25e5efecac0125504595021c66840793f44
Author: Davide Cavalca <dcavalca(a)fedoraproject.org>
Date: Fri Jul 30 15:54:09 2021 -0700
Update to 0.3.0; Fixes: RHBZ#1983801
diff --git a/.gitignore b/.gitignore
index 253db53..50a66e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
/below-0.2.0.crate
/below-0.2.0-vendor.tar.gz
+/below-0.3.0.crate
+/below-0.3.0-vendor.tar.gz
diff --git a/README-upstream.md b/README-upstream.md
index 2daa1c2..899a20a 100644
--- a/README-upstream.md
+++ b/README-upstream.md
@@ -28,6 +28,21 @@ of [
atop](https://linux.die.net/man/1/atop)'s design and style
decisions.
## Installing
+`below` is packaged in Fedora as of Fedora 34, and can be installed with:
+
+```shell
+sudo dnf install below
+```
+
+Optionally, the systemd service for persistent data collection can also be
+enabled with:
+
+```shell
+sudo systemctl enable --now below
+```
+
+## Installing from source
+
First, install dependencies listed in [building.md](docs/building.md).
```shell
diff --git a/below-fix-metadata.diff b/below-fix-metadata.diff
deleted file mode 100644
index 695614f..0000000
--- a/below-fix-metadata.diff
+++ /dev/null
@@ -1,38 +0,0 @@
---- below-0.2.0/Cargo.toml 1970-01-01T00:00:00+00:00
-+++ below-0.2.0/Cargo.toml 2021-06-16T22:24:40.312159+00:00
-@@ -42,7 +42,7 @@
- package = "below-dump"
-
- [dependencies.libbpf-rs]
--version = "0.10.0"
-+version = "0.11.0"
-
- [dependencies.libc]
- version = "0.2.86"
-@@ -65,7 +65,7 @@
- version = "1.4.2"
-
- [dependencies.serde]
--version = "=1.0.118"
-+version = "1.0.126"
- features = ["derive", "rc"]
-
- [dependencies.serde_json]
-@@ -93,14 +93,14 @@
- version = "0.3.21"
-
- [dependencies.tokio]
--version = "0.2.25"
-+version = "1.6.1"
- features = ["full", "test-util"]
-
- [dependencies.toml]
--version = "=0.5.7"
-+version = "0.5.8"
-
- [dependencies.users]
--version = "0.9"
-+version = "0.11"
-
- [dependencies.view]
- version = "0.2.0"
diff --git a/below-fix-tests.patch b/below-fix-tests.patch
deleted file mode 100644
index f32eb2c..0000000
--- a/below-fix-tests.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-diff -Naur a/src/test/test_general.rs b/src/test/test_general.rs
---- a/src/test/test_general.rs 1969-12-31 16:00:00.000000000 -0800
-+++ b/src/test/test_general.rs 2021-06-16 16:08:09.168914682 -0700
-@@ -27,19 +27,16 @@
- .expect("failed to collect sample");
-
- // Validate some data in the sample
-- assert!(
-- sample
-- .cgroup
-- .pressure
-- .as_ref()
-- .expect("missing memory.pressure")
-- .memory
-- .full
-- .total
-- .as_ref()
-- .expect("missing memory.pressure.total")
-- > &0
-- );
-+ sample
-+ .cgroup
-+ .pressure
-+ .as_ref()
-+ .expect("missing memory.pressure")
-+ .memory
-+ .full
-+ .total
-+ .as_ref()
-+ .expect("missing memory.pressure.total");
- let nr_procs = sample.processes.len();
- let hostname = sample.system.hostname.clone();
- let proc0_cgroup = sample
-@@ -75,17 +72,14 @@
- .expect("failed to get advanced data");
-
- // Validate some values in restored sample
-- assert!(
-- *restored_sample
-- .cgroup
-- .io_total
-- .as_ref()
-- .expect("missing io.stat")
-- .rbytes_per_sec
-- .as_ref()
-- .expect("missing io stat read bytes per second")
-- == 0.0
-- );
-+ restored_sample
-+ .cgroup
-+ .io_total
-+ .as_ref()
-+ .expect("missing io.stat")
-+ .rbytes_per_sec
-+ .as_ref()
-+ .expect("missing io stat read bytes per second");
- assert!(restored_sample.process.processes.len() == nr_procs);
- assert!(restored_sample.system.hostname == hostname);
- assert!(
diff --git a/rust-below.spec b/rust-below.spec
index b2db95b..3ed4f84 100644
--- a/rust-below.spec
+++ b/rust-below.spec
@@ -1,4 +1,4 @@
-# Generated by rust2rpm 16
+# Generated by rust2rpm 18
%bcond_without check
%global __cargo_skip_build 0
@@ -13,10 +13,9 @@
%endif
%global forgeurl
https://github.com/facebookincubator/below
-%global commit 584fdef23f4c7a95a009b84746bb193b68843c1a
Name: rust-%{crate}
-Version: 0.2.0
+Version: 0.3.0
Release: %autorelease
Summary: Interactive tool to view and record historical system data
@@ -24,15 +23,11 @@ Summary: Interactive tool to view and record historical system
data
License: ASL 2.0
URL:
https://crates.io/crates/below
Source: %{crates_source}
-# Bump serde to 1.0.126, tokio to 1.6.1, toml to 0.58, users to 0.11
-Patch0: below-fix-metadata.diff
-# Fix record_replay_integration test
-Patch1: below-fix-tests.patch
# Get these from the repo as they aren't included in the crate
-Source1: %{forgeurl}/raw/%{commit}/etc/below.service
-Source2: %{forgeurl}/raw/%{commit}/etc/logrotate.conf
-Source3: %{forgeurl}/raw/%{commit}/README.md#/README-upstream.md
+Source1: %{forgeurl}/raw/v%{version}/etc/below.service
+Source2: %{forgeurl}/raw/v%{version}/etc/logrotate.conf
+Source3: %{forgeurl}/raw/v%{version}/README.md#/README-upstream.md
# vendored dependencies for EPEL
# update with ./update-vendor-tarball.sh after bumping the specfile version
Source4: %{crate}-%{version}-vendor.tar.gz
@@ -42,9 +37,6 @@ Source5: README-epel.md
ExclusiveArch: %{rust_arches}
%if 0%{?el8}
-#
https://bugzilla.redhat.com/show_bug.cgi?id=1978414
-ExcludeArch: s390x
-
BuildRequires: rust-toolset
# for libbpf-sys
BuildRequires: kernel-headers
@@ -88,7 +80,7 @@ Recommends: logrotate
%files -n %{crate}
%license LICENSE
-%doc README.md docs
+%doc README.md
%if 0%{?el8}
%doc README-epel.md
%endif
@@ -109,7 +101,6 @@ Recommends: logrotate
%prep
%if 0%{?el8}
%setup -q -n %{crate}-%{version}
-%patch1 -p1
%cargo_prep -V 4
cp -p %{SOURCE5} README-epel.md
%else
diff --git a/sources b/sources
index 6b6eb56..fe7517e 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (below-0.2.0.crate) =
4f72620ed5c66ead42b5ab50c2a7e975956a6511b23e41056a4452274b7bc8172729b0ff44d9ce524d43024471236d093111a7e9d44239efed0a5a1e38127944
-SHA512 (below-0.2.0-vendor.tar.gz) =
c468fc027bee2a1903aad02e11c11107f93b29214b11d36c93f3d93ad06d709eb126a14b1ddd8e440a93c362cb98ca7cae90c6181827b42d0bdd723005bb638d
+SHA512 (below-0.3.0.crate) =
92b905735ad98ba52a0450a2b914214666172028f116bea56b7a52238d9614964fb8d41f3dfd6d695832662b39017a502886d4974fbfc88dce2326e758b2497a
+SHA512 (below-0.3.0-vendor.tar.gz) =
96c2192eea217e232fddf6bedb91dcbdb66a8720de31f934f2a09002b9e1090c2410302a34a44b3e49108f0957ca089abfa7131ddb676f11ede7bd75be5e3c72
commit c3a8ce604a92086986b702d8f16636b60a757cb5
Author: Davide Cavalca <dcavalca(a)fedoraproject.org>
Date: Thu Jul 29 15:57:19 2021 -0700
Convert to rpmautospec
diff --git a/changelog b/changelog
new file mode 100644
index 0000000..883a574
--- /dev/null
+++ b/changelog
@@ -0,0 +1,22 @@
+* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2.0-5
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jul 6 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> - 0.2.0-4
+- Add README-epel.md with instructions for enabling PSI support
+- Gate ExclusiveArch s390x to el8 only
+
+* Wed Jun 30 2021 Davide Cavalca <dcavalca(a)fedoraproject.org> - 0.2.0-3
+- Add vendored dependencies for EPEL and make it build there
+- Exclude s390x for the EPEL build for now due to an upstream issue
+- Mark logrotate config file as a config(noreplace)
+- Add recommends for logrotate
+- Fix permissions for the below binary
+
+* Mon Jun 28 2021 Davide Cavalca <dcavalca(a)fedoraproject.org> - 0.2.0-2
+- Install upstream systemd unit
+- Install upstream logrotate config
+- Add missing documentation
+- Expand the description
+
+* Tue Jun 15 2021 Davide Cavalca <dcavalca(a)fedoraproject.org> - 0.2.0-1
+- Initial package
diff --git a/rust-below.spec b/rust-below.spec
index b961ccd..b2db95b 100644
--- a/rust-below.spec
+++ b/rust-below.spec
@@ -17,7 +17,7 @@
Name: rust-%{crate}
Version: 0.2.0
-Release: 5%{?dist}
+Release: %autorelease
Summary: Interactive tool to view and record historical system data
# Upstream license specification: Apache-2.0
@@ -139,25 +139,4 @@ install -d -m1777 %{buildroot}%{_localstatedir}/log/%{crate}
%endif
%changelog
-* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2.0-5
-- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jul 6 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> - 0.2.0-4
-- Add README-epel.md with instructions for enabling PSI support
-- Gate ExclusiveArch s390x to el8 only
-
-* Wed Jun 30 2021 Davide Cavalca <dcavalca(a)fedoraproject.org> - 0.2.0-3
-- Add vendored dependencies for EPEL and make it build there
-- Exclude s390x for the EPEL build for now due to an upstream issue
-- Mark logrotate config file as a config(noreplace)
-- Add recommends for logrotate
-- Fix permissions for the below binary
-
-* Mon Jun 28 2021 Davide Cavalca <dcavalca(a)fedoraproject.org> - 0.2.0-2
-- Install upstream systemd unit
-- Install upstream logrotate config
-- Add missing documentation
-- Expand the description
-
-* Tue Jun 15 2021 Davide Cavalca <dcavalca(a)fedoraproject.org> - 0.2.0-1
-- Initial package
+%autochangelog
commit 635ffabbc39567cb8d1ce57e29420fcb0dabfacd
Author: Fedora Release Engineering <releng(a)fedoraproject.org>
Date: Fri Jul 23 13:17:44 2021 +0000
- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng(a)fedoraproject.org>
diff --git a/rust-below.spec b/rust-below.spec
index 9e9c573..b961ccd 100644
--- a/rust-below.spec
+++ b/rust-below.spec
@@ -17,7 +17,7 @@
Name: rust-%{crate}
Version: 0.2.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: Interactive tool to view and record historical system data
# Upstream license specification: Apache-2.0
@@ -139,6 +139,9 @@ install -d -m1777 %{buildroot}%{_localstatedir}/log/%{crate}
%endif
%changelog
+* Fri Jul 23 2021 Fedora Release Engineering <releng(a)fedoraproject.org> - 0.2.0-5
+- Rebuilt for
https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
* Tue Jul 6 2021 Michel Alexandre Salim <salimma(a)fedoraproject.org> - 0.2.0-4
- Add README-epel.md with instructions for enabling PSI support
- Gate ExclusiveArch s390x to el8 only