diff options
| author | Cedric Hombourger | 2019-07-09 09:43:35 +0200 |
|---|---|---|
| committer | Masahiro Yamada | 2019-07-17 03:25:10 +0200 |
| commit | 5a46421789f46165416d2b4834647b153c231c55 (patch) | |
| tree | 4dae6853dca3434db97c97840bca9e0c494139e8 /scripts | |
| parent | kconfig: run olddefconfig instead of oldconfig after merging fragments (diff) | |
| download | kernel-qcow2-linux-5a46421789f46165416d2b4834647b153c231c55.tar.gz kernel-qcow2-linux-5a46421789f46165416d2b4834647b153c231c55.tar.xz kernel-qcow2-linux-5a46421789f46165416d2b4834647b153c231c55.zip | |
builddeb: generate multi-arch friendly linux-libc-dev package
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 (stored in debian/arch).
Signed-off-by: Cedric Hombourger <Cedric_Hombourger@mentor.com>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/package/builddeb | 5 | ||||
| -rwxr-xr-x | scripts/package/mkdebian | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/scripts/package/builddeb b/scripts/package/builddeb index e8ca6dc97e96..c4c580f547ef 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -132,6 +132,11 @@ fi if [ "$ARCH" != "um" ]; then $MAKE -f $srctree/Makefile headers $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) + host_arch=$(dpkg-architecture -a$(cat debian/arch) -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 # Install the maintainer scripts diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index 8351584cb24e..e0750b70453f 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 |