Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a47b6c61f58ead0396b837c58a91d0681b775b40

Authored by Joerg Roedel
Committed by Michal Marek
1 parent f86d546bea
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

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>

Showing 1 changed file with 4 additions and 0 deletions Side-by-side Diff

scripts/package/builddeb
Diff comments   View file @ a47b6c6
... ... @@ -97,6 +97,7 @@
97 97 mkdir -p "$libc_headers_dir/usr/share/doc/$libc_headers_packagename"
98 98 mkdir -m 755 -p "$kernel_headers_dir/DEBIAN"
99 99 mkdir -p "$kernel_headers_dir/usr/share/doc/$kernel_headers_packagename"
  100 +mkdir -p "$kernel_headers_dir/lib/modules/$version/"
100 101 if [ "$ARCH" = "um" ] ; then
101 102 mkdir -p "$tmpdir/usr/lib/uml/modules/$version" "$tmpdir/usr/bin"
102 103 fi
... ... @@ -121,6 +122,8 @@
121 122  
122 123 if grep -q '^CONFIG_MODULES=y' .config ; then
123 124 INSTALL_MOD_PATH="$tmpdir" make KBUILD_SRC= modules_install
  125 + rm -f "$tmpdir/lib/modules/$version/build"
  126 + rm -f "$tmpdir/lib/modules/$version/source"
124 127 if [ "$ARCH" = "um" ] ; then
125 128 mv "$tmpdir/lib/modules/$version"/* "$tmpdir/usr/lib/uml/modules/$version/"
126 129 rmdir "$tmpdir/lib/modules/$version"
... ... @@ -245,6 +248,7 @@
245 248 mkdir -p "$destdir"
246 249 (cd $srctree; tar -c -f - -T "$objtree/debian/hdrsrcfiles") | (cd $destdir; tar -xf -)
247 250 (cd $objtree; tar -c -f - -T "$objtree/debian/hdrobjfiles") | (cd $destdir; tar -xf -)
  251 +ln -sf "/usr/src/linux-headers-$version" "$kernel_headers_dir/lib/modules/$version/build"
248 252 rm -f "$objtree/debian/hdrsrcfiles" "$objtree/debian/hdrobjfiles"
249 253 arch=$(dpkg --print-architecture)
250 254