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.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS, 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 ED603C73C66 for ; Sun, 14 Jul 2019 07:49:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BB53F2064A for ; Sun, 14 Jul 2019 07:49:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728213AbfGNHtd (ORCPT ); Sun, 14 Jul 2019 03:49:33 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:56025 "EHLO relay1.mentorg.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726783AbfGNHtd (ORCPT ); Sun, 14 Jul 2019 03:49:33 -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 1hmZG9-0003Uy-HU from Cedric_Hombourger@mentor.com ; Sun, 14 Jul 2019 00:49:25 -0700 Received: from [172.30.65.245] (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; Sun, 14 Jul 2019 08:49:20 +0100 Subject: Re: [PATCH v4] builddeb: generate multi-arch friendly linux-libc-dev package To: Masahiro Yamada CC: Ben Hutchings , , Michal Marek , Linux Kbuild mailing list , Linux Kernel Mailing List , Riku Voipio References: <1562658215-186-1-git-send-email-Cedric_Hombourger@mentor.com> <1562658215-186-2-git-send-email-Cedric_Hombourger@mentor.com> From: Cedric Hombourger Message-ID: <39577168-2943-1be0-dffc-be9917ff70e0@mentor.com> Date: Sun, 14 Jul 2019 09:49:19 +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: 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-04.mgc.mentorg.com (139.181.222.4) 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 On 7/11/2019 4:46 PM, Masahiro Yamada wrote: > On Tue, Jul 9, 2019 at 4:44 PM 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 (stored in debian/arch). >> >> Signed-off-by: Cedric Hombourger >> --- >> scripts/package/builddeb | 5 +++++ >> scripts/package/mkdebian | 1 + >> 2 files changed, 6 insertions(+) >> >> diff --git a/scripts/package/builddeb b/scripts/package/builddeb >> index b03dd56a4782..d5d33bcba1fb 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//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 > > I just wondered whether there is something better than $(cat debian/arch), > but maybe not. > > OK, I am ready to pick it up for 5.3-rc1. > > With Ben's Ack, I would be able to proceed with more confident. Great thank you. Let me know if I can help clear any remaining concerns you may have > > > > >> # 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 >> -- >> 2.11.0 >> >