Debian-based distributions place libc header files in a machine
specific directory (/usr/include/<libc-machine>) instead of
/usr/include/asm to support installation of the linux-libc-dev
package from multiple architectures. Move headers installed by
"make headers_install" accordingly using Debian's tuple from
dpkg-architecture.
Signed-off-by: Cedric Hombourger <Cedric_Hombourger@xxxxxxxxxx>
---
scripts/package/builddeb | 8 ++++++++
scripts/package/mkdebian | 5 +++--
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index b03dd56a4782..15a034e18c37 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -132,6 +132,14 @@ fi
if [ "$ARCH" != "um" ]; then
$MAKE -f $srctree/Makefile headers_check
$MAKE -f $srctree/Makefile headers_install INSTALL_HDR_PATH="$libc_headers_dir/usr"
+ if [ -n "$debarch" ]; then
+ # move asm headers to /usr/include/<libc-machine>/asm to match the structure
+ # used by Debian-based distros (to support multi-arch) but only if ARCH was
+ # translated to Debian's (debarch) - this is done by mkdebian
+ host_arch=$(dpkg-architecture -a$debarch -qDEB_HOST_MULTIARCH)
+ mkdir $libc_headers_dir/usr/include/$host_arch
+ mv $libc_headers_dir/usr/include/asm $libc_headers_dir/usr/include/$host_arch/
+ fi
fi
# Install the maintainer scripts
diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
index 8351584cb24e..2d670ae2cabc 100755
--- a/scripts/package/mkdebian
+++ b/scripts/package/mkdebian
@@ -197,6 +197,7 @@ Architecture: $debarch
Description: Linux support headers for userspace development
This package provides userspaces headers from the Linux kernel. These headers
are used by the installed headers for GNU glibc and other system libraries.
+Multi-Arch: same
Package: $dbg_packagename
Section: debug
@@ -212,11 +213,11 @@ cat <<EOF > debian/rules
srctree ?= .
build:
- \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \
+ \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} debarch=${debarch} \
KBUILD_BUILD_VERSION=${revision} -f \$(srctree)/Makefile
binary-arch:
- \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} \
+ \$(MAKE) KERNELRELEASE=${version} ARCH=${ARCH} debarch=${debarch} \
KBUILD_BUILD_VERSION=${revision} -f \$(srctree)/Makefile intdeb-pkg
clean:
--
2.11.0
