Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a47b6c61 authored by Joerg Roedel's avatar Joerg Roedel Committed by Michal Marek
Browse files

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: default avatarJoerg Roedel <joerg.roedel@amd.com>
Reviewed-by: default avatarBen Hutchings <ben@decadent.org.uk>
Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent f86d546b

scripts/package/builddeb

+4 −0
Original line number Diff line number Diff line
@@ -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)