From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6703379430489718784 X-Received: by 2002:a67:8709:: with SMTP id j9mr4996464vsd.35.1562856466027; Thu, 11 Jul 2019 07:47:46 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1f:dcc:: with SMTP id 195ls279209vkn.3.gmail; Thu, 11 Jul 2019 07:47:45 -0700 (PDT) X-Google-Smtp-Source: APXvYqyIXBEtXYDhLX2elhOVKtka7x+DEei7XpmDoNQfk7ZG4PzH4B54nO10IRDg5WSbq83UVjAd X-Received: by 2002:a1f:6045:: with SMTP id u66mr3582834vkb.54.1562856465495; Thu, 11 Jul 2019 07:47:45 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562856465; cv=none; d=google.com; s=arc-20160816; b=0Z2Q6MBCQZ04K5vf1VUQiikDpJOTU2EbyCe70aqQ3yAPxp/IsY0OGveedH6JS10U09 PEfstE3ErByjWtdqqp6rgQR52tdMhwxVRNaTjGXmjvddpp5QCM+/71j0HBdITJMpdG4p PWMiSDN/gf6ppAUmo2jLNJmVAYsm3ZZ0I+7OkNQaDrt7LVRSd6opPYyzLkLQ8r004oZw JJcZTgj+UwlMpzGAcW9wvIazxfXPUG6wircLxa9YkRITyRIZcTtz+aRA4b944NXz41L/ ZO5AkORv8GLRkLAV9QmfhVskZf24u8zyRLZXE5hKUrA7zb1pSiGBBWWSa9UMHUN+YXZg Noyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:dkim-signature:dkim-filter; bh=EwkM6hP5mYLjLP96oegoqHkOffiCdJOnzuhs8GEmfIo=; b=cQ+a3JjaLM1PJk00Oc9K92yIlsF5/9iPNf3MzXO+LvT1ie2xAsm5y9SQ4xtD7zf2DB G5zlBFgGlzBHMsy2vcs0i4c8DvxL6GKQyq1pzWzpF5VZEIt6pO1+UcOvu+x9zBhIH/sI gp+IvtuyJ+KcCFcRud/AgxdCaxOmo8FOxWY6EDR53UjCnOi8WJAozyS65f1NLXRH10s/ nBDk/11DhQucZ0LQMdFd5A8A3FXWuqtV2lRwx9e9WnJOwivfaA7Cu9/S4Tjc62MIwtYL EnK+ZyN8sugMzlBeNEcpqzQ/2rSUm9NSEmJyOcVJzVTJoHHachHjtZZQATfN+niMHZTd 4NRA== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=vYH5WqfM; spf=softfail (google.com: domain of transitioning yamada.masahiro@socionext.com does not designate 210.131.2.81 as permitted sender) smtp.mailfrom=yamada.masahiro@socionext.com Return-Path: Received: from conssluserg-02.nifty.com (conssluserg-02.nifty.com. [210.131.2.81]) by gmr-mx.google.com with ESMTPS id z67si279223vsb.1.2019.07.11.07.47.44 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jul 2019 07:47:45 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning yamada.masahiro@socionext.com does not designate 210.131.2.81 as permitted sender) client-ip=210.131.2.81; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=vYH5WqfM; spf=softfail (google.com: domain of transitioning yamada.masahiro@socionext.com does not designate 210.131.2.81 as permitted sender) smtp.mailfrom=yamada.masahiro@socionext.com Received: from mail-ua1-f45.google.com (mail-ua1-f45.google.com [209.85.222.45]) (authenticated) by conssluserg-02.nifty.com with ESMTP id x6BElTl7004615 for ; Thu, 11 Jul 2019 23:47:30 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-02.nifty.com x6BElTl7004615 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1562856450; bh=EwkM6hP5mYLjLP96oegoqHkOffiCdJOnzuhs8GEmfIo=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=vYH5WqfMtr5ADdkJ79DfEPGlslaZKJ3GkAXoH65HBoG2+CKf69K17AyvjxeqvVd6q IBxkK6KG6WGei5L4a98XyebK68VAwketoC9BJ30tPDuTArKKxp4cn4vL7SCG4nf62L CbM0d3eQ+tY1WzEqxx3CGD/uix9cJcLTM/3xIiLGU3oqwLFnvri3msnWz6RIHEghZJ yQsFxnkDRAGrd5nEqcgVWTV0OmrUzVE4vcCB12wjrGcI1ODGLrWEeKgR99GhBm77dv uApBdtZ0zSCXQxP5FqNjeCHw+hc18MHgK4pfINhbpI0dgE9H4VbFkxzXUG57aIvYyh mqkf9D9cSQNkg== X-Nifty-SrcIP: [209.85.222.45] Received: by mail-ua1-f45.google.com with SMTP id s4so2586160uad.7 for ; Thu, 11 Jul 2019 07:47:30 -0700 (PDT) X-Gm-Message-State: APjAAAWs0StE0+vMcfz9WKjXeu94aLz8W4Mw81yfTLgsL/pPc9ehPU/8 tIlPpW2DIGPn/CsQ/hw/eiP09yDtLlGLKI9uDeA= X-Received: by 2002:a9f:25e9:: with SMTP id 96mr4826461uaf.95.1562856449235; Thu, 11 Jul 2019 07:47:29 -0700 (PDT) MIME-Version: 1.0 References: <1562658215-186-1-git-send-email-Cedric_Hombourger@mentor.com> <1562658215-186-2-git-send-email-Cedric_Hombourger@mentor.com> In-Reply-To: <1562658215-186-2-git-send-email-Cedric_Hombourger@mentor.com> From: Masahiro Yamada Date: Thu, 11 Jul 2019 23:46:53 +0900 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v4] builddeb: generate multi-arch friendly linux-libc-dev package To: Cedric Hombourger Cc: Ben Hutchings , isar-users@googlegroups.com, Michal Marek , Linux Kbuild mailing list , Linux Kernel Mailing List , Riku Voipio Content-Type: text/plain; charset="UTF-8" X-TUID: HEYFHYyqnEro 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. > # 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 > -- Best Regards Masahiro Yamada