builddeb: generate multi-arch friendly linux-libc-dev package (5a464217) · Commits · 戴 / test

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>

scripts/package/builddeb

+5 −0

Original line number	Diff line number	Diff line
		@@ -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

scripts/package/mkdebian

+1 −0

Original line number	Diff line number	Diff line
		@@ -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

Admin message