From patchwork Thu Sep 10 12:13:00 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 11767719 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 324CE92C for ; Thu, 10 Sep 2020 12:14:02 +0000 (UTC) Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0EC292076D for ; Thu, 10 Sep 2020 12:14:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0EC292076D Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=suse.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=xen-devel-bounces@lists.xenproject.org Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kGLRk-0007so-Lu; Thu, 10 Sep 2020 12:13:00 +0000 Received: from us1-rack-iad1.inumbo.com ([172.99.69.81]) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1kGLRj-0007sX-JW for xen-devel@lists.xenproject.org; Thu, 10 Sep 2020 12:12:59 +0000 X-Inumbo-ID: 67bfa473-3f4d-4ebd-b054-32b5934809d7 Received: from mx2.suse.de (unknown [195.135.220.15]) by us1-rack-iad1.inumbo.com (Halon) with ESMTPS id 67bfa473-3f4d-4ebd-b054-32b5934809d7; Thu, 10 Sep 2020 12:12:58 +0000 (UTC) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id CE810AFC8; Thu, 10 Sep 2020 12:13:13 +0000 (UTC) Subject: [PATCH 5/6] tools/include: adjust x86-specific population of xen/ From: Jan Beulich To: "xen-devel@lists.xenproject.org" Cc: Ian Jackson , Wei Liu References: <2a9f86aa-9104-8a45-cd21-72acd693f924@suse.com> Message-ID: <0f9f05c2-2f76-93d6-21e9-6308741c49b7@suse.com> Date: Thu, 10 Sep 2020 14:13:00 +0200 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:68.0) Gecko/20100101 Thunderbird/68.12.0 MIME-Version: 1.0 In-Reply-To: <2a9f86aa-9104-8a45-cd21-72acd693f924@suse.com> Content-Language: en-US X-BeenThere: xen-devel@lists.xenproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" There's no need to use a shell loop construct here - ln's destination can be specified as just the intended directory, as we don't mean to change the names of any of the files. Also drop XEN_LIB_X86_INCLUDES for having a single use only, and don't pass -f to ln, to allow noticing name collisions right away. Signed-off-by: Jan Beulich --- a/tools/include/Makefile +++ b/tools/include/Makefile @@ -12,8 +12,6 @@ all-y: xen-foreign: $(MAKE) -C xen-foreign -XEN_LIB_X86_INCLUDES = $(filter-out %autogen.h, $(XEN_ROOT)/xen/include/xen/lib/x86/Makefile $(wildcard $(XEN_ROOT)/xen/include/xen/lib/x86/*.h)) - xen-dir: @rm -rf xen acpi mkdir -p xen/libelf acpi @@ -26,11 +24,10 @@ xen-dir: ln -s $(XEN_ROOT)/xen/include/acpi/platform acpi/ ln -s $(XEN_ROOT)/xen/include/acpi/ac*.h acpi/ ifeq ($(CONFIG_X86),y) - ln -sf $(XEN_ROOT)/xen/include/asm-x86 xen/asm + ln -s $(XEN_ROOT)/xen/include/asm-x86 xen/asm mkdir -p xen/lib/x86 - 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 + ln -s $(filter-out %autogen.h,$(wildcard $(XEN_ROOT)/xen/include/xen/lib/x86/*.h)) xen/lib/x86/ + ln -s $(XEN_ROOT)/xen/include/xen/lib/x86/Makefile xen/lib/x86/ endif all-$(CONFIG_X86): xen-dir