From: Prarit Bhargava on gitlab.com
Merge Request: https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3585
This changeset modifies the way that the dist-help functionality works in
the redhat/Makefile (and other related Makefiles). I am attempting to
resolve several issues: the layout of the dist-help output, the location
of target descriptions relative to the target, and the granularity of the
help output. Unfortunately, I could not find an easy way to separate out
this work into finer-grained commits.
Signed-off-by: Prarit Bhargava <prarit(a)redhat.com>
---
redhat/self-test/data/centos-2585cf9dfaad.el7 | 1 +
redhat/self-test/data/centos-2585cf9dfaad.fc25 | 1 +
redhat/self-test/data/centos-78e36f3b0dae.el7 | 1 +
redhat/self-test/data/centos-78e36f3b0dae.fc25 | 1 +
redhat/self-test/data/centos-df0cc57e057f.el7 | 1 +
redhat/self-test/data/centos-df0cc57e057f.fc25 | 1 +
redhat/self-test/data/centos-fce15c45d3fb.el7 | 1 +
redhat/self-test/data/centos-fce15c45d3fb.fc25 | 1 +
redhat/self-test/data/fedora-2585cf9dfaad.el7 | 1 +
redhat/self-test/data/fedora-2585cf9dfaad.fc25 | 1 +
redhat/self-test/data/fedora-78e36f3b0dae.el7 | 1 +
redhat/self-test/data/fedora-78e36f3b0dae.fc25 | 1 +
redhat/self-test/data/fedora-df0cc57e057f.el7 | 1 +
redhat/self-test/data/fedora-df0cc57e057f.fc25 | 1 +
redhat/self-test/data/fedora-fce15c45d3fb.el7 | 1 +
redhat/self-test/data/fedora-fce15c45d3fb.fc25 | 1 +
redhat/self-test/data/rhel-2585cf9dfaad.el7 | 1 +
redhat/self-test/data/rhel-2585cf9dfaad.fc25 | 1 +
redhat/self-test/data/rhel-78e36f3b0dae.el7 | 1 +
redhat/self-test/data/rhel-78e36f3b0dae.fc25 | 1 +
redhat/self-test/data/rhel-df0cc57e057f.el7 | 1 +
redhat/self-test/data/rhel-df0cc57e057f.fc25 | 1 +
redhat/self-test/data/rhel-fce15c45d3fb.el7 | 1 +
redhat/self-test/data/rhel-fce15c45d3fb.fc25 | 1 +
redhat/Makefile | 279 +++++++++++-------------
redhat/Makefile.cross | 7 +-
26 files changed, 159 insertions(+), 151 deletions(-)
From: Thorsten Leemhuis <fedora(a)leemhuis.info>
set a more reasonable default for number of jobs
Instead of just one use four jobs by default, which is a more reasonable
default these days. The worst that can^w should happen is some
performance drop due to increased concurrency in setups with less than
four CPU cores.
Signed-off-by: Thorsten Leemhuis <fedora(a)leemhuis.info>
diff --git a/redhat/Makefile b/redhat/Makefile
index blahblah..blahblah 100644
--- a/redhat/Makefile
+++ b/redhat/Makefile
@@ -96,7 +96,7 @@ endif
ifndef RHJOBS
RHJOBS=$(shell j=$$(echo $(MAKEFLAGS) | grep -Eo "(^|[ ])-j[0-9]*" | xargs ); \
if [ -z "$${j}" ]; then \
- echo "1"; \
+ echo "4"; \
else \
j=$$(echo "$${j}" | tr -d "\-j"); \
[ -z "$${j}" ] && nproc || echo $${j}; \
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3589
From: Tomas Glozar <tglozar(a)redhat.com>
redhat/kernel.spec.template: Require kernel-tools-libs in rtla
Upstream Status: RHEL-only
rtla has a dependency on libcpupower.so.1 when build on
%{cpupowerarchs}, which pulls kernel-tools-libs as Requires.
Add explicit Requires for the subpackage as required by rpminspect's
rpmdep check.
Fixes: d17a51e6052d ("redhat/kernel.spec.template: Link rtla against in-tree libcpupower")
Signed-off-by: Tomas Glozar <tglozar(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -1293,6 +1293,9 @@ Epoch: %{gemini}
Summary: Real-Time Linux Analysis tools
Requires: libtraceevent
Requires: libtracefs
+%ifarch %{cpupowerarchs}
+Requires: %{package_name}-tools-libs = %{version}-%{release}
+%endif
%description -n rtla
The rtla meta-tool includes a set of commands that aims to analyze
the real-time properties of Linux. Instead of testing Linux as a black box,
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3584
From: Jan Stancek <jstancek(a)redhat.com>
redhat/kernel.spec: list rtla dependency on tools-libs
JIRA: https://issues.redhat.com/browse/RHEL-70863
List rtla dependency for arches where rtla links against libcpupower.
The explicit version is there to also silence rpminspect warning
about "the need to test interoperability between various combinations
of old and new subpackages."
Signed-off-by: Jan Stancek <jstancek(a)redhat.com>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100644
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -1293,6 +1293,9 @@ Epoch: %{gemini}
Summary: Real-Time Linux Analysis tools
Requires: libtraceevent
Requires: libtracefs
+%ifarch %{cpupowerarchs}
+Requires: %{package_name}-tools-libs = %{version}-%{release}
+%endif
%description -n rtla
The rtla meta-tool includes a set of commands that aims to analyze
the real-time properties of Linux. Instead of testing Linux as a black box,
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/3587