From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6703379430489718784 X-Received: by 2002:ac2:54a6:: with SMTP id w6mr202348lfk.108.1562272127852; Thu, 04 Jul 2019 13:28:47 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9643:: with SMTP id z3ls815188ljh.7.gmail; Thu, 04 Jul 2019 13:28:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqyg+aEeopU0ikHQ71NOIc4txFXDPaMLVINkBZ2szx2eFWCoOy3NF2mLnr2cwLGaxVluu6H4 X-Received: by 2002:a2e:9117:: with SMTP id m23mr37837ljg.134.1562272127115; Thu, 04 Jul 2019 13:28:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562272127; cv=none; d=google.com; s=arc-20160816; b=VVf3Ca3GTeHqkbLsOtQXpJkOuMVxSBLXstVxIAfcoz+KVKbA78PtGa+athp0vM/B5M dIF8c2l0GxsPvhskJrT7Ffxhm4n9c1540sdzpvHHh1AX4eUYq9WwXyJekxQAjE7ipNfk 4CGZBVYNv5FhBX2alXCe1zoBVKh1zjO2WdpFopZkOo4p1QfHqFneVsSmZbvioAoRzsJP w6MF0CWuwONh4cux5XKHAM3HoJcipkSTmCeI0ItI9tlU3C+By91B2OWRwkKGxVsQr7ok rnaBhsFwftRC4RJ4d23wPs37h3iN3vWVZq4uki2SekiZhhHj9bOUv8iz4I1JSn3NuLRB SMmA== 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=NPkEeEikJAobc9gcXdKZdrp6BUI8amNCyjdNEmAkoYg=; b=mzFaZmWkQimtG3qdB4erOePVHL6pjmCV18ew4KndMc4nO0PJr66tGrMSPJyj7U6UQj Q1AVp3Xcvr9wIgMt2VW/d+NnAm49NTCwbYQPl2Yt4ZvgQI7bAaBsJS/bpiomi6PWvizp +Agxg4Zkw1UFTB6+5xYw0ZL6bs5KweWbCBFLHbY4cQ1jq/t7hYGMswduOi6n0tB9lGUj Nrdg1hjtyNDGwgoOJPd4UvZTlSoXj3eEj93Mij+sn4aKT2yzmR3OXjCSNuu0ba3jDQOP 23UBpnBTf73IJqDyRI2tMk7uhqi70lB6XqjgO8PLPol8rbo3OnakBSUuzchN7XEqSntR mbBw== 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 q7si428595lji.5.2019.07.04.13.28.46 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jul 2019 13:28:46 -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 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) X-TUID: OVM7IBzxyf64 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: