lkml.org 
[lkml]   [2011]   [Nov]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 1/8] kbuild: Add support for installing generated asm headers
    Date
    From: "H. Peter Anvin" <hpa@linux.intel.com>

    Generated asm headers are supposed to live in
    arch/*/include/generated/asm, but objhdr-y expect them to live in the
    same directory they are generated in. Instead of trying to cut that
    particular Gordian knot, introduce genhdr-y that takes this into
    account; the sole user of objhdr-y, linux/version.h, should be
    migrated over at some later date.

    Suggested-by: David Woodhouse <dwmw2@infradead.org>
    Acked-by: David Woodhouse <dwmw2@infradead.org>
    Cc: Sam Ravnborg <sam@ravnborg.org>
    Cc: Michal Marek <mmarek@suse.cz>
    Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
    ---
    scripts/Makefile.headersinst | 10 ++++++++--
    1 files changed, 8 insertions(+), 2 deletions(-)

    diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
    index a57f5bd..d3bae5e 100644
    --- a/scripts/Makefile.headersinst
    +++ b/scripts/Makefile.headersinst
    @@ -4,12 +4,16 @@
    # header-y - list files to be installed. They are preprocessed
    # to remove __KERNEL__ section of the file
    # objhdr-y - Same as header-y but for generated files
    +# genhdr-y - Same as objhdr-y but in a generated/ directory
    #
    # ==========================================================================

    # called may set destination dir (when installing to asm/)
    _dst := $(if $(dst),$(dst),$(obj))

    +# generated header directory
    +gen := $(if $(gen),$(gen),$(subst include/,include/generated/,$(obj)))
    +
    kbuild-file := $(srctree)/$(obj)/Kbuild
    include $(kbuild-file)

    @@ -33,9 +37,10 @@ wrapper-files := $(filter $(header-y), $(generic-y))

    # all headers files for this dir
    header-y := $(filter-out $(generic-y), $(header-y))
    -all-files := $(header-y) $(objhdr-y) $(wrapper-files)
    +all-files := $(header-y) $(objhdr-y) $(genhdr-y) $(wrapper-files)
    input-files := $(addprefix $(srctree)/$(obj)/,$(header-y)) \
    - $(addprefix $(objtree)/$(obj)/,$(objhdr-y))
    + $(addprefix $(objtree)/$(obj)/,$(objhdr-y)) \
    + $(addprefix $(objtree)/$(gen)/,$(genhdr-y))
    output-files := $(addprefix $(install)/, $(all-files))

    # Work out what needs to be removed
    @@ -52,6 +57,7 @@ quiet_cmd_install = INSTALL $(printdir) ($(words $(all-files))\
    cmd_install = \
    $(PERL) $< $(srctree)/$(obj) $(install) $(SRCARCH) $(header-y); \
    $(PERL) $< $(objtree)/$(obj) $(install) $(SRCARCH) $(objhdr-y); \
    + $(PERL) $< $(objtree)/$(gen) $(install) $(SRCARCH) $(genhdr-y); \
    for F in $(wrapper-files); do \
    echo "\#include <asm-generic/$$F>" > $(install)/$$F; \
    done; \
    --
    1.7.6.4


    \
     
     \ /
      Last update: 2011-11-17 23:39    [W:3.712 / U:0.808 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site