From: Cedric Hombourger <Cedric_Hombourger@mentor.com>
To: <ben@decadent.org.uk>
Cc: <yamada.masahiro@socionext.com>, <isar-users@googlegroups.com>,
<michal.lkml@markovi.net>, <linux-kbuild@vger.kernel.org>,
<linux-kernel@vger.kernel.org>, <riku.voipio@linaro.org>,
Cedric Hombourger <Cedric_Hombourger@mentor.com>
Subject: [PATCH v2] builddeb: generate multi-arch friendly linux-libc-dev package
Date: Thu, 4 Jul 2019 21:42:12 +0200 [thread overview]
Message-ID: <1562269332-132-1-git-send-email-Cedric_Hombourger@mentor.com> (raw)
In-Reply-To: <0ff3202ced2b501d6045157f1c7b50810c0571e5.camel@decadent.org.uk>
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@mentor.com>
Reviewed-by: Henning Schild <henning.schild@siemens.com>
Reviewed-by: Ben Hutchings <ben@decadent.org.uk>
---
scripts/package/builddeb | 8 ++++++++
scripts/package/mkdebian | 4 ++--
2 files changed, 10 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..8ebcb7d67fd2 100755
--- a/scripts/package/mkdebian
+++ b/scripts/package/mkdebian
@@ -212,11 +212,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
next prev parent reply other threads:[~2019-07-04 19:42 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-06-17 6:14 [PATCH] " Cedric Hombourger
2019-07-04 0:43 ` Masahiro Yamada
2019-07-04 12:39 ` Cedric Hombourger
2019-07-04 13:10 ` Ben Hutchings
2019-07-04 19:42 ` Cedric Hombourger [this message]
2019-07-04 19:49 ` [PATCH v2] " Ben Hutchings
2019-07-04 20:28 ` Cedric Hombourger
2019-07-04 20:50 ` [PATCH v3 0/1] builddeb: generate multi-arch friendly linux-libc-dev Cedric Hombourger
2019-07-04 20:50 ` [PATCH v3 1/1] builddeb: generate multi-arch friendly linux-libc-dev package Cedric Hombourger
2019-07-07 8:58 ` Masahiro Yamada
2019-07-09 7:43 ` [PATCH v4 0/1] builddeb: generate multi-arch friendly linux-libc-dev Cedric Hombourger
2019-07-09 7:43 ` [PATCH v4] builddeb: generate multi-arch friendly linux-libc-dev package Cedric Hombourger
2019-07-09 10:20 ` Enrico Weigelt, metux IT consult
2019-07-11 14:46 ` Masahiro Yamada
2019-07-14 7:49 ` Cedric Hombourger
2019-07-17 5:47 ` Henning Schild
2019-07-20 20:16 ` chombourger
2019-09-02 17:40 ` Jan Kiszka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1562269332-132-1-git-send-email-Cedric_Hombourger@mentor.com \
--to=cedric_hombourger@mentor.com \
--cc=ben@decadent.org.uk \
--cc=isar-users@googlegroups.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.lkml@markovi.net \
--cc=riku.voipio@linaro.org \
--cc=yamada.masahiro@socionext.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox