From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6703379430489718784 X-Received: by 2002:ac2:5bc7:: with SMTP id u7mr17065314lfn.167.1563342465015; Tue, 16 Jul 2019 22:47:45 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a19:8c0c:: with SMTP id o12ls1845802lfd.12.gmail; Tue, 16 Jul 2019 22:47:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqzHtnIRYPyHJBc08sGwarGW6LEZGjYShCrvyuJfhQJET28gLRlmufb4/e6+F0FGtWOd0Civ X-Received: by 2002:ac2:51a3:: with SMTP id f3mr16030215lfk.94.1563342464559; Tue, 16 Jul 2019 22:47:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563342464; cv=none; d=google.com; s=arc-20160816; b=A8f96rBmPMV/ctR+JsRVeHFeGNdERbtFgYQVf3LTF3tvXjfj6hK1vQZkOsB7pyquYp WAiEahRo4EIPa630DHTCRfiV71n6rBb+GwSbUFCwOGDWSVdr4Pz7dpqwFhOnuaGSJvEg ikJVt3or/Wa8739FTnqKWx1H7GjToZsIW88x7bNs4R+jBVioWL3WyjKBqozYE9EQ2kY2 xQXYrYr4sWJ8St4ahhOUMa+ggYXOvo44a4QKho7OKJsoWpVOdDNA7d4pvYjTQ6ubNHPG TDL4xlmGY1C392icWE9/HENFuUKmwFH6UzGUbF1xQzoYCSDVwlhuUMkd2veY6wEXTOfg 3gTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:from:date; bh=uFzG5Uxj3vh+hhCNow2882iLLBK3tHvUcWI5GzRZ2ow=; b=Bti8h2kkErV+vt2fCo4via0HYrsCw1SIVzZK6RmuQ5QNkITsZVMEnj6hIdyODTjeXI LBc5UrWH67SyuhwEtv+Lr46zHtmnA71Ry5Fqk9tz7Kyzz7m5+bHfgZC44KBwYWGFefW2 xk4PgA3dnYynI7VtN6oyPqmRXA16NgHlfTXIXGybsx8g9hlqgR+SR9gosumpyLv9JORn JQUF4cTtOVX+eJdAAqvTFnnuFgD7rTDLX/TAWVLnA1F0MyjHSJMtYe+jFJOZhxtHoWcd RpgZ1W5+yyxlWfBMX+xnXYIISvDX6iRWIQpjxlfojLMi4GQuNrjVd9QUXp9ACdMcYwg9 q7Qw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id q11si1207206ljg.2.2019.07.16.22.47.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 22:47:44 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id x6H5lhYm009406 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 Jul 2019 07:47:43 +0200 Received: from md1za8fc.ad001.siemens.net ([167.87.36.65]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id x6H5lhRU009051; Wed, 17 Jul 2019 07:47:43 +0200 Date: Wed, 17 Jul 2019 07:47:42 +0200 From: Henning Schild Cc: Cedric Hombourger , Subject: Re: [PATCH v4] builddeb: generate multi-arch friendly linux-libc-dev package Message-ID: <20190717074742.18a3be36@md1za8fc.ad001.siemens.net> In-Reply-To: References: <1562658215-186-1-git-send-email-Cedric_Hombourger@mentor.com> <1562658215-186-2-git-send-email-Cedric_Hombourger@mentor.com> X-Mailer: Claws Mail 3.17.3 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: P4ont+Pjkgf8 Am Thu, 11 Jul 2019 23:46:53 +0900 schrieb Masahiro Yamada : > 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. going Isar-only That looks like it will go in. Now would be the time to prepare putting it into Isar-core. I think the patch should be in filesdir of the custom kernel code and should be applied if PV < 5.2. The actual patch should of cause be the one that goes mainline, and the actual PV will depend on when it does. And we might have to carry backports of the patch, should it not apply all the way back to say 4.4 I assume the Isar-patch could hold a surprise or two, so starting it early could speed things up. Just keeping the magic in a layer and leaving Isar-core without the fix would not be ideal. Henning > > > > > > # 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 > > > >