[OS-BUILD PATCH] redhat: adapt to upstream Makefile change
by Clark Williams (via Email Bridge)
From: Clark Williams <williams(a)redhat.com>
redhat: adapt to upstream Makefile change
Upstream commit 67d7c3023a672c2 breaks our include of
Makefile.rhelver when the O= option is used (moves the
object file directory). Move the include of Makefile.rhelver
to a point where the absolute path to the source dir is
defined.
Thanks to Eder Zulian (ezulian) for tracking this down.
Signed-off-by: Clark Williams <williams(a)redhat.com>
diff --git a/Makefile b/Makefile
index blahblah..blahblah 100644
--- a/Makefile
+++ b/Makefile
@@ -22,10 +22,6 @@ $(if $(filter __%, $(MAKECMDGOALS)), \
PHONY := __all
__all:
-# Set RHEL variables
-# Use this spot to avoid future merge conflicts
-include Makefile.rhelver
-
# We are using a recursive build, so we need to do a little thinking
# to get the ordering right.
#
@@ -203,6 +199,9 @@ endif
this-makefile := $(lastword $(MAKEFILE_LIST))
abs_srctree := $(realpath $(dir $(this-makefile)))
+# Set RHEL variables
+include $(abs_srctree)/Makefile.rhelver
+
ifneq ($(words $(subst :, ,$(abs_srctree))), 1)
$(error source directory cannot contain spaces or colons)
endif
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2344
1 year, 2 months
[OS-BUILD PATCH] Add rtla-hwnoise files
by Justin M. Forbes (via Email Bridge)
From: Justin M. Forbes <jforbes(a)fedoraproject.org>
Add rtla-hwnoise files
Upstream added the hwnoise tool to rtla. This needs to be added to
files, but as it is also a linked binary, the linking needst to be
manually fixed up in the rpmbuild environment similar to osnoise.
Signed-off-by: Justin M. Forbes <jforbes(a)fedoraproject.org>
diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -2754,10 +2754,12 @@ install -m755 page_owner_sort %{buildroot}%{_bindir}/page_owner_sort
popd
pushd tools/tracing/rtla/
%{tools_make} DESTDIR=%{buildroot} install
+rm -f %{buildroot}%{_bindir}/hwnoise
rm -f %{buildroot}%{_bindir}/osnoise
rm -f %{buildroot}%{_bindir}/timerlat
(cd %{buildroot}
+ ln -sf rtla ./%{_bindir}/hwnoise
ln -sf rtla ./%{_bindir}/osnoise
ln -sf rtla ./%{_bindir}/timerlat
)
@@ -3189,8 +3191,10 @@ fi
%files -n rtla
%{_bindir}/rtla
+%{_bindir}/hwnoise
%{_bindir}/osnoise
%{_bindir}/timerlat
+%{_mandir}/man1/rtla-hwnoise.1.gz
%{_mandir}/man1/rtla-osnoise-hist.1.gz
%{_mandir}/man1/rtla-osnoise-top.1.gz
%{_mandir}/man1/rtla-osnoise.1.gz
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2343
1 year, 2 months