From: Nicolas Dichtel <nicolas.dichtel@6wind.com>
To: arnd@arndb.de
Cc: mmarek@suse.com, linux-kbuild@vger.kernel.org,
linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-alpha@vger.kernel.org, linux-snps-arc@lists.infradead.org,
linux-arm-kernel@lists.infradead.org,
adi-buildroot-devel@lists.sourceforge.net,
linux-c6x-dev@linux-c6x.org, linux-cris-kernel@axis.com,
uclinux-h8-devel@lists.sourceforge.jp,
linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org,
linux-m68k@lists.linux-m68k.org, linux-metag@vger.kernel.org,
linux-mips@linux-mips.org, linux-am33-list@redhat.com,
nios2-dev@lists.rocketboards.org, openrisc@lists.librecores.org,
linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org,
linux-s390@vger.kernel.org, linux-sh@vger.kernel.org,
sparclinux@vger.kernel.org, linux-xtensa@linux-xtensa.org,
linux-arch@vger.kernel.org, dri-devel@lists.freedesktop.org,
netdev@vger.kernel.org, linux-media@vger.kernel.org,
linux-mmc@vger.kernel.org, netfilter-devel@vger.kernel.org,
coreteam@netfilter.org, linux-nfs@vger.kernel.org,
linux-raid@vger.kernel.org, linux-spi@vger.kernel.org,
linux-mtd@lists.infradead.org, linux-rdma@vger.kernel.org,
fcoe-devel@open-fcoe.org, alsa-devel@alsa-project.org,
linux-fbdev@vger.kernel.org, xen-devel@lists.xenproject.org,
airlied@linux.ie, davem@davemloft.net,
Nicolas Dichtel <nicolas.dichtel@6wind.com>
Subject: [PATCH v2 6/7] Makefile.headersinst: remove destination-y option
Date: Fri, 6 Jan 2017 10:43:58 +0100 [thread overview]
Message-ID: <1483695839-18660-7-git-send-email-nicolas.dichtel@6wind.com> (raw)
In-Reply-To: <1483695839-18660-1-git-send-email-nicolas.dichtel@6wind.com>
This option was added in commit c7bb349e7c25 ("kbuild: introduce destination-y
for exported headers") but never used in-tree.
Signed-off-by: Nicolas Dichtel <nicolas.dichtel@6wind.com>
---
Documentation/kbuild/makefiles.txt | 23 ++++-------------------
| 2 +-
2 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
index 9b9c4797fc55..37b525d329ae 100644
--- a/Documentation/kbuild/makefiles.txt
+++ b/Documentation/kbuild/makefiles.txt
@@ -46,9 +46,8 @@ This document describes the Linux kernel Makefiles.
=== 7 Kbuild syntax for exported headers
--- 7.1 header-y
--- 7.2 genhdr-y
- --- 7.3 destination-y
- --- 7.4 generic-y
- --- 7.5 generated-y
+ --- 7.3 generic-y
+ --- 7.4 generated-y
=== 8 Kbuild Variables
=== 9 Makefile language
@@ -1295,21 +1294,7 @@ See subsequent chapter for the syntax of the Kbuild file.
#include/linux/Kbuild
genhdr-y += version.h
- --- 7.3 destination-y
-
- When an architecture has a set of exported headers that needs to be
- exported to a different directory destination-y is used.
- destination-y specifies the destination directory for all exported
- headers in the file where it is present.
-
- Example:
- #arch/xtensa/platforms/s6105/include/platform/Kbuild
- destination-y := include/linux
-
- In the example above all exported headers in the Kbuild file
- will be located in the directory "include/linux" when exported.
-
- --- 7.4 generic-y
+ --- 7.3 generic-y
If an architecture uses a verbatim copy of a header from
include/asm-generic then this is listed in the file
@@ -1336,7 +1321,7 @@ See subsequent chapter for the syntax of the Kbuild file.
Example: termios.h
#include <asm-generic/termios.h>
- --- 7.5 generated-y
+ --- 7.4 generated-y
If an architecture generates other header files alongside generic-y
wrappers, and not included in genhdr-y, then generated-y specifies
--git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index 3e20d03432d2..876b42cfede4 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -14,7 +14,7 @@ kbuild-file := $(srctree)/$(obj)/Kbuild
include $(kbuild-file)
# called may set destination dir (when installing to asm/)
-_dst := $(if $(destination-y),$(destination-y),$(if $(dst),$(dst),$(obj)))
+_dst := $(if $(dst),$(dst),$(obj))
old-kbuild-file := $(srctree)/$(subst uapi/,,$(obj))/Kbuild
ifneq ($(wildcard $(old-kbuild-file)),)
--
2.8.1
next prev parent reply other threads:[~2017-01-06 9:52 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <bf83da6b-01ef-bf44-b3e1-ca6fc5636818@6wind.com>
2017-01-06 9:43 ` [PATCH v2 0/7] uapi: export all headers under uapi directories Nicolas Dichtel
2017-01-06 9:43 ` [PATCH v2 1/7] arm: put types.h in uapi Nicolas Dichtel
2017-01-09 11:33 ` Arnd Bergmann
2017-01-09 12:00 ` Russell King - ARM Linux
2017-01-06 9:43 ` [PATCH v2 2/7] h8300: put bitsperlong.h " Nicolas Dichtel
2017-01-06 9:43 ` [PATCH v2 3/7] nios2: put setup.h " Nicolas Dichtel
2017-01-09 11:33 ` Arnd Bergmann
2017-01-06 9:43 ` [PATCH v2 4/7] x86: put msr-index.h " Nicolas Dichtel
2017-01-06 12:14 ` Borislav Petkov
2017-01-06 20:50 ` Andy Shevchenko
2017-01-06 9:43 ` [PATCH v2 5/7] Makefile.headersinst: cleanup input files Nicolas Dichtel
2017-01-06 9:43 ` Nicolas Dichtel [this message]
2017-01-06 9:43 ` [PATCH v2 7/7] uapi: export all headers under uapi directories Nicolas Dichtel
2017-01-09 10:01 ` Daniel Vetter
2017-01-09 12:01 ` Russell King - ARM Linux
2017-01-09 12:56 ` Christoph Hellwig
2017-01-12 15:52 ` Nicolas Dichtel
2017-01-12 16:28 ` Jan Engelhardt
2017-01-12 16:32 ` Nicolas Dichtel
2017-01-13 1:04 ` Jeff Epler
2017-01-11 18:14 ` [Linux-c6x-dev] " Mark Salter
2017-01-09 11:33 ` [PATCH v2 0/7] " Arnd Bergmann
2017-01-11 12:42 ` Jesper Nilsson
2017-01-13 10:46 ` [PATCH v3 0/8] " Nicolas Dichtel
2017-01-13 10:46 ` [PATCH v3 1/8] arm: put types.h in uapi Nicolas Dichtel
2017-01-13 17:06 ` Russell King - ARM Linux
2017-01-13 10:46 ` [PATCH v3 2/8] h8300: put bitsperlong.h " Nicolas Dichtel
2017-01-13 10:46 ` [PATCH v3 3/8] nios2: put setup.h " Nicolas Dichtel
2017-01-13 10:55 ` Tobias Klauser
2017-01-13 10:46 ` [PATCH v3 4/8] x86: stop exporting msr-index.h to userland Nicolas Dichtel
2017-01-13 10:46 ` [PATCH v3 5/8] Makefile.headersinst: cleanup input files Nicolas Dichtel
2017-01-13 10:46 ` [PATCH v3 6/8] Makefile.headersinst: remove destination-y option Nicolas Dichtel
2017-01-13 10:46 ` [PATCH v3 7/8] uapi: export all headers under uapi directories Nicolas Dichtel
2017-01-23 9:00 ` Michael Ellerman
2017-01-13 10:46 ` [PATCH v3 8/8] uapi: export all arch specifics directories Nicolas Dichtel
2017-01-13 15:36 ` David Howells
2017-01-13 16:01 ` [PATCH v3 1/8] arm: put types.h in uapi Nicolas Dichtel
2017-01-13 16:19 ` Russell King - ARM Linux
2017-01-13 15:43 ` David Howells
2017-01-13 16:08 ` [PATCH v3 4/8] x86: stop exporting msr-index.h to userland Nicolas Dichtel
2017-01-13 16:38 ` Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1483695839-18660-7-git-send-email-nicolas.dichtel@6wind.com \
--to=nicolas.dichtel@6wind.com \
--cc=adi-buildroot-devel@lists.sourceforge.net \
--cc=airlied@linux.ie \
--cc=alsa-devel@alsa-project.org \
--cc=arnd@arndb.de \
--cc=coreteam@netfilter.org \
--cc=davem@davemloft.net \
--cc=dri-devel@lists.freedesktop.org \
--cc=fcoe-devel@open-fcoe.org \
--cc=linux-alpha@vger.kernel.org \
--cc=linux-am33-list@redhat.com \
--cc=linux-arch@vger.kernel.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-c6x-dev@linux-c6x.org \
--cc=linux-cris-kernel@axis.com \
--cc=linux-doc@vger.kernel.org \
--cc=linux-fbdev@vger.kernel.org \
--cc=linux-hexagon@vger.kernel.org \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=linux-media@vger.kernel.org \
--cc=linux-metag@vger.kernel.org \
--cc=linux-mips@linux-mips.org \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-mtd@lists.infradead.org \
--cc=linux-nfs@vger.kernel.org \
--cc=linux-parisc@vger.kernel.org \
--cc=linux-raid@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=linux-s390@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=linux-snps-arc@lists.infradead.org \
--cc=linux-spi@vger.kernel.org \
--cc=linux-xtensa@linux-xtensa.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mmarek@suse.com \
--cc=netdev@vger.kernel.org \
--cc=netfilter-devel@vger.kernel.org \
--cc=nios2-dev@lists.rocketboards.org \
--cc=openrisc@lists.librecores.org \
--cc=sparclinux@vger.kernel.org \
--cc=uclinux-h8-devel@lists.sourceforge.jp \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).