2010-06-01 10:29:15

by Michal Marek

[permalink] [raw]
Subject: Re: [PATCH v2 1/1] perf tools: Make target to generate self contained source tarball

On 1.6.2010 01:06, Arnaldo Carvalho de Melo wrote:
> Em Mon, May 31, 2010 at 10:11:24PM +0200, Michal Marek escreveu:
>> On 31.5.2010 19:42, Arnaldo Carvalho de Melo wrote:
>>> +git archive --prefix=$(perf-tar)/ HEAD^{tree} \
>>
>> If you use plain "HEAD" (a commit-ish) instead if HEAD^{tree}, then
>> git archive will store the commit id in the archive metadata and the
>> user can then use git get-tar-commit-id to extract it.
>
> I just used what was in git.git and then when talking with a git
> enthusiast, he showed me this:
>
> [acme@emilia git]$ git show 9cd625b79babaf50f50a0e5d96903eaacb1ee600
> commit 9cd625b79babaf50f50a0e5d96903eaacb1ee600
> Author: Rene Scharfe <[email protected]>
> Date: Sun Jun 18 15:25:33 2006 +0200
>
> Make release tarballs friendlier to older tar versions

...

Ah, ok.


> Well, what about the other aspects of the patch, is this the only issue
> you have found with it?

The patch is OK.

Acked-by: Michal Marek <[email protected]>

Michal


2010-06-04 17:36:15

by Arnaldo Carvalho de Melo

[permalink] [raw]
Subject: Re: [PATCH v2 1/1] perf tools: Make target to generate self contained source tarball

Em Tue, Jun 01, 2010 at 12:28:58PM +0200, Michal Marek escreveu:
> On 1.6.2010 01:06, Arnaldo Carvalho de Melo wrote:
> > Well, what about the other aspects of the patch, is this the only issue
> > you have found with it?
>
> The patch is OK.
>
> Acked-by: Michal Marek <[email protected]>

Argh, there was one last detail, so that we don't require that the
kernel be configured first, and as we don't use KERNELRELEASE at all in
the -src-pkg targets, would that be OK with you too?

[acme@emilia linux-2.6-tip]$ git diff Makefile
diff --git a/Makefile b/Makefile
index 0ab0c6f..6e186a1 100644
--- a/Makefile
+++ b/Makefile
@@ -1215,6 +1215,8 @@ distclean: mrproper
# rpm target kept for backward compatibility
package-dir := $(srctree)/scripts/package

+%src-pkg: FORCE
+ $(Q)$(MAKE) $(build)=$(package-dir) $@
%pkg: include/config/kernel.release FORCE
$(Q)$(MAKE) $(build)=$(package-dir) $@
rpm: include/config/kernel.release FORCE
[acme@emilia linux-2.6-tip]$

On a make mrproper'ed kernel we get:

a linux-2.6-tip]$ LANG= make perf-tarbz2-src-pkg
/bin/sh: include/config/kernel.release: No such file or directory
make: *** [include/config/kernel.release] Error 1
[acme@emilia linux-2.6-tip]$

:-\

If you're ok with it, I'll add it as a follow on patch that I'll send
via Ingo.

- Arnaldo

2010-06-07 10:11:19

by Michal Marek

[permalink] [raw]
Subject: Re: [PATCH v2 1/1] perf tools: Make target to generate self contained source tarball

On 4.6.2010 19:35, Arnaldo Carvalho de Melo wrote:
> Em Tue, Jun 01, 2010 at 12:28:58PM +0200, Michal Marek escreveu:
>> On 1.6.2010 01:06, Arnaldo Carvalho de Melo wrote:
>>> Well, what about the other aspects of the patch, is this the only issue
>>> you have found with it?
>>
>> The patch is OK.
>>
>> Acked-by: Michal Marek <[email protected]>
>
> Argh, there was one last detail, so that we don't require that the
> kernel be configured first, and as we don't use KERNELRELEASE at all in
> the -src-pkg targets, would that be OK with you too?
>
> [acme@emilia linux-2.6-tip]$ git diff Makefile
> diff --git a/Makefile b/Makefile
> index 0ab0c6f..6e186a1 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1215,6 +1215,8 @@ distclean: mrproper
> # rpm target kept for backward compatibility
> package-dir := $(srctree)/scripts/package
>
> +%src-pkg: FORCE
> + $(Q)$(MAKE) $(build)=$(package-dir) $@
> %pkg: include/config/kernel.release FORCE
> $(Q)$(MAKE) $(build)=$(package-dir) $@
> rpm: include/config/kernel.release FORCE
> [acme@emilia linux-2.6-tip]$
>
> On a make mrproper'ed kernel we get:
>
> a linux-2.6-tip]$ LANG= make perf-tarbz2-src-pkg
> /bin/sh: include/config/kernel.release: No such file or directory
> make: *** [include/config/kernel.release] Error 1
> [acme@emilia linux-2.6-tip]$
>
> :-\
>
> If you're ok with it, I'll add it as a follow on patch that I'll send
> via Ingo.

Looks ok to me, any future *-src-pkg target will also just package
sources and thus not depend on the configuration.

Acked-by: Michal Marek <[email protected]>

Michal