From: Clark Williams <willi...@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 <willi...@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
_______________________________________________
kernel mailing list -- kernel@lists.fedoraproject.org
To unsubscribe send an email to kernel-le...@lists.fedoraproject.org
Fedora Code of Conduct: 
https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: 
https://lists.fedoraproject.org/archives/list/kernel@lists.fedoraproject.org
Do not reply to spam, report it: 
https://pagure.io/fedora-infrastructure/new_issue

Reply via email to