diff options
| author | Joerg Roedel <joerg.roedel@amd.com> | 2012-02-15 17:38:26 +0100 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.cz> | 2012-02-24 23:54:29 +0100 |
| commit | a47b6c61f58ead0396b837c58a91d0681b775b40 (patch) | |
| tree | 1a278a08fcc05eaa1902abea3f32864a11c3c50c | |
| parent | f86d546bea349d5535738983544fdf16bcf5e6d8 (diff) | |
| download | linux-3.10-a47b6c61f58ead0396b837c58a91d0681b775b40.tar.gz linux-3.10-a47b6c61f58ead0396b837c58a91d0681b775b40.tar.bz2 linux-3.10-a47b6c61f58ead0396b837c58a91d0681b775b40.zip | |
kbuild: Fix link to headers in 'make deb-pkg'
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.
Cc: maximilian attems <max@stro.at>
Cc: debian-kernel@lists.debian.org
Cc: linux-kbuild@vger.kernel.org
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Reviewed-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Michal Marek <mmarek@suse.cz>
| -rw-r--r-- | scripts/package/builddeb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 3c6c0b14c80..39e3f30384e 100644 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -97,6 +97,7 @@ mkdir -m 755 -p "$libc_headers_dir/DEBIAN" mkdir -p "$libc_headers_dir/usr/share/doc/$libc_headers_packagename" mkdir -m 755 -p "$kernel_headers_dir/DEBIAN" mkdir -p "$kernel_headers_dir/usr/share/doc/$kernel_headers_packagename" +mkdir -p "$kernel_headers_dir/lib/modules/$version/" if [ "$ARCH" = "um" ] ; then mkdir -p "$tmpdir/usr/lib/uml/modules/$version" "$tmpdir/usr/bin" fi @@ -121,6 +122,8 @@ fi if grep -q '^CONFIG_MODULES=y' .config ; then INSTALL_MOD_PATH="$tmpdir" make KBUILD_SRC= modules_install + rm -f "$tmpdir/lib/modules/$version/build" + rm -f "$tmpdir/lib/modules/$version/source" if [ "$ARCH" = "um" ] ; then mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/" rmdir "$tmpdir/lib/modules/$version" @@ -245,6 +248,7 @@ destdir=$kernel_headers_dir/usr/src/linux-headers-$version mkdir -p "$destdir" (cd $srctree; tar -c -f - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -) (cd $objtree; tar -c -f - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; tar -xf -) +ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build" rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles" arch=$(dpkg --print-architecture) |