|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [xen master] build: avoid Paths.mk in hypervisor build
commit 204f44257731a33083820a97de44fb330316a04f
Author: Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Thu Feb 5 10:27:17 2026 +0100
Commit: Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Feb 5 10:27:17 2026 +0100
build: avoid Paths.mk in hypervisor build
Its inclusion placed where it is, it affects the hypervisor build as well.
The hypervisor build, in its _install rule, uses $(DEBUG_DIR), first in
[ -d "$(D)$(DEBUG_DIR)" ] || $(INSTALL_DIR) $(D)$(DEBUG_DIR)
$(D) is an absolute directory (shorthand for $(DESTDIR)). $(DEBUG_DIR) as
set by Paths.mk is, too. Both point into the build tree. The two simply
shouldn't be glued together.
Note that the earlier
[ -d $(D)$(BOOT_DIR) ] || $(INSTALL_DIR) $(D)$(BOOT_DIR)
continues to be working fine, as BOOT_DIR continues to be controlled by
config/StdGNU.mk. Its DEBUG_DIR isn't taking effect anymore, when for the
hypervisor build it should.
And of course behavior now differs between building xen/ in a tree where
tools/ was built before vs in an otherwise clean tree.
Fixes: 82b9cc04a7c7 ("build: add make macro for making file from file.in")
Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Reviewed-by: Bertrand Marquis <bertrand.marquis@xxxxxxx>
---
Config.mk | 2 ++
1 file changed, 2 insertions(+)
diff --git a/Config.mk b/Config.mk
index a3e219a0b8..fdc0245079 100644
--- a/Config.mk
+++ b/Config.mk
@@ -162,7 +162,9 @@ endef
PATH_FILES := Paths.mk
INC_FILES = $(foreach f, $(PATH_FILES), $(XEN_ROOT)/config/$(f))
+ifndef XEN_FULLVERSION
-include $(INC_FILES)
+endif
BUILD_MAKE_VARS = $(foreach f, $(PATH_FILES), $(shell awk '$$2 == ":=" { print
$$1; }' $(XEN_ROOT)/config/$(f).in))
--
generated by git-patchbot for /home/xen/git/xen.git#master
|
![]() |
Lists.xenproject.org is hosted with RackSpace, monitoring our |