From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.5 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A988EC0651F for ; Thu, 4 Jul 2019 20:28:48 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 858EB2184C for ; Thu, 4 Jul 2019 20:28:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727276AbfGDU2r (ORCPT ); Thu, 4 Jul 2019 16:28:47 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:62709 "EHLO relay1.mentorg.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725865AbfGDU2q (ORCPT ); Thu, 4 Jul 2019 16:28:46 -0400 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=svr-ies-mbx-02.mgc.mentorg.com) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1hj8LT-0004wr-Tl from Cedric_Hombourger@mentor.com ; Thu, 04 Jul 2019 13:28:43 -0700 Received: from [172.30.65.44] (137.202.0.90) by svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Thu, 4 Jul 2019 21:28:39 +0100 Subject: Re: [PATCH v2] builddeb: generate multi-arch friendly linux-libc-dev package To: Ben Hutchings CC: , , , , , References: <0ff3202ced2b501d6045157f1c7b50810c0571e5.camel@decadent.org.uk> <1562269332-132-1-git-send-email-Cedric_Hombourger@mentor.com> <432e997617a0669886cd9ea5ceac7c1a2173044b.camel@decadent.org.uk> From: Cedric Hombourger Message-ID: Date: Thu, 4 Jul 2019 22:28:36 +0200 User-Agent: Mozilla/5.0 (Windows NT 10.0; WOW64; rv:60.0) Gecko/20100101 Thunderbird/60.7.2 MIME-Version: 1.0 In-Reply-To: <432e997617a0669886cd9ea5ceac7c1a2173044b.camel@decadent.org.uk> Content-Type: text/plain; charset="utf-8"; format=flowed Content-Transfer-Encoding: 7bit Content-Language: en-US X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-09.mgc.mentorg.com (139.181.222.9) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Greetings, On 7/4/2019 9:49 PM, Ben Hutchings wrote: > On Thu, 2019-07-04 at 21:42 +0200, Cedric Hombourger wrote: >> Debian-based distributions place libc header files in a machine >> specific directory (/usr/include/) 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 >> Reviewed-by: Henning Schild >> Reviewed-by: Ben Hutchings > I haven't reviewed this version of the patch. Sorry about that. it was just an awkward way to note your contribution to this changeset (for the avoidance of doubt, your feedback is greatly appreciated). I'll remove this line for v3 > And this doesn't make a multi-arch package; you will have to add a > field to the package's control file too. Will do. Thanks! Cedric > Ben. > >> --- >> 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//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 < 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: