From patchwork Sat Jun 22 06:55:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 167474 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp1644970ilk; Fri, 21 Jun 2019 23:55:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqzTNOh7XiElxzO9lgfg+7OqouL1q94hsLOb+pzrI5ZFJz+zY3SHxYoTges0SBFuU2EKrUp7 X-Received: by 2002:a17:90a:9201:: with SMTP id m1mr11596292pjo.38.1561186554267; Fri, 21 Jun 2019 23:55:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561186554; cv=none; d=google.com; s=arc-20160816; b=gOWK4MtBN1lOJrEdMmn9IlQMjGMOLGqVjz+WD7w7iZ6yrsvGnk0XiLJ8FviplEuXk/ UyeQRTSM1b9OEoUKlTzN37X1YLvxrf4MdvkNGBclo5mz5qOhhWuwZ1uK+JJkWuLe4Nd2 4n4hEbhAdx/S6juKLUNSmTKGWu36hIZAZaP3ZyRG00JjH4T10fb6v1YITKEG4AFpC4ea FnNWf368+PSEj0IZGUBDEP9/+yx0clfz0yqG3zoCxoe4v5xqLlAyGC8wlQCKhJqgilZJ QD+LOe1mrv6F1g2JdEVnnCO8H1vY2pvwgElY8ZxRmwIIiPGZP/jd/lMkxg9SFxLni51d 9rjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature:dkim-filter; bh=ej0oqJGYt9D+7866FK2QypG91Du8BcfoF4GP+1Lu2f8=; b=wi7ovcL2+k5F0uzqC7vKOg1n9s8JzZlYsVN2L4r3S9cnvtF0X30wihiAZCOAXtxIn4 KlujqyoU6RaQqQDMBSAWwsjQqBcpEsDAlP/O7YKG7513JhlG/VKWaJFghCgns5wyC1ix 1M8WO2BkA+q6DYavk+EgmkIIdLMon9wEliY4V44086/7oxwMiqnwKYDxWe8HmHDWhpp7 2Pjb2szmCjNoqDpN8Lf08gr4GU2iezBxEpkRF0cYIQxpkNybOsD+Oykx0RjNz+th4NAN QXkb0lhonMIYkLqrEs9pDL/fgLT5tTIfy3xEGKPShUU/dxkLl6U3Rkb5bBI16SLi6m+R wO2Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=ed0GSQ1a; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cl14si4686470plb.341.2019.06.21.23.55.53; Fri, 21 Jun 2019 23:55:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=ed0GSQ1a; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726114AbfFVGzw (ORCPT + 30 others); Sat, 22 Jun 2019 02:55:52 -0400 Received: from conuserg-08.nifty.com ([210.131.2.75]:43322 "EHLO conuserg-08.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726063AbfFVGzv (ORCPT ); Sat, 22 Jun 2019 02:55:51 -0400 Received: from grover.flets-west.jp (softbank126125154139.bbtec.net [126.125.154.139]) (authenticated) by conuserg-08.nifty.com with ESMTP id x5M6tNs8002066; Sat, 22 Jun 2019 15:55:24 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-08.nifty.com x5M6tNs8002066 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1561186524; bh=ej0oqJGYt9D+7866FK2QypG91Du8BcfoF4GP+1Lu2f8=; h=From:To:Cc:Subject:Date:From; b=ed0GSQ1ajETv90PtATAcD51BdVO9aSXQc1H6/9wu/f/hfcVb2icE5VILoK+4zfzYe 0p3qkeR5cWojNmr8U0jR6obyBpi4AJPVs3isfSV+akH7jTxcHYtuz9pmXc80GQt5kt xrloY44/mhGA6PlReCqX/RgG8PmEWFaLFiJfIZDQiqzxWomcsC2TkQDiyDepmrF6uS TX2YVIzSimnSv2b9HEbwHoKdQL92uTds3l3q+6O5ZOYfitBPYQdA7QCJ3/ltfcoKhM r4IHzh21xaEumlWxy08GAyadGNu9OMz4MTsq7QivpcUQ752hEc0wSJzMXbJrCN7pal 9JQ4GLszpMlTQ== X-Nifty-SrcIP: [126.125.154.139] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , Michal Marek , linux-kernel@vger.kernel.org Subject: [PATCH] kbuild: fix 'No such file or directory' warning for headers_install Date: Sat, 22 Jun 2019 15:55:20 +0900 Message-Id: <20190622065520.10105-1-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Since commit d5470d14431e ("kbuild: re-implement Makefile.headersinst without recursion"), headers_install emits an ugly warning. $ make headers_install [ snip ] UPD include/generated/uapi/linux/version.h find: ‘./include/uapi/Kbuild’: No such file or directory HDRINST usr/include/video/uvesafb.h ... This happens for GNU Make <= 4.2.1 When I wrote that commit, I missed this warning because I was using the state-of-the-art Make version compiled from the git tree. $(wildcard $(src)/*/) is intended to match to only existing directories since it has a trailing slash, but actually matches to regular files too. (include/uapi/Kbuild in this case) This is a bug of GNU Make, and was fixed by: | commit b7acb10e86dc8f5fdf2a2bbd87e1059c315e31d6 | Author: spagoveanu@gmail.com | Date: Wed Jun 20 02:03:48 2018 +0300 | | * src/dir.c: Preserve glob d_type field We need to cater to old Make versions. Add '$(filter %/,...) to filter out the regular files. Fixes: d5470d14431e ("kbuild: re-implement Makefile.headersinst without recursion") Signed-off-by: Masahiro Yamada --- scripts/Makefile.headersinst | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.17.1 diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst index d2b572a7a628..ddc764838df2 100644 --- a/scripts/Makefile.headersinst +++ b/scripts/Makefile.headersinst @@ -20,8 +20,10 @@ dst := usr/include -include $(src)/Kbuild -src-subdirs := $(patsubst $(src)/%/,%,$(wildcard $(src)/*/)) -gen-subdirs := $(patsubst $(gen)/%/,%,$(wildcard $(gen)/*/)) +# $(filter %/, ...) is needed to workaround the bug for GNU Make <= 4.2.1 +# $(wildcard $(src)/*/) contains not only directories but also regular files. +src-subdirs := $(patsubst $(src)/%/,%,$(filter %/, $(wildcard $(src)/*/))) +gen-subdirs := $(patsubst $(gen)/%/,%,$(filter %/, $(wildcard $(gen)/*/))) all-subdirs := $(sort $(src-subdirs) $(gen-subdirs)) src-headers := $(if $(src-subdirs), $(shell cd $(src) && find $(src-subdirs) -name '*.h'))