From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6703379430489718784 X-Received: by 2002:ac2:5c1d:: with SMTP id r29mr7990912lfp.72.1563090573297; Sun, 14 Jul 2019 00:49:33 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9d0c:: with SMTP id t12ls1581463lji.12.gmail; Sun, 14 Jul 2019 00:49:32 -0700 (PDT) X-Google-Smtp-Source: APXvYqzo69JZHVAXMm80s48B1nmSmTUGJXXLj3Z9EeMWCcpUSOlWFk79zIWKjTJxaJgDXrwy0sW1 X-Received: by 2002:a2e:9ac4:: with SMTP id p4mr10381002ljj.185.1563090572816; Sun, 14 Jul 2019 00:49:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563090572; cv=none; d=google.com; s=arc-20160816; b=S+b9Hv67LL06h1Y7G+NMhiOIMxjUuz1LN5V+BDTmwaX/cbDWPoXP+cZ7FdGTTTRB7h aZKmdGpjVr7CkhbCpYrbX45+wk27SlOfxPENoNvPucnDiOEvN8fyx00Dpvg3Kp6tA5Oj bAPK7ULqlqIUjp3bq36Zx6uryvynHXjGu7Yzw6gxtIi4fR746nYMakfJrQBgm+c9RPv9 lB5ShOd2XiK+zWWjKxfghE4424Is3C6HFUNsnNg35YqwoNQ9Dbt9qRUUrFU3nPev0XpK c0LkL+eVoruSQKSC27EJ5MrtrxEcIOmjkIeswz+GacsGoA4d6r0AWpMPQ36kxS/nMiYH 51sQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-language:content-transfer-encoding:in-reply-to:mime-version :user-agent:date:message-id:from:references:cc:to:subject; bh=9iAuhaKyAyPafuudlEB8YzTPgniJcpwWoUMNk9Ld2Po=; b=fW2Ez5vku7sSCIcqxZHbUqFeGXD3ttUTVYkMtqdpP3Gg+y7fEcBeJMckTaDule/pac t2wVpMpx3HjSYTJpUPwwz3106+prJaHg2j9wPl+RWuAQkZewHdMV74nBSD4VorOCoqpq HS29G9Xx+QjD4oi0RBaEermujD50wZf8Oj/ggJKGSyO5W5BVqd45BB2g6oq52fiQ+c66 OFjSPLGhogJn2r6DCAJvioBA/MkaX2IzdidWhXgzBWRq7g34PGwyTpK36ooquNtFP1Rw e0vPh5BrCPAKYSpAsHJtIiREhldGvua24yFYmIueb2mH4I2nG3Rh3b6x2yyox8DGmmQ8 zEsw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 192.94.38.131 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com Return-Path: Received: from relay1.mentorg.com (relay1.mentorg.com. [192.94.38.131]) by gmr-mx.google.com with ESMTPS id q7si869377lji.5.2019.07.14.00.49.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 14 Jul 2019 00:49:32 -0700 (PDT) Received-SPF: pass (google.com: domain of cedric_hombourger@mentor.com designates 192.94.38.131 as permitted sender) client-ip=192.94.38.131; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of cedric_hombourger@mentor.com designates 192.94.38.131 as permitted sender) smtp.mailfrom=Cedric_Hombourger@mentor.com 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) X-TUID: dEubf00ZQvkA 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 >> >