From: David Howells <dhowells@redhat.com>
To: torvalds@osdl.org
Cc: linux-kernel@vger.kernel.org, linux-kbuild@vger.kernel.org,
David Howells <dhowells@redhat.com>
Subject: [PATCH 36/40] UAPI: Move linux/version.h [ver #3]
Date: Thu, 28 Jul 2011 16:55:02 +0100 [thread overview]
Message-ID: <20110728155502.16618.50189.stgit@warthog.procyon.org.uk> (raw)
In-Reply-To: <20110728154920.16618.89358.stgit@warthog.procyon.org.uk>
Move include/linux/version.h to the UAPI header directory.
Signed-off-by: David Howells <dhowells@redhat.com>
---
Makefile | 10 +++++-----
include/linux/Kbuild | 1 -
include/uapi/linux/Kbuild | 3 +++
3 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 2c0bf71..b307524 100644
--- a/Makefile
+++ b/Makefile
@@ -450,7 +450,7 @@ asm-generic:
no-dot-config-targets := clean mrproper distclean \
cscope gtags TAGS tags help %docs check% coccicheck \
- include/linux/version.h headers_% \
+ include/uapi/linux/version.h headers_% \
kernelversion %src-pkg
config-targets := 0
@@ -983,7 +983,7 @@ endif
# prepare2 creates a makefile if using a separate output directory
prepare2: prepare3 outputmakefile asm-generic
-prepare1: prepare2 include/linux/version.h include/generated/utsrelease.h \
+prepare1: prepare2 include/uapi/linux/version.h include/generated/utsrelease.h \
include/config/auto.conf
$(cmd_crmodverdir)
@@ -1017,7 +1017,7 @@ define filechk_version.h
echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';)
endef
-include/linux/version.h: $(srctree)/Makefile FORCE
+include/uapi/linux/version.h: $(srctree)/Makefile FORCE
$(call filechk,version.h)
include/generated/utsrelease.h: include/config/kernel.release FORCE
@@ -1056,7 +1056,7 @@ hdr-inst := -rR -f $(srctree)/scripts/Makefile.headersinst obj
hdr-dst = $(if $(KBUILD_HEADERS), dst=include/asm-$(hdr-arch), dst=include/asm)
PHONY += __headers
-__headers: include/linux/version.h scripts_basic asm-generic FORCE
+__headers: include/uapi/linux/version.h scripts_basic asm-generic FORCE
$(Q)$(MAKE) $(build)=scripts build_unifdef
PHONY += headers_install_all
@@ -1175,7 +1175,7 @@ CLEAN_FILES += vmlinux System.map \
MRPROPER_DIRS += include/config usr/include include/generated \
arch/*/include/generated
MRPROPER_FILES += .config .config.old .version .old_version \
- include/linux/version.h \
+ include/uapi/linux/version.h \
Module.symvers tags TAGS cscope* GPATH GTAGS GRTAGS GSYMS
# clean - Delete most, but leave enough to build external modules
diff --git a/include/linux/Kbuild b/include/linux/Kbuild
index 619b565..fd48c91 100644
--- a/include/linux/Kbuild
+++ b/include/linux/Kbuild
@@ -19,7 +19,6 @@ header-y += netfilter_ipv6/
header-y += usb/
header-y += wimax/
-objhdr-y += version.h
ifneq ($(wildcard $(srctree)/arch/$(SRCARCH)/include/asm/a.out.h \
$(srctree)/include/asm-$(SRCARCH)/a.out.h \
diff --git a/include/uapi/linux/Kbuild b/include/uapi/linux/Kbuild
index 83e3600..ca80760 100644
--- a/include/uapi/linux/Kbuild
+++ b/include/uapi/linux/Kbuild
@@ -13,3 +13,6 @@ header-y += sunrpc/
header-y += netfilter/
header-y += usb/
header-y += wimax/
+
+objhdr-y += version.h
+
next prev parent reply other threads:[~2011-07-28 15:55 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-28 15:49 [PATCH 00/40] UAPI header file split [ver #3] David Howells
2011-07-28 15:49 ` [PATCH 01/40] UAPI: Add script to convert #include "..." to #include <path/...> in sys headers " David Howells
2011-07-28 15:49 ` [PATCH 02/40] UAPI: Convert #include "..." to #include <path/...> in kernel system " David Howells
2011-07-28 15:49 ` [PATCH 03/40] UAPI: Add script to audit drivers/gpu/ for #including system headers with "..." " David Howells
2011-07-28 15:49 ` [PATCH 04/40] UAPI: Convert #include "..." to #include <path/...> in kernel system headers " David Howells
2011-07-28 15:50 ` [PATCH 05/40] UAPI: Add include/uapi/ directories to build " David Howells
2011-07-28 15:50 ` [PATCH 06/40] UAPI: Differentiate userspace build and kernelspace build include path sets " David Howells
2011-07-28 15:50 ` [PATCH 07/40] UAPI: Fix AHZ multiple inclusion when __KERNEL__ is removed " David Howells
2011-07-28 15:50 ` [PATCH 08/40] UAPI: ac_etime in linux/acct.h must keep its __KERNEL__ guards " David Howells
2011-07-28 15:50 ` [PATCH 09/40] UAPI: Make linux/patchkey.h easier to parse " David Howells
2011-07-28 15:50 ` [PATCH 10/40] UAPI: Don't have a #elif clause in a __KERNEL__ guard in linux/soundcard.h " David Howells
2011-07-28 15:51 ` [PATCH 11/40] UAPI: Fix nested __KERNEL__ guards in video/edid.h " David Howells
2011-07-28 15:51 ` [PATCH 12/40] UAPI: Split trivial #if defined(__KERNEL__) && X conditionals " David Howells
2011-07-28 15:51 ` [PATCH 13/40] UAPI: Remove the inclusion of linux/types.h from x86's asm/page.h " David Howells
2011-07-28 15:51 ` [PATCH 14/40] UAPI: Fix definition of HZ in asm-generic/param.h " David Howells
2011-07-28 15:51 ` [PATCH 15/40] UAPI: elf_read_implies_exec() is a kernel-only feature - so hide from userspace " David Howells
2011-07-28 15:51 ` [PATCH 16/40] UAPI: Fix sigset_t ordering problem " David Howells
2011-07-28 15:52 ` [PATCH 17/40] UAPI: Fix E820_X_MAX " David Howells
2011-07-28 15:52 ` [PATCH 18/40] UAPI: Fix linux/netfilter.h inclusion order " David Howells
2011-07-28 15:52 ` [PATCH 19/40] UAPI: Fix linux/input.h " David Howells
2011-07-28 15:52 ` [PATCH 20/40] UAPI: Fix up linux/netfilter/xt_policy.h " David Howells
2011-07-28 15:52 ` [PATCH 21/40] UAPI: Fix linux/auto_fs.h inclusion order " David Howells
2011-07-28 15:52 ` [PATCH 22/40] UAPI: Fix drmP.h to use #include <...> when referring to system header files " David Howells
2011-07-28 15:53 ` [PATCH 23/40] UAPI: sound/sound_core.c should include linux/fs.h " David Howells
2011-07-28 15:53 ` [PATCH 24/40] UAPI: Fix SNDRV_*_ENDIAN ordering problem " David Howells
2011-07-28 15:53 ` [PATCH 25/40] UAPI: Fix u_quad_t ordering problem in linux/coda.h " David Howells
2011-07-28 15:53 ` [PATCH 26/40] UAPI: Fix " David Howells
2011-07-28 15:53 ` [PATCH 27/40] UAPI: Guard linux/isdn_divertif.h " David Howells
2011-07-28 15:53 ` [PATCH 28/40] UAPI: Guard linux/sound.h " David Howells
2011-07-28 15:53 ` [PATCH 29/40] UAPI: Fix linux/ncp.h " David Howells
2011-07-28 15:54 ` [PATCH 30/40] UAPI: Fix x86_64 system call count and generation " David Howells
2011-07-28 15:54 ` [PATCH 31/40] UAPI: Fix arch/mips/include/asm/Kbuild to have separate header-y lines " David Howells
2011-07-28 15:54 ` [PATCH 32/40] UAPI: Add a script to create a commit to set up new UAPI dirs " David Howells
2011-07-28 15:54 ` [PATCH 33/40] UAPI: Set up UAPI Kbuild files " David Howells
2011-07-28 15:54 ` [PATCH 34/40] UAPI: Plumb the UAPI Kbuilds into the user header handling system " David Howells
2011-07-28 15:54 ` [PATCH 35/40] UAPI: Set up uapi/asm/Kbuild.asm " David Howells
2011-07-28 15:55 ` David Howells [this message]
2011-07-28 15:55 ` [PATCH 37/40] UAPI: Make UAPI headers install to usr/include/ " David Howells
2011-07-28 15:55 ` [PATCH 38/40] UAPI: Fix the page-types query program in the docs " David Howells
2011-07-28 15:55 ` [PATCH 39/40] UAPI: Fix the x86 test_get_len tool " David Howells
2011-07-28 15:55 ` [PATCH 40/40] UAPI: Scripts to disintegrate header files " David Howells
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=20110728155502.16618.50189.stgit@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.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