All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] deb-pkg: Fix building outside of source tree (O=...).
@ 2011-01-24 13:41 Nicolas de Pesloüan
  2011-01-26  9:52 ` maximilian attems
  2011-02-02  9:34 ` Nicolas de Pesloüan
  0 siblings, 2 replies; 6+ messages in thread
From: Nicolas de Pesloüan @ 2011-01-24 13:41 UTC (permalink / raw)
  To: mmarek, linux-kbuild; +Cc: nicolas.2p.debian

When building linux-headers package using deb-pkg, builddeb erroneously assume
current directory is the source tree. This is not true if building in another
directory, using make O=... deb-pkg.

This patch fix this problem.

Signed-off-by: Nicolas de Pesloüan <nicolas.2p.debian@free.fr>
---
 scripts/package/builddeb |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index ebc6d6e..f6cbc3d 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -238,12 +238,12 @@ EOF
 fi
 
 # Build header package
-find . -name Makefile -o -name Kconfig\* -o -name \*.pl > /tmp/files$$
-find arch/$SRCARCH/include include scripts -type f >> /tmp/files$$
+(cd $srctree; find . -name Makefile -o -name Kconfig\* -o -name \*.pl > /tmp/files$$)
+(cd $srctree; find arch/$SRCARCH/include include scripts -type f >> /tmp/files$$)
 (cd $objtree; find .config Module.symvers include scripts -type f >> /tmp/objfiles$$)
 destdir=$kernel_headers_dir/usr/src/linux-headers-$version
 mkdir -p "$destdir"
-tar -c -f - -T /tmp/files$$ | (cd $destdir; tar -xf -)
+(cd $srctree; tar -c -f - -T /tmp/files$$) | (cd $destdir; tar -xf -)
 (cd $objtree; tar -c -f - -T /tmp/objfiles$$) | (cd $destdir; tar -xf -)
 rm -f /tmp/files$$ /tmp/objfiles$$
 arch=$(dpkg --print-architecture)
-- 
1.7.2.3


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* Re: [PATCH] deb-pkg: Fix building outside of source tree (O=...).
  2011-01-24 13:41 [PATCH] deb-pkg: Fix building outside of source tree (O=...) Nicolas de Pesloüan
@ 2011-01-26  9:52 ` maximilian attems
  2011-02-02  9:34 ` Nicolas de Pesloüan
  1 sibling, 0 replies; 6+ messages in thread
From: maximilian attems @ 2011-01-26  9:52 UTC (permalink / raw)
  To: Nicolas de Pesloüan; +Cc: mmarek, linux-kbuild

On Mon, 24 Jan 2011, Nicolas de Pesloüan wrote:

> When building linux-headers package using deb-pkg, builddeb erroneously assume
> current directory is the source tree. This is not true if building in another
> directory, using make O=... deb-pkg.
> 
> This patch fix this problem.
> 
> Signed-off-by: Nicolas de Pesloüan <nicolas.2p.debian@free.fr>

Acked-by: maximilian attems <max@stro.at>

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] deb-pkg: Fix building outside of source tree (O=...).
  2011-01-24 13:41 [PATCH] deb-pkg: Fix building outside of source tree (O=...) Nicolas de Pesloüan
  2011-01-26  9:52 ` maximilian attems
@ 2011-02-02  9:34 ` Nicolas de Pesloüan
  2011-02-02  9:51   ` maximilian attems
  1 sibling, 1 reply; 6+ messages in thread
From: Nicolas de Pesloüan @ 2011-02-02  9:34 UTC (permalink / raw)
  To: Michal Marek; +Cc: linux-kbuild, Nikolai Kondrashov, maximilian attems

Le 24/01/2011 14:41, Nicolas de Pesloüan a écrit :

Hi Michal,

Any troubles with my patch? I still don't find it in any branchs of 
git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git

It depends on commit 1b9a50d931a04ba007cc1a926fead3ff4b5afa9b, from Maximilian Attems, (in 
for-next), because it changes the same lines in scripts/package/builddeb.

But, as the problem it fixes cause make deb-pkg to fail, it might be pushed to rc-fixes... ?

Do you want me to rebase it on rc-fixes? (This would cause a future merge to fail when applying the 
patch from Maximilian, but...).

	Nicolas.

> When building linux-headers package using deb-pkg, builddeb erroneously assume
> current directory is the source tree. This is not true if building in another
> directory, using make O=... deb-pkg.
>
> This patch fix this problem.
>
> Signed-off-by: Nicolas de Pesloüan<nicolas.2p.debian@free.fr>

Tested-by: Nikolai Kondrashov <spbnick@gmail.com>
Acked-by: maximilian attems <max@stro.at>

> ---
>   scripts/package/builddeb |    6 +++---
>   1 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index ebc6d6e..f6cbc3d 100644
> --- a/scripts/package/builddeb
> +++ b/scripts/package/builddeb
> @@ -238,12 +238,12 @@ EOF
>   fi
>
>   # Build header package
> -find . -name Makefile -o -name Kconfig\* -o -name \*.pl>  /tmp/files$$
> -find arch/$SRCARCH/include include scripts -type f>>  /tmp/files$$
> +(cd $srctree; find . -name Makefile -o -name Kconfig\* -o -name \*.pl>  /tmp/files$$)
> +(cd $srctree; find arch/$SRCARCH/include include scripts -type f>>  /tmp/files$$)
>   (cd $objtree; find .config Module.symvers include scripts -type f>>  /tmp/objfiles$$)
>   destdir=$kernel_headers_dir/usr/src/linux-headers-$version
>   mkdir -p "$destdir"
> -tar -c -f - -T /tmp/files$$ | (cd $destdir; tar -xf -)
> +(cd $srctree; tar -c -f - -T /tmp/files$$) | (cd $destdir; tar -xf -)
>   (cd $objtree; tar -c -f - -T /tmp/objfiles$$) | (cd $destdir; tar -xf -)
>   rm -f /tmp/files$$ /tmp/objfiles$$
>   arch=$(dpkg --print-architecture)


^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] deb-pkg: Fix building outside of source tree (O=...).
  2011-02-02  9:34 ` Nicolas de Pesloüan
@ 2011-02-02  9:51   ` maximilian attems
  2011-02-04 14:12     ` Michal Marek
  0 siblings, 1 reply; 6+ messages in thread
From: maximilian attems @ 2011-02-02  9:51 UTC (permalink / raw)
  To: Michal Marek; +Cc: linux-kbuild, Nikolai Kondrashov, Nicolas de Pesloüan

Hello Michal,

On Wed, Feb 02, 2011 at 10:34:29AM +0100, Nicolas de Pesloüan wrote:
> Le 24/01/2011 14:41, Nicolas de Pesloüan a écrit :
>
> Hi Michal,
>
> Any troubles with my patch? I still don't find it in any branchs of  
> git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git
>
> It depends on commit 1b9a50d931a04ba007cc1a926fead3ff4b5afa9b, from 
> Maximilian Attems, (in for-next), because it changes the same lines in 
> scripts/package/builddeb.
>
> But, as the problem it fixes cause make deb-pkg to fail, it might be pushed to rc-fixes... ?
>
> Do you want me to rebase it on rc-fixes? (This would cause a future merge 
> to fail when applying the patch from Maximilian, but...).

Indeed it be cool to have those fixes landed for 2.6.38.

I was already a bit upset by your policy to root any deb-pkg
for the next release cycle (the umask fix for example).
Especially considering that the first one of aboves listed fixes
is a *oneliner*.

Without these 2 fixes it is hard to recommmend to our users to use deb-pkg.
They are needed for a working make deb-pkg in 2.6.38.

thank you

-- 
maks

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] deb-pkg: Fix building outside of source tree (O=...).
  2011-02-02  9:51   ` maximilian attems
@ 2011-02-04 14:12     ` Michal Marek
  0 siblings, 0 replies; 6+ messages in thread
From: Michal Marek @ 2011-02-04 14:12 UTC (permalink / raw)
  To: maximilian attems
  Cc: linux-kbuild, Nikolai Kondrashov, Nicolas de Pesloüan

On 2.2.2011 10:51, maximilian attems wrote:
> Hello Michal,
> 
> On Wed, Feb 02, 2011 at 10:34:29AM +0100, Nicolas de Pesloüan wrote:
>> Le 24/01/2011 14:41, Nicolas de Pesloüan a écrit :
>>
>> Hi Michal,
>>
>> Any troubles with my patch? I still don't find it in any branchs of  
>> git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6.git
>>
>> It depends on commit 1b9a50d931a04ba007cc1a926fead3ff4b5afa9b, from 
>> Maximilian Attems, (in for-next), because it changes the same lines in 
>> scripts/package/builddeb.
>>
>> But, as the problem it fixes cause make deb-pkg to fail, it might be pushed to rc-fixes... ?
>>
>> Do you want me to rebase it on rc-fixes? (This would cause a future merge 
>> to fail when applying the patch from Maximilian, but...).
> 
> Indeed it be cool to have those fixes landed for 2.6.38.
> 
> I was already a bit upset by your policy to root any deb-pkg
> for the next release cycle (the umask fix for example).
> Especially considering that the first one of aboves listed fixes
> is a *oneliner*.
> 
> Without these 2 fixes it is hard to recommmend to our users to use deb-pkg.
> They are needed for a working make deb-pkg in 2.6.38.

I applied the patch, merged into rc-fixes and will be sending it to
Linus soon (I have to go through the backlog to see if there are any
other urgent things).

Michal

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] deb-pkg: Fix building outside of source tree (O=...).
@ 2011-01-26  8:46 Nikolai Kondrashov
  0 siblings, 0 replies; 6+ messages in thread
From: Nikolai Kondrashov @ 2011-01-26  8:46 UTC (permalink / raw)
  To: Nicolas de Pesloüan; +Cc: linux-kbuild

> When building linux-headers package using deb-pkg, builddeb erroneously
> assume current directory is the source tree. This is not true if building
> in another directory, using make O=... deb-pkg.
>
> This patch fix this problem.
Thanks, Nicolas, it works!

This problem was holding me from testing my patches and I didn't have enough
time to find the fix myself.

FWIW,
Tested-by: Nikolai Kondrashov <spbnick@gmail.com>

Sincerely,
Nick

^ permalink raw reply	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2011-02-04 14:12 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-24 13:41 [PATCH] deb-pkg: Fix building outside of source tree (O=...) Nicolas de Pesloüan
2011-01-26  9:52 ` maximilian attems
2011-02-02  9:34 ` Nicolas de Pesloüan
2011-02-02  9:51   ` maximilian attems
2011-02-04 14:12     ` Michal Marek
2011-01-26  8:46 Nikolai Kondrashov

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.