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.

Signed-off-by: Cedric Hombourger <cedric_hombour...@mentor.com>
Reviewed-by: Henning Schild <henning.sch...@siemens.com>
---
 scripts/package/builddeb | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index b03dd56a4782..8f7afb3a84e9 100755
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -132,6 +132,11 @@ fi
 if [ "$ARCH" != "um" ]; then
        $MAKE -f $srctree/Makefile headers_check
        $MAKE -f $srctree/Makefile headers_install 
INSTALL_HDR_PATH="$libc_headers_dir/usr"
+       # move asm headers to /usr/include/<libc-machine>/asm to match the 
structure
+       # used by Debian-based distros (to support multi-arch)
+       libc_mach=$($CC -dumpmachine)
+       mkdir $libc_headers_dir/usr/include/$libc_mach
+       mv $libc_headers_dir/usr/include/asm 
$libc_headers_dir/usr/include/$libc_mach/
 fi
 
 # Install the maintainer scripts
-- 
2.11.0

Reply via email to