From patchwork Mon Jun 12 03:26:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 103593 Delivered-To: patch@linaro.org Received: by 10.140.91.77 with SMTP id y71csp13858qgd; Sun, 11 Jun 2017 20:31:45 -0700 (PDT) X-Received: by 10.84.176.131 with SMTP id v3mr55513714plb.138.1497238305744; Sun, 11 Jun 2017 20:31:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1497238305; cv=none; d=google.com; s=arc-20160816; b=ZVMTBlrt71K9jo9RbYR1H4OakKHBZ6mkxIAdgV78/o2qcK9lPAEblaqBX3IhKYImc2 Tnpq+cYGV9lG+18Gv27kEEq7yz+kVGYKUdg935RDVwC5ISUdkheVUCAcBOHCoRdjVTXI ecjk/+SaQK7AtbanVfDr7mGGo4E+xALw1ivGfuEmUTmt5LKiWpVygywNtRgSDnlNznSq fsMu9tcC1aEg7y8zRmKYjeHrf5zqn/C01hrku1fTJshatDVPBT8s/4mev+7hD5oy1GCp qCn3cTgDfbQwoeYpTW5joCh+lriJPCqrG7ziy7V2LjW1wlaivUsA121DNyFHncBT6F2O 1FxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature:dkim-filter:arc-authentication-results; bh=ts1X1oTzB74TB+ANontNNTGlMPy7obNMBKfuQnCSTRY=; b=RmaJTQBHS4jvb35PV5XpnFgTLyD1Y6qX+qlgac4r3scu6vvWeWEWoy5l1K8/Ymi8U6 A0vT6F5dZnY96r8SCY7cP89YYPUyroZFebSJr0NT2uagig03BcKRAqelhCwXj3udCWos msblVmDOBwaEqo5MWRrm9M+koleYJWI7LVOo8jQ+ZfW0/BpvdXNJhp69g9HHv6MUIdx6 1c5/xqjocNTs6KhSAyJEN1mMATBj5yRm07dXaOVSS+lp54uPq5mpunNGHAeuYQHXQ56A fUBXVnTfV/9cPUd7aPHein7jiZcPmAdXYVuFTAlI2w3RBSCzrW+yoJEc0dXkPgiXcq3W ZdPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nifty.com; 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 r11si6108524plj.140.2017.06.11.20.31.45; Sun, 11 Jun 2017 20:31:45 -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; 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 S1752502AbdFLDbg (ORCPT + 25 others); Sun, 11 Jun 2017 23:31:36 -0400 Received: from conuserg-09.nifty.com ([210.131.2.76]:21387 "EHLO conuserg-09.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752193AbdFLDbd (ORCPT ); Sun, 11 Jun 2017 23:31:33 -0400 Received: from pug.e01.socionext.com (p14092-ipngnfx01kyoto.kyoto.ocn.ne.jp [153.142.97.92]) (authenticated) by conuserg-09.nifty.com with ESMTP id v5C3RXP0001077; Mon, 12 Jun 2017 12:27:33 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-09.nifty.com v5C3RXP0001077 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1497238056; bh=ts1X1oTzB74TB+ANontNNTGlMPy7obNMBKfuQnCSTRY=; h=From:To:Cc:Subject:Date:From; b=OnvcyKHyxY7zwWSOGosXfWqiSRx8o1Z6PiGp+WZka11oPnnZWEIXEcuT/KjQhC9Ri W73PHXtHpC1PhZBX+/M2AkIxPmFeHVetqB96oipgGqUDz3cBlWRt+nJ0ES/RjUqLEh l3Ucbv04Jo80mtnqZCyjIyOv0lWKGPgjbczDHYMCUqL0xhGoc3M7PoVQbdrOQhwXLW OIfw2GnIHPxFBjHzOnGWWlTTAoaOg9fN05+qgeM7SVKSMtOywHqPf3OSPXGNxRtTfn 43jjy9gU6l1lJ1pcyzkHqJEQvPzmhI7eWULKtGUCr3LGzRYEoMtwdyrt+Wh+FB6Mp/ izmwXPhuk4+fw== X-Nifty-SrcIP: [153.142.97.92] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org, linux-arch Cc: Masahiro Yamada , Ley Foon Tan , Tony Luck , linux-ia64@vger.kernel.org, linux-sh@vger.kernel.org, sparclinux@vger.kernel.org, James Hogan , linux-parisc@vger.kernel.org, Geert Uytterhoeven , Steven Miao , Chris Metcalf , Mikael Starvik , linux-c6x-dev@linux-c6x.org, linux-hexagon@vger.kernel.org, Catalin Marinas , Vineet Gupta , linux-metag@vger.kernel.org, Yoshinori Sato , Jesper Nilsson , Will Deacon , Fenghua Yu , linux-snps-arc@lists.infradead.org, Max Filippov , uclinux-h8-devel@lists.sourceforge.jp, linux-xtensa@linux-xtensa.org, Stefan Kristiansson , Michal Marek , Chris Zankel , adi-buildroot-devel@lists.sourceforge.net, Rich Felker , linux-m68k@lists.linux-m68k.org, openrisc@lists.librecores.org, Mark Salter , Guan Xuetao , nios2-dev@lists.rocketboards.org, Stafford Horne , Russell King , Aurelien Jacquiot , Jonas Bonn , linux-arm-kernel@lists.infradead.org, linux-cris-kernel@axis.com, linux-kernel@vger.kernel.org, "David S. Miller" , "James E.J. Bottomley" , Richard Kuo , Helge Deller Subject: [PATCH 00/27] kbuild, arch: complete UAPI de-coupling and cleanup scripts/Makefile.headersinst Date: Mon, 12 Jun 2017 12:26:54 +0900 Message-Id: <1497238041-7011-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 2.7.4 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In v4.12-rc1, we had a big progress for headers_install. All (and only) headers under UAPI directories are exported. However, asm-generic wrappers are still exceptions because most of arch/*/include/asm/Kbuild include "generic-y" for exported headers. As a result, many of generic-wrappers to be exported are generated outside UAPI directories. To finish de-coupling UAPI, "generic-y" for exported headers should be moved to arch/*/include/uapi/asm/Kbuild. With those cleanups, the logic of headers_install will become even simpler. UAPI will be completely self-contained. This series is based on v4.12-rc2 tag. This series touches Kbuild files under arch/. We have two options to merge this series. [1] I will collect Acked-by from arch maintainers, then apply the whole series to the Kbuild tree. [2] I will ask arch maintainers to pick up arch changes (for v4.13), then apply Makefile changes to the Kbuild tree (for v4.14). [1] will finish this work by v4.13, but need to deal with some conflicts. [2] will allow us to reduce conflicts (still a bit conflicts), but take more time to finish this work. If arch maintainers ack [1], I can manage conflicts before sending a pull request to Linus. Masahiro Yamada (27): kbuild: remove useless $(gen) variable in Makefile.headersinst kbuild: fix comment about dst of headers_{install,check}_all kbuild: pass dst= to Makefile.headersinst from top Makefile arm64: move generic-y of exported headers to uapi/asm/Kbuild ARM: move generic-y of exported headers to uapi/asm/Kbuild arc: move generic-y of exported headers to uapi/asm/Kbuild blackfin: move generic-y of exported headers to uapi/asm/Kbuild c6x: move generic-y of exported headers to uapi/asm/Kbuild cris: move generic-y of exported headers to uapi/asm/Kbuild h8300: move generic-y of exported headers to uapi/asm/Kbuild hexagon: move generic-y of exported headers to uapi/asm/Kbuild ia64: move generic-y of exported headers to uapi/asm/Kbuild m32r: move generic-y of exported headers to uapi/asm/Kbuild m68k: move generic-y of exported headers to uapi/asm/Kbuild metag: move generic-y of exported headers to uapi/asm/Kbuild nios2: remove unneeded arch/nios2/include/(generated/)asm/signal.h nios2: move generic-y of exported headers to uapi/asm/Kbuild openrisc: move generic-y of exported headers to uapi/asm/Kbuild parisc: move generic-y of exported headers to uapi/asm/Kbuild sh: move generic-y of exported headers to uapi/asm/Kbuild sparc: move generic-y of exported headers to uapi/asm/Kbuild tile: move generic-y of exported headers to uapi/asm/Kbuild unicore32: move generic-y of exported headers to uapi/asm/Kbuild xtensa: move generic-y of exported headers to uapi/asm/Kbuild kbuild: do not include old-kbuild-file from Makefile.headersinst kbuild: split exported generic header creation into uapi-asm-generic kbuild: remove wrapper files handling from Makefile.headersinst Makefile | 13 +++++++------ arch/arc/include/asm/Kbuild | 25 ------------------------- arch/arc/include/uapi/asm/Kbuild | 26 ++++++++++++++++++++++++++ arch/arm/include/asm/Kbuild | 17 ----------------- arch/arm/include/uapi/asm/Kbuild | 16 ++++++++++++++++ arch/arm64/include/asm/Kbuild | 17 ----------------- arch/arm64/include/uapi/asm/Kbuild | 16 ++++++++++++++++ arch/blackfin/include/asm/Kbuild | 22 ---------------------- arch/blackfin/include/uapi/asm/Kbuild | 22 ++++++++++++++++++++++ arch/c6x/include/asm/Kbuild | 27 --------------------------- arch/c6x/include/uapi/asm/Kbuild | 26 ++++++++++++++++++++++++++ arch/cris/include/asm/Kbuild | 18 ------------------ arch/cris/include/uapi/asm/Kbuild | 19 +++++++++++++++++++ arch/h8300/include/asm/Kbuild | 27 --------------------------- arch/h8300/include/uapi/asm/Kbuild | 28 ++++++++++++++++++++++++++++ arch/hexagon/include/asm/Kbuild | 23 ----------------------- arch/hexagon/include/uapi/asm/Kbuild | 24 ++++++++++++++++++++++++ arch/ia64/include/asm/Kbuild | 2 -- arch/m32r/include/asm/Kbuild | 2 -- arch/m32r/include/uapi/asm/Kbuild | 2 ++ arch/m68k/include/asm/Kbuild | 12 ------------ arch/m68k/include/uapi/asm/Kbuild | 11 +++++++++++ arch/metag/include/asm/Kbuild | 24 ------------------------ arch/metag/include/uapi/asm/Kbuild | 24 ++++++++++++++++++++++++ arch/nios2/include/asm/Kbuild | 25 ------------------------- arch/nios2/include/asm/signal.h | 22 ---------------------- arch/nios2/include/uapi/asm/Kbuild | 24 ++++++++++++++++++++++++ arch/openrisc/include/asm/Kbuild | 28 ---------------------------- arch/openrisc/include/uapi/asm/Kbuild | 29 +++++++++++++++++++++++++++++ arch/parisc/include/asm/Kbuild | 5 ----- arch/parisc/include/uapi/asm/Kbuild | 4 ++++ arch/sh/include/asm/Kbuild | 20 -------------------- arch/sh/include/uapi/asm/Kbuild | 20 ++++++++++++++++++++ arch/sparc/include/asm/Kbuild | 1 - arch/sparc/include/uapi/asm/Kbuild | 2 ++ arch/tile/include/asm/Kbuild | 19 ------------------- arch/tile/include/uapi/asm/Kbuild | 19 +++++++++++++++++++ arch/unicore32/include/asm/Kbuild | 31 +------------------------------ arch/unicore32/include/uapi/asm/Kbuild | 28 ++++++++++++++++++++++++++++ arch/xtensa/include/asm/Kbuild | 9 --------- arch/xtensa/include/uapi/asm/Kbuild | 10 ++++++++++ scripts/Makefile.headersinst | 28 ++++------------------------ 42 files changed, 362 insertions(+), 405 deletions(-) delete mode 100644 arch/nios2/include/asm/signal.h -- 2.7.4