Commit 3ced71d2 authored by Kevin Locke's avatar Kevin Locke Committed by Masahiro Yamada

kbuild: deb-pkg: set version for linux-headers paths

As a result of the switch to dh_listpackages, $version is no longer set
when install_kernel_headers() is called.  This causes files in the
linux-headers deb package to be installed to a path with an empty
$version (e.g. /usr/src/linux-headers-/scripts/sign-file rather than
/usr/src/linux-headers-6.3.0-rc3/scripts/sign-file).

To avoid this, while continuing to use the version information from
dh_listpackages, pass $version from $package as the second argument
of install_kernel_headers().

Fixes: 36862e14 ("kbuild: deb-pkg: use dh_listpackages to know enabled packages")
Signed-off-by: default avatarKevin Locke <kevin@kevinlocke.name>
Signed-off-by: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent e8d018dd
...@@ -162,6 +162,7 @@ install_linux_image_dbg () { ...@@ -162,6 +162,7 @@ install_linux_image_dbg () {
install_kernel_headers () { install_kernel_headers () {
pdir=$1 pdir=$1
version=$2
rm -rf $pdir rm -rf $pdir
...@@ -229,7 +230,7 @@ do ...@@ -229,7 +230,7 @@ do
linux-libc-dev) linux-libc-dev)
install_libc_headers debian/linux-libc-dev;; install_libc_headers debian/linux-libc-dev;;
linux-headers-*) linux-headers-*)
install_kernel_headers debian/linux-headers;; install_kernel_headers debian/linux-headers ${package#linux-headers-};;
esac esac
done done
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment