linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] kbuild: Fix link to headers in 'make deb-pkg'
@ 2012-01-23 11:40 Joerg Roedel
  2012-01-23 16:17 ` Michal Marek
  0 siblings, 1 reply; 7+ messages in thread
From: Joerg Roedel @ 2012-01-23 11:40 UTC (permalink / raw)
  To: Michal Marek; +Cc: linux-kbuild, linux-kernel, Joerg Roedel

The Link to the kernel header files in the debian packages
point to the original build directory. This is a bad choice
if the packages were installed on a different machine. Fix
this in by manually re-creating the link in the builddeb
script.
With this patch applied the lib/modules/$version dir always
exists, so move the "$ARCH = um" check out of the modules
check too.

Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
---
 scripts/package/builddeb |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index f6cbc3d..46f63dc 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -91,6 +91,7 @@ fi
 rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir"
 mkdir -m 755 -p "$tmpdir/DEBIAN"
 mkdir -p  "$tmpdir/lib" "$tmpdir/boot" "$tmpdir/usr/share/doc/$packagename"
+mkdir -p  "$tmpdir/lib/modules/$version"
 mkdir -m 755 -p "$fwdir/DEBIAN"
 mkdir -p "$fwdir/lib" "$fwdir/usr/share/doc/$fwpackagename"
 mkdir -m 755 -p "$libc_headers_dir/DEBIAN"
@@ -121,10 +122,14 @@ fi
 
 if grep -q '^CONFIG_MODULES=y' .config ; then
 	INSTALL_MOD_PATH="$tmpdir" make KBUILD_SRC= modules_install
-	if [ "$ARCH" = "um" ] ; then
-		mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/"
-		rmdir "$tmpdir/lib/modules/$version"
-	fi
+fi
+
+# Make sure link to the headers is correct
+ln -snf "/usr/src/$kernel_headers_packagename" "$tmpdir/lib/modules/$version/build"
+
+if [ "$ARCH" = "um" ] ; then
+	mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/"
+	rmdir "$tmpdir/lib/modules/$version"
 fi
 
 make headers_check
-- 
1.7.5.4



^ permalink raw reply related	[flat|nested] 7+ messages in thread
* Re: [PATCH] kbuild: Fix link to headers in 'make deb-pkg'
  2012-01-23 11:40 [PATCH] kbuild: Fix link to headers in 'make deb-pkg' Joerg Roedel
@ 2012-01-23 16:17 ` Michal Marek
  2012-01-31 11:05   ` Joerg Roedel
  2012-02-04 14:34   ` maximilian attems
  0 siblings, 2 replies; 7+ messages in thread
From: Michal Marek @ 2012-01-23 16:17 UTC (permalink / raw)
  To: Joerg Roedel; +Cc: linux-kbuild, linux-kernel, maximilian attems

(adding max to CC)

On 23.1.2012 12:40, Joerg Roedel wrote:
> The Link to the kernel header files in the debian packages
> point to the original build directory. This is a bad choice
> if the packages were installed on a different machine. Fix
> this in by manually re-creating the link in the builddeb
> script.
> With this patch applied the lib/modules/$version dir always
> exists, so move the "$ARCH = um" check out of the modules
> check too.
> 
> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
> ---
>  scripts/package/builddeb |   13 +++++++++----
>  1 files changed, 9 insertions(+), 4 deletions(-)
> 
> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> index f6cbc3d..46f63dc 100644
> --- a/scripts/package/builddeb
> +++ b/scripts/package/builddeb
> @@ -91,6 +91,7 @@ fi
>  rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir"
>  mkdir -m 755 -p "$tmpdir/DEBIAN"
>  mkdir -p  "$tmpdir/lib" "$tmpdir/boot" "$tmpdir/usr/share/doc/$packagename"
> +mkdir -p  "$tmpdir/lib/modules/$version"
>  mkdir -m 755 -p "$fwdir/DEBIAN"
>  mkdir -p "$fwdir/lib" "$fwdir/usr/share/doc/$fwpackagename"
>  mkdir -m 755 -p "$libc_headers_dir/DEBIAN"
> @@ -121,10 +122,14 @@ fi
>  
>  if grep -q '^CONFIG_MODULES=y' .config ; then
>  	INSTALL_MOD_PATH="$tmpdir" make KBUILD_SRC= modules_install
> -	if [ "$ARCH" = "um" ] ; then
> -		mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/"
> -		rmdir "$tmpdir/lib/modules/$version"
> -	fi
> +fi
> +
> +# Make sure link to the headers is correct
> +ln -snf "/usr/src/$kernel_headers_packagename" "$tmpdir/lib/modules/$version/build"
> +
> +if [ "$ARCH" = "um" ] ; then
> +	mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/"
> +	rmdir "$tmpdir/lib/modules/$version"
>  fi
>  
>  make headers_check


^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] kbuild: Fix link to headers in 'make deb-pkg'
  2012-01-23 16:17 ` Michal Marek
@ 2012-01-31 11:05   ` Joerg Roedel
  2012-01-31 11:10     ` Michal Marek
  2012-02-04 14:34   ` maximilian attems
  1 sibling, 1 reply; 7+ messages in thread
From: Joerg Roedel @ 2012-01-31 11:05 UTC (permalink / raw)
  To: Michal Marek; +Cc: linux-kbuild, linux-kernel, maximilian attems

Hi,

any news on this?

On Mon, Jan 23, 2012 at 05:17:20PM +0100, Michal Marek wrote:
> (adding max to CC)
> 
> On 23.1.2012 12:40, Joerg Roedel wrote:
> > The Link to the kernel header files in the debian packages
> > point to the original build directory. This is a bad choice
> > if the packages were installed on a different machine. Fix
> > this in by manually re-creating the link in the builddeb
> > script.
> > With this patch applied the lib/modules/$version dir always
> > exists, so move the "$ARCH = um" check out of the modules
> > check too.
> > 
> > Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
> > ---
> >  scripts/package/builddeb |   13 +++++++++----
> >  1 files changed, 9 insertions(+), 4 deletions(-)
> > 
> > diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> > index f6cbc3d..46f63dc 100644
> > --- a/scripts/package/builddeb
> > +++ b/scripts/package/builddeb
> > @@ -91,6 +91,7 @@ fi
> >  rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir"
> >  mkdir -m 755 -p "$tmpdir/DEBIAN"
> >  mkdir -p  "$tmpdir/lib" "$tmpdir/boot" "$tmpdir/usr/share/doc/$packagename"
> > +mkdir -p  "$tmpdir/lib/modules/$version"
> >  mkdir -m 755 -p "$fwdir/DEBIAN"
> >  mkdir -p "$fwdir/lib" "$fwdir/usr/share/doc/$fwpackagename"
> >  mkdir -m 755 -p "$libc_headers_dir/DEBIAN"
> > @@ -121,10 +122,14 @@ fi
> >  
> >  if grep -q '^CONFIG_MODULES=y' .config ; then
> >  	INSTALL_MOD_PATH="$tmpdir" make KBUILD_SRC= modules_install
> > -	if [ "$ARCH" = "um" ] ; then
> > -		mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/"
> > -		rmdir "$tmpdir/lib/modules/$version"
> > -	fi
> > +fi
> > +
> > +# Make sure link to the headers is correct
> > +ln -snf "/usr/src/$kernel_headers_packagename" "$tmpdir/lib/modules/$version/build"
> > +
> > +if [ "$ARCH" = "um" ] ; then
> > +	mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/"
> > +	rmdir "$tmpdir/lib/modules/$version"
> >  fi
> >  
> >  make headers_check
> 

-- 
AMD Operating System Research Center

Advanced Micro Devices GmbH Einsteinring 24 85609 Dornach
General Managers: Alberto Bozzo
Registration: Dornach, Landkr. Muenchen; Registerger. Muenchen, HRB Nr. 43632


^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] kbuild: Fix link to headers in 'make deb-pkg'
  2012-01-31 11:05   ` Joerg Roedel
@ 2012-01-31 11:10     ` Michal Marek
  2012-01-31 11:27       ` Joerg Roedel
  0 siblings, 1 reply; 7+ messages in thread
From: Michal Marek @ 2012-01-31 11:10 UTC (permalink / raw)
  To: Joerg Roedel; +Cc: linux-kbuild, linux-kernel, maximilian attems

On 31.1.2012 12:05, Joerg Roedel wrote:
> Hi,
> 
> any news on this?

I know nothing about deb packaging, so I was hoping Max would comment.
But I'll try the patch myself later this week (I'm quite busy atm).

Michal
> 
> On Mon, Jan 23, 2012 at 05:17:20PM +0100, Michal Marek wrote:
>> (adding max to CC)
>>
>> On 23.1.2012 12:40, Joerg Roedel wrote:
>>> The Link to the kernel header files in the debian packages
>>> point to the original build directory. This is a bad choice
>>> if the packages were installed on a different machine. Fix
>>> this in by manually re-creating the link in the builddeb
>>> script.
>>> With this patch applied the lib/modules/$version dir always
>>> exists, so move the "$ARCH = um" check out of the modules
>>> check too.
>>>
>>> Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
>>> ---
>>>  scripts/package/builddeb |   13 +++++++++----
>>>  1 files changed, 9 insertions(+), 4 deletions(-)
>>>
>>> diff --git a/scripts/package/builddeb b/scripts/package/builddeb
>>> index f6cbc3d..46f63dc 100644
>>> --- a/scripts/package/builddeb
>>> +++ b/scripts/package/builddeb
>>> @@ -91,6 +91,7 @@ fi
>>>  rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir"
>>>  mkdir -m 755 -p "$tmpdir/DEBIAN"
>>>  mkdir -p  "$tmpdir/lib" "$tmpdir/boot" "$tmpdir/usr/share/doc/$packagename"
>>> +mkdir -p  "$tmpdir/lib/modules/$version"
>>>  mkdir -m 755 -p "$fwdir/DEBIAN"
>>>  mkdir -p "$fwdir/lib" "$fwdir/usr/share/doc/$fwpackagename"
>>>  mkdir -m 755 -p "$libc_headers_dir/DEBIAN"
>>> @@ -121,10 +122,14 @@ fi
>>>  
>>>  if grep -q '^CONFIG_MODULES=y' .config ; then
>>>  	INSTALL_MOD_PATH="$tmpdir" make KBUILD_SRC= modules_install
>>> -	if [ "$ARCH" = "um" ] ; then
>>> -		mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/"
>>> -		rmdir "$tmpdir/lib/modules/$version"
>>> -	fi
>>> +fi
>>> +
>>> +# Make sure link to the headers is correct
>>> +ln -snf "/usr/src/$kernel_headers_packagename" "$tmpdir/lib/modules/$version/build"
>>> +
>>> +if [ "$ARCH" = "um" ] ; then
>>> +	mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/"
>>> +	rmdir "$tmpdir/lib/modules/$version"
>>>  fi
>>>  
>>>  make headers_check
>>
> 


^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] kbuild: Fix link to headers in 'make deb-pkg'
  2012-01-31 11:10     ` Michal Marek
@ 2012-01-31 11:27       ` Joerg Roedel
  0 siblings, 0 replies; 7+ messages in thread
From: Joerg Roedel @ 2012-01-31 11:27 UTC (permalink / raw)
  To: Michal Marek; +Cc: linux-kbuild, linux-kernel, maximilian attems

On Tue, Jan 31, 2012 at 12:10:24PM +0100, Michal Marek wrote:
> On 31.1.2012 12:05, Joerg Roedel wrote:
> > Hi,
> > 
> > any news on this?
> 
> I know nothing about deb packaging, so I was hoping Max would comment.
> But I'll try the patch myself later this week (I'm quite busy atm).

Okay, thanks.


	Joerg

-- 
AMD Operating System Research Center

Advanced Micro Devices GmbH Einsteinring 24 85609 Dornach
General Managers: Alberto Bozzo
Registration: Dornach, Landkr. Muenchen; Registerger. Muenchen, HRB Nr. 43632


^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] kbuild: Fix link to headers in 'make deb-pkg'
  2012-01-23 16:17 ` Michal Marek
  2012-01-31 11:05   ` Joerg Roedel
@ 2012-02-04 14:34   ` maximilian attems
  2012-02-07 16:37     ` Ben Hutchings
  1 sibling, 1 reply; 7+ messages in thread
From: maximilian attems @ 2012-02-04 14:34 UTC (permalink / raw)
  To: Ben Hutchings
  Cc: Michal Marek, Joerg Roedel, linux-kbuild, linux-kernel, debian-kernel

adding bwh + debian-kernel

On Mon, 23 Jan 2012, Michal Marek wrote:

> (adding max to CC)
> 
> On 23.1.2012 12:40, Joerg Roedel wrote:
> > The Link to the kernel header files in the debian packages
> > point to the original build directory. This is a bad choice
> > if the packages were installed on a different machine. Fix
> > this in by manually re-creating the link in the builddeb
> > script.
> > With this patch applied the lib/modules/$version dir always
> > exists, so move the "$ARCH = um" check out of the modules
> > check too.
> > 
> > Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
> > ---
> >  scripts/package/builddeb |   13 +++++++++----
> >  1 files changed, 9 insertions(+), 4 deletions(-)
> > 
> > diff --git a/scripts/package/builddeb b/scripts/package/builddeb
> > index f6cbc3d..46f63dc 100644
> > --- a/scripts/package/builddeb
> > +++ b/scripts/package/builddeb
> > @@ -91,6 +91,7 @@ fi
> >  rm -rf "$tmpdir" "$fwdir" "$kernel_headers_dir" "$libc_headers_dir"
> >  mkdir -m 755 -p "$tmpdir/DEBIAN"
> >  mkdir -p  "$tmpdir/lib" "$tmpdir/boot" "$tmpdir/usr/share/doc/$packagename"
> > +mkdir -p  "$tmpdir/lib/modules/$version"
> >  mkdir -m 755 -p "$fwdir/DEBIAN"
> >  mkdir -p "$fwdir/lib" "$fwdir/usr/share/doc/$fwpackagename"
> >  mkdir -m 755 -p "$libc_headers_dir/DEBIAN"
> > @@ -121,10 +122,14 @@ fi
> >  
> >  if grep -q '^CONFIG_MODULES=y' .config ; then
> >  	INSTALL_MOD_PATH="$tmpdir" make KBUILD_SRC= modules_install
> > -	if [ "$ARCH" = "um" ] ; then
> > -		mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/"
> > -		rmdir "$tmpdir/lib/modules/$version"
> > -	fi
> > +fi
> > +
> > +# Make sure link to the headers is correct
> > +ln -snf "/usr/src/$kernel_headers_packagename" "$tmpdir/lib/modules/$version/build"
> > +
> > +if [ "$ARCH" = "um" ] ; then
> > +	mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/"
> > +	rmdir "$tmpdir/lib/modules/$version"
> >  fi
> >  
> >  make headers_check

I'm a bit sceptical that it is correct, but passing on to Ben Hutchings,
as I never used external modules. He did quite some cleanup in this
confusing area, lately for the upcoming debian release.

-- 
maks

^ permalink raw reply	[flat|nested] 7+ messages in thread
* Re: [PATCH] kbuild: Fix link to headers in 'make deb-pkg'
  2012-02-04 14:34   ` maximilian attems
@ 2012-02-07 16:37     ` Ben Hutchings
  0 siblings, 0 replies; 7+ messages in thread
From: Ben Hutchings @ 2012-02-07 16:37 UTC (permalink / raw)
  To: Michal Marek, Joerg Roedel, linux-kbuild, linux-kernel, debian-kernel

On Sat, Feb 04, 2012 at 03:34:49PM +0100, maximilian attems wrote:
> adding bwh + debian-kernel
> 
> On Mon, 23 Jan 2012, Michal Marek wrote:
> 
> > (adding max to CC)
> > 
> > On 23.1.2012 12:40, Joerg Roedel wrote:
> > > The Link to the kernel header files in the debian packages
> > > point to the original build directory. This is a bad choice
> > > if the packages were installed on a different machine. Fix
> > > this in by manually re-creating the link in the builddeb
> > > script.

Right, but:

[...]
> > > @@ -121,10 +122,14 @@ fi
> > >  
> > >  if grep -q '^CONFIG_MODULES=y' .config ; then
> > >  	INSTALL_MOD_PATH="$tmpdir" make KBUILD_SRC= modules_install
> > > -	if [ "$ARCH" = "um" ] ; then
> > > -		mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/"
> > > -		rmdir "$tmpdir/lib/modules/$version"
> > > -	fi
> > > +fi
> > > +
> > > +# Make sure link to the headers is correct
> > > +ln -snf "/usr/src/$kernel_headers_packagename" "$tmpdir/lib/modules/$version/build"
[...]

This should be removed from the kernel image package and created
in the kernel headers package instead, otherwise it's potentially a
broken link.

Ben.

-- 
Ben Hutchings
We get into the habit of living before acquiring the habit of thinking.
                                                              - Albert Camus

^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-02-07 16:37 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-23 11:40 [PATCH] kbuild: Fix link to headers in 'make deb-pkg' Joerg Roedel
2012-01-23 16:17 ` Michal Marek
2012-01-31 11:05   ` Joerg Roedel
2012-01-31 11:10     ` Michal Marek
2012-01-31 11:27       ` Joerg Roedel
2012-02-04 14:34   ` maximilian attems
2012-02-07 16:37     ` Ben Hutchings

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).