lkml.org 
[lkml]   [2011]   [May]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[Resend PATCH] package: Makefile: fix perf target bug
    Date
    From: matt mooney <mfm@muteddisk.com>

    Specify --git-dir and --work-tree when building perf targets to
    allow out-of-tree builds using O=<build-dir>.

    The cat command had to be changed to allow proper file name expansion
    of the files listed in MANIFEST.

    Signed-off-by: matt mooney <mfm@muteddisk.com>
    ---
    Hi Michal,

    Sorry if you have already received this, but there seems to have been
    a problem when it was first sent.

    Thanks,
    matt

    scripts/package/Makefile | 10 +++++++---
    1 files changed, 7 insertions(+), 3 deletions(-)

    diff --git a/scripts/package/Makefile b/scripts/package/Makefile
    index 1b7eaea..a32dc2d 100644
    --- a/scripts/package/Makefile
    +++ b/scripts/package/Makefile
    @@ -118,10 +118,14 @@ perf-tar=perf-$(KERNELVERSION)

    quiet_cmd_perf_tar = TAR
    cmd_perf_tar = \
    -git archive --prefix=$(perf-tar)/ HEAD^{tree} \
    - $$(cat $(srctree)/tools/perf/MANIFEST) -o $(perf-tar).tar; \
    +git --git-dir=$(srctree)/.git --work-tree=$(srctree) \
    + archive --prefix=$(perf-tar)/ HEAD^{tree} \
    + $(addprefix $(srctree)/, \
    + $(shell cat $(srctree)/tools/perf/MANIFEST)) \
    + -o $(perf-tar).tar; \
    mkdir -p $(perf-tar); \
    -git rev-parse HEAD > $(perf-tar)/HEAD; \
    +git --git-dir=$(srctree)/.git --work-tree=$(srctree) \
    + rev-parse HEAD > $(perf-tar)/HEAD; \
    tar rf $(perf-tar).tar $(perf-tar)/HEAD; \
    rm -r $(perf-tar); \
    $(if $(findstring tar-src,$@),, \
    --
    1.7.4.4


    \
     
     \ /
      Last update: 2011-05-12 20:29    [W:0.022 / U:61.420 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site