From nobody Fri Apr 26 00:25:05 2024 Delivered-To: importer@patchew.org Received-SPF: none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org ARC-Seal: i=1; a=rsa-sha256; t=1568181809; cv=none; d=zoho.com; s=zohoarc; b=oOU5mo0evNFqrVnNSyKKiX5fdpJv71g+WA20HNWfo1rnF2+unetSXRmPNi5QYMGKHnYv/YZJ1qIB0Lo/GmIWVjscgWfry0dLQKj8dIM2Ov0C/H5VS2dsd+nLoegeaYoL7uJJtEkDjEcr7msaceXGcE0HT+D5balRXvXB3TmC0Ok= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1568181809; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=Jb9eZck1PLAekhAS0nBX0xHUo1HGJQ701mHEDvmDWN8=; b=Mn9v11Y1a7R+MA64szFlMieTVTmdLjm220hC+B15mLajadz/tWB8NOio6tm9V/NHFsAHf+lZQer3qtQICO8G7mmmtX1Ac1SCkvYuehhNVJJnCXBF2mhlVW2q0OTJ63qtGiaWQPGzgqiY61ZPJImHVWNtyKe09yHwTPbbkbCCSw0= ARC-Authentication-Results: i=1; mx.zoho.com; spf=none (zoho.com: 192.237.175.120 is neither permitted nor denied by domain of lists.xenproject.org) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1568181808994311.75155605687814; Tue, 10 Sep 2019 23:03:28 -0700 (PDT) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1i7vhi-00024M-Ld; Wed, 11 Sep 2019 06:02:10 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.89) (envelope-from ) id 1i7vhh-00024H-Hv for xen-devel@lists.xenproject.org; Wed, 11 Sep 2019 06:02:09 +0000 Received: from mx1.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id aef80b98-d459-11e9-978d-bc764e2007e4; Wed, 11 Sep 2019 06:02:06 +0000 (UTC) Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id EDAC3AF81; Wed, 11 Sep 2019 06:02:05 +0000 (UTC) X-Inumbo-ID: aef80b98-d459-11e9-978d-bc764e2007e4 X-Virus-Scanned: by amavisd-new at test-mx.suse.de From: Juergen Gross To: xen-devel@lists.xenproject.org Date: Wed, 11 Sep 2019 08:02:03 +0200 Message-Id: <20190911060203.25202-1-jgross@suse.com> X-Mailer: git-send-email 2.16.4 Subject: [Xen-devel] [PATCH] tools: fix linking hypervisor includes to tools include directory X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Cc: Juergen Gross , Ian Jackson , Wei Liu MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" An incremental build of tools/include won't pickup new hypervisor headers in tools/include/xen. Fix that. Signed-off-by: Juergen Gross Acked-by: Ian Jackson --- tools/include/Makefile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tools/include/Makefile b/tools/include/Makefile index 71538e1ce2..3d0192fbad 100644 --- a/tools/include/Makefile +++ b/tools/include/Makefile @@ -12,11 +12,14 @@ all-y: xen-foreign: $(MAKE) -C xen-foreign =20 -xen/.dir: +XEN_PUBLIC_INCLUDES =3D $(wildcard $(XEN_ROOT)/xen/include/public/*.h) +XEN_LIB_X86_INCLUDES =3D $(filter-out %autogen.h, $(XEN_ROOT)/xen/include/= xen/lib/x86/Makefile $(wildcard $(XEN_ROOT)/xen/include/xen/lib/x86/*.h)) + +xen/.dir: $(XEN_PUBLIC_INCLUDES) $(XEN_LIB_X86_INCLUDES) @rm -rf xen mkdir -p xen/libelf ln -sf $(XEN_ROOT)/xen/include/public/COPYING xen - ln -sf $(wildcard $(XEN_ROOT)/xen/include/public/*.h) xen + ln -sf $(XEN_PUBLIC_INCLUDES) xen ln -sf $(addprefix $(XEN_ROOT)/xen/include/public/,arch-x86 arch-arm hvm = io xsm) xen ln -sf ../xen-sys/$(XEN_OS) xen/sys ln -sf $(addprefix $(XEN_ROOT)/xen/include/xen/,libelf.h elfstructs.h) xe= n/libelf/ @@ -25,7 +28,7 @@ xen/.dir: ifeq ($(CONFIG_X86),y) ln -sf $(XEN_ROOT)/xen/include/asm-x86 xen/asm mkdir -p xen/lib/x86 - for f in $(filter-out %autogen.h,$(patsubst $(XEN_ROOT)/xen/include/xen/l= ib/x86/%,%,Makefile $(wildcard $(XEN_ROOT)/xen/include/xen/lib/x86/*.h))); = do \ + for f in $(patsubst $(XEN_ROOT)/xen/include/xen/lib/x86/%,%,$(XEN_LIB_X86= _INCLUDES)); do \ ln -sf $(XEN_ROOT)/xen/include/xen/lib/x86/$$f xen/lib/x86/$$f; \ done endif --=20 2.16.4 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel