From nobody Fri May 3 16:39:08 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail(p=none dis=none) header.from=arm.com ARC-Seal: i=1; a=rsa-sha256; t=1601635382; cv=none; d=zohomail.com; s=zohoarc; b=G3aSKGmfF5B91bjDkWnWg2A2Ir8qHX5KMkW4b9pohY9cXX9YEQVswvzysuECz7WVdkFAvk9iNgw23au4t3SrQ39PZ9sBVkZMgwZ/CH7sCKkux3EAVkkCzu/npM8P3yxOJE/D3twQ5JcdUo68N74zlqx29E/TjZZ1/ZLGdrjyniA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1601635382; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To; bh=xzC4ENJnmUb7ljw91FKp5BkgyLg+MW32mwRWuBixAJc=; b=BpsgqYjDYmFM207N2OSyPgav+C7VsTzw9Q9Hm9zBEGwG1/jtoOB9MnBobHMddNEoWMpgSzrvb2kUERIWhulpChG8SR6nKE73hfTtLynApLcn+v1jZ3fv3Fm8FdQw+rTxS6+CGenh13/FDhM3wTGohNAQPSYP2kxiWhIg/G+0Obs= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=fail header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 160163538233116.067470550908183; Fri, 2 Oct 2020 03:43:02 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.1865.5646 (Exim 4.92) (envelope-from ) id 1kOIWR-0006ON-Nw; Fri, 02 Oct 2020 10:42:43 +0000 Received: by outflank-mailman (output) from mailman id 1865.5646; Fri, 02 Oct 2020 10:42:43 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kOIWR-0006OG-Kh; Fri, 02 Oct 2020 10:42:43 +0000 Received: by outflank-mailman (input) for mailman id 1865; Fri, 02 Oct 2020 10:42:42 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kOIWQ-0006OB-76 for xen-devel@lists.xenproject.org; Fri, 02 Oct 2020 10:42:42 +0000 Received: from foss.arm.com (unknown [217.140.110.172]) by us1-rack-iad1.inumbo.com (Halon) with ESMTP id 7c2da763-13a7-4efd-bd07-f7bf653027ec; Fri, 02 Oct 2020 10:42:41 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id ABA9231B; Fri, 2 Oct 2020 03:42:40 -0700 (PDT) Received: from e109506-lin.cambridge.arm.com (e109506-lin.cambridge.arm.com [10.1.198.23]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 351803F73B; Fri, 2 Oct 2020 03:42:39 -0700 (PDT) Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kOIWQ-0006OB-76 for xen-devel@lists.xenproject.org; Fri, 02 Oct 2020 10:42:42 +0000 Received: from foss.arm.com (unknown [217.140.110.172]) by us1-rack-iad1.inumbo.com (Halon) with ESMTP id 7c2da763-13a7-4efd-bd07-f7bf653027ec; Fri, 02 Oct 2020 10:42:41 +0000 (UTC) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id ABA9231B; Fri, 2 Oct 2020 03:42:40 -0700 (PDT) Received: from e109506-lin.cambridge.arm.com (e109506-lin.cambridge.arm.com [10.1.198.23]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 351803F73B; Fri, 2 Oct 2020 03:42:39 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 7c2da763-13a7-4efd-bd07-f7bf653027ec From: Bertrand Marquis To: xen-devel@lists.xenproject.org Cc: Andrew Cooper , George Dunlap , Ian Jackson , Jan Beulich , Julien Grall , Stefano Stabellini , Wei Liu , =?UTF-8?q?Roger=20Pau=20Monn=C3=A9?= , Doug Goldstein , Daniel De Graaf Subject: [PATCH] build: always use BASEDIR for xen sub-directory Date: Fri, 2 Oct 2020 11:42:09 +0100 Message-Id: <556f6327acea2d0343c93da28f1fc17591afd402.1601564274.git.bertrand.marquis@arm.com> X-Mailer: git-send-email 2.17.1 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Modify Makefiles using $(XEN_ROOT)/xen to use $(BASEDIR) instead. This is removing the dependency to xen subdirectory preventing using a wrong configuration file when xen subdirectory is duplicated for compilation tests. Signed-off-by: Bertrand Marquis Acked-by: Jan Beulich --- xen/common/Makefile | 6 +++--- xen/include/xen/lib/x86/Makefile | 4 ++-- xen/tools/kconfig/Makefile.kconfig | 2 +- xen/xsm/flask/Makefile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/xen/common/Makefile b/xen/common/Makefile index b3b60a1ba2..083f62acb6 100644 --- a/xen/common/Makefile +++ b/xen/common/Makefile @@ -78,14 +78,14 @@ obj-$(CONFIG_UBSAN) +=3D ubsan/ obj-$(CONFIG_NEEDS_LIBELF) +=3D libelf/ obj-$(CONFIG_HAS_DEVICE_TREE) +=3D libfdt/ =20 -CONF_FILE :=3D $(if $(patsubst /%,,$(KCONFIG_CONFIG)),$(XEN_ROOT)/xen/)$(K= CONFIG_CONFIG) +CONF_FILE :=3D $(if $(patsubst /%,,$(KCONFIG_CONFIG)),$(BASEDIR)/)$(KCONFI= G_CONFIG) config.gz: $(CONF_FILE) gzip -c $< >$@ =20 config_data.o: config.gz =20 -config_data.S: $(XEN_ROOT)/xen/tools/binfile - $(SHELL) $(XEN_ROOT)/xen/tools/binfile $@ config.gz xen_config_data +config_data.S: $(BASEDIR)/tools/binfile + $(SHELL) $(BASEDIR)/tools/binfile $@ config.gz xen_config_data =20 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/Mak= efile index 408d69c99e..f1229b9bc8 100644 --- 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 =20 -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 +cpuid-autogen.h: $(BASEDIR)/include/public/arch-x86/cpufeatureset.h $(BASE= DIR)/tools/gen-cpuid.py + $(PYTHON) $(BASEDIR)/tools/gen-cpuid.py -i $< -o $@.new $(call move-if-changed,$@.new,$@) diff --git a/xen/tools/kconfig/Makefile.kconfig b/xen/tools/kconfig/Makefil= e.kconfig index 065f4b8471..799321ec4d 100644 --- a/xen/tools/kconfig/Makefile.kconfig +++ b/xen/tools/kconfig/Makefile.kconfig @@ -9,7 +9,7 @@ Q :=3D kecho :=3D : =20 # eventually you'll want to do out of tree builds -srctree :=3D $(XEN_ROOT)/xen +srctree :=3D $(BASEDIR) objtree :=3D $(srctree) src :=3D tools/kconfig obj :=3D $(src) diff --git a/xen/xsm/flask/Makefile b/xen/xsm/flask/Makefile index 50bec20a1e..637159ad82 100644 --- a/xen/xsm/flask/Makefile +++ b/xen/xsm/flask/Makefile @@ -35,8 +35,8 @@ $(subst include/,%/,$(AV_H_FILES)): $(AV_H_DEPEND) $(mkac= cess) FORCE obj-bin-$(CONFIG_XSM_FLASK_POLICY) +=3D flask-policy.o flask-policy.o: policy.bin =20 -flask-policy.S: $(XEN_ROOT)/xen/tools/binfile - $(SHELL) $(XEN_ROOT)/xen/tools/binfile -i $@ policy.bin xsm_flask_init_po= licy +flask-policy.S: $(BASEDIR)/tools/binfile + $(SHELL) $(BASEDIR)/tools/binfile -i $@ policy.bin xsm_flask_init_policy =20 FLASK_BUILD_DIR :=3D $(CURDIR) POLICY_SRC :=3D $(FLASK_BUILD_DIR)/xenpolicy-$(XEN_FULLVERSION) --=20 2.17.1