Revert "build: always use BASEDIR for xen sub-directory"

This reverts commit e4e64408f5c755da3bf7bfd78e70ad9f6c448376.

diff --git a/xen/common/Makefile b/xen/common/Makefile
index 083f62acb6342bd03bf0d214a8e3c485fbd7d1f4..b3b60a1ba25bb84c19c731375c06a3d7effa7c65 100644 (file)
--- a/xen/common/Makefile
+++ b/xen/common/Makefile
@@ -78,14 +78,14 @@ obj-$(CONFIG_UBSAN) += ubsan/
 obj-$(CONFIG_NEEDS_LIBELF) += libelf/
 obj-$(CONFIG_HAS_DEVICE_TREE) += libfdt/
 
-CONF_FILE := $(if $(patsubst /%,,$(KCONFIG_CONFIG)),$(BASEDIR)/)$(KCONFIG_CONFIG)
+CONF_FILE := $(if $(patsubst /%,,$(KCONFIG_CONFIG)),$(XEN_ROOT)/xen/)$(KCONFIG_CONFIG)
 config.gz: $(CONF_FILE)
        gzip -c $< >$@
 
 config_data.o: config.gz
 
-config_data.S: $(BASEDIR)/tools/binfile
-       $(SHELL) $(BASEDIR)/tools/binfile $@ config.gz xen_config_data
+config_data.S: $(XEN_ROOT)/xen/tools/binfile
+       $(SHELL) $(XEN_ROOT)/xen/tools/binfile $@ config.gz xen_config_data
 
 clean::
        rm -f config_data.S config.gz 2>/dev/null

diff --git a/xen/include/xen/lib/x86/Makefile b/xen/include/xen/lib/x86/Makefile
index f1229b9bc84845548d86d31a3015a1b492387f6c..408d69c99eccb03fba81aa8e2cf31c9ea07b2edf 100644 (file)
--- a/xen/include/xen/lib/x86/Makefile
+++ b/xen/include/xen/lib/x86/Makefile
@@ -3,6 +3,6 @@ include $(XEN_ROOT)/Config.mk
 .PHONY: all
 all: cpuid-autogen.h
 
-cpuid-autogen.h: $(BASEDIR)/include/public/arch-x86/cpufeatureset.h $(BASEDIR)/tools/gen-cpuid.py
-       $(PYTHON) $(BASEDIR)/tools/gen-cpuid.py -i $< -o $@.new
+cpuid-autogen.h: $(XEN_ROOT)/xen/include/public/arch-x86/cpufeatureset.h $(XEN_ROOT)/xen/tools/gen-cpuid.py
+       $(PYTHON) $(XEN_ROOT)/xen/tools/gen-cpuid.py -i $< -o $@.new
        $(call move-if-changed,$@.new,$@)

diff --git a/xen/tools/kconfig/Makefile.kconfig b/xen/tools/kconfig/Makefile.kconfig
index 799321ec4d0766a024da293f04fe9a15db0ad79b..065f4b84716f0dc5fc3cda2bc44954f78e2f3d13 100644 (file)
--- a/xen/tools/kconfig/Makefile.kconfig
+++ b/xen/tools/kconfig/Makefile.kconfig
@@ -9,7 +9,7 @@ Q :=
 kecho := :
 
 # eventually you'll want to do out of tree builds
-srctree := $(BASEDIR)
+srctree := $(XEN_ROOT)/xen
 objtree := $(srctree)
 src := tools/kconfig
 obj := $(src)

diff --git a/xen/xsm/flask/Makefile b/xen/xsm/flask/Makefile
index 637159ad82769b84f5483e0610594fa3dd45e1d3..50bec20a1e8f25602a97d1643c2ee275975f9ece 100644 (file)
--- a/xen/xsm/flask/Makefile
+++ b/xen/xsm/flask/Makefile
@@ -35,8 +35,8 @@ $(subst include/,%/,$(AV_H_FILES)): $(AV_H_DEPEND) $(mkaccess) FORCE
 obj-bin-$(CONFIG_XSM_FLASK_POLICY) += flask-policy.o
 flask-policy.o: policy.bin
 
-flask-policy.S: $(BASEDIR)/tools/binfile
-       $(SHELL) $(BASEDIR)/tools/binfile -i $@ policy.bin xsm_flask_init_policy
+flask-policy.S: $(XEN_ROOT)/xen/tools/binfile
+       $(SHELL) $(XEN_ROOT)/xen/tools/binfile -i $@ policy.bin xsm_flask_init_policy
 
 FLASK_BUILD_DIR := $(CURDIR)
 POLICY_SRC := $(FLASK_BUILD_DIR)/xenpolicy-$(XEN_FULLVERSION)