From: Joerg Roedel <joerg.roedel@amd.com>
To: Michal Marek <mmarek@suse.cz>
Cc: <linux-kbuild@vger.kernel.org>, <linux-kernel@vger.kernel.org>,
maximilian attems <max@stro.at>
Subject: Re: [PATCH] kbuild: Fix link to headers in 'make deb-pkg'
Date: Tue, 31 Jan 2012 12:05:22 +0100 [thread overview]
Message-ID: <20120131110522.GA2191@amd.com> (raw)
In-Reply-To: <4F1D8810.1040501@suse.cz>
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
next prev parent reply other threads:[~2012-01-31 11:05 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120131110522.GA2191@amd.com \
--to=joerg.roedel@amd.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=max@stro.at \
--cc=mmarek@suse.cz \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).