diff mbox

[v3] package: Makefile: fix perf target bug

Message ID b07e7ecdce48bc90a2cf83e8867494dae7cd174f.1305329845.git.mfm@muteddisk.com (mailing list archive)
State New, archived
Headers show

Commit Message

matt mooney May 13, 2011, 11:41 p.m. UTC
From: matt mooney <mfm@muteddisk.com>

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

The shell command in `git archive' had to be modified to allow proper
file name expansion of the files listed in MANIFEST.

Signed-off-by: matt mooney <mfm@muteddisk.com>
---
 scripts/package/Makefile |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

Comments

Arnaldo Carvalho de Melo May 15, 2011, 3:40 p.m. UTC | #1
Em Fri, May 13, 2011 at 04:41:12PM -0700, mfmooney@gmail.com escreveu:
> From: matt mooney <mfm@muteddisk.com>
> 
> Specify --git-dir when building perf targets to allow out-of-tree
> builds using O=<build-dir>.
> 
> The shell command in `git archive' had to be modified to allow proper
> file name expansion of the files listed in MANIFEST.
> 
> Signed-off-by: matt mooney <mfm@muteddisk.com>

Michal,

	Can I have your Reviewed-by or Acked-by for this one? Assuming
all is ok by now :)

- Arnaldo
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Michal Marek May 16, 2011, 8:19 a.m. UTC | #2
On 15.5.2011 17:40, Arnaldo Carvalho de Melo wrote:
> Em Fri, May 13, 2011 at 04:41:12PM -0700, mfmooney@gmail.com escreveu:
>> From: matt mooney<mfm@muteddisk.com>
>>
>> Specify --git-dir when building perf targets to allow out-of-tree
>> builds using O=<build-dir>.
>>
>> The shell command in `git archive' had to be modified to allow proper
>> file name expansion of the files listed in MANIFEST.
>>
>> Signed-off-by: matt mooney<mfm@muteddisk.com>
>
> Michal,
>
> 	Can I have your Reviewed-by or Acked-by for this one? Assuming
> all is ok by now :)

Reviewed-by: Michal Marek <mmarek@suse.cz>

Michal
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
matt mooney June 12, 2011, 6:19 p.m. UTC | #3
On Mon, May 16, 2011 at 1:19 AM, Michal Marek <mmarek@suse.cz> wrote:
> On 15.5.2011 17:40, Arnaldo Carvalho de Melo wrote:
>>
>> Em Fri, May 13, 2011 at 04:41:12PM -0700, mfmooney@gmail.com escreveu:
>>>
>>> From: matt mooney<mfm@muteddisk.com>
>>>
>>> Specify --git-dir when building perf targets to allow out-of-tree
>>> builds using O=<build-dir>.
>>>
>>> The shell command in `git archive' had to be modified to allow proper
>>> file name expansion of the files listed in MANIFEST.
>>>
>>> Signed-off-by: matt mooney<mfm@muteddisk.com>
>>
>> Michal,
>>
>>        Can I have your Reviewed-by or Acked-by for this one? Assuming
>> all is ok by now :)
>
> Reviewed-by: Michal Marek <mmarek@suse.cz>

I do not believe this patch ever got picked up!

Thanks,
matt
Michal Marek June 24, 2011, 1:22 p.m. UTC | #4
On 12.6.2011 20:19, matt mooney wrote:
> On Mon, May 16, 2011 at 1:19 AM, Michal Marek<mmarek@suse.cz>  wrote:
>> On 15.5.2011 17:40, Arnaldo Carvalho de Melo wrote:
>>>
>>> Em Fri, May 13, 2011 at 04:41:12PM -0700, mfmooney@gmail.com escreveu:
>>>>
>>>> From: matt mooney<mfm@muteddisk.com>
>>>>
>>>> Specify --git-dir when building perf targets to allow out-of-tree
>>>> builds using O=<build-dir>.
>>>>
>>>> The shell command in `git archive' had to be modified to allow proper
>>>> file name expansion of the files listed in MANIFEST.
>>>>
>>>> Signed-off-by: matt mooney<mfm@muteddisk.com>
>>>
>>> Michal,
>>>
>>>         Can I have your Reviewed-by or Acked-by for this one? Assuming
>>> all is ok by now :)
>>
>> Reviewed-by: Michal Marek<mmarek@suse.cz>
>
> I do not believe this patch ever got picked up!

I thought that Arnaldo will take it. I pushed it to 
kbuild-2.6.git#packaging now.

Michal
--
To unsubscribe from this list: send the line "unsubscribe linux-kbuild" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index 1b7eaea..03df8ee 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -118,10 +118,12 @@  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 archive --prefix=$(perf-tar)/         \
+	HEAD^{tree} $$(cd $(srctree);                               \
+		       echo $$(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 rev-parse HEAD > $(perf-tar)/HEAD;    \
 tar rf $(perf-tar).tar $(perf-tar)/HEAD;                            \
 rm -r $(perf-tar);                                                  \
 $(if $(findstring tar-src,$@),,                                     \