From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6703379430489718784 X-Received: by 2002:a1c:c542:: with SMTP id v63mr20097944wmf.97.1562658239114; Tue, 09 Jul 2019 00:43:59 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:c34f:: with SMTP id l15ls666434wmj.4.gmail; Tue, 09 Jul 2019 00:43:58 -0700 (PDT) X-Google-Smtp-Source: APXvYqw/NoNHnNOj8VsuqiHfjviMCdsajDoeUcnIYdcacs5PFB+dlfvBhb3vB357SZgxF9xOco7m X-Received: by 2002:a1c:cf0b:: with SMTP id f11mr21328941wmg.138.1562658238709; Tue, 09 Jul 2019 00:43:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562658238; cv=none; d=google.com; s=arc-20160816; b=uIVJPtweIdCsI1rU+u0fWv//TASIOD43hSUPdxAAh9C0TD+dVnaHLSqkfZaMx7BOas AAnxt5PBzQKXuJJwePNUP90COtDSUlRhxnc+VM/qaQDUgv/LqIKIp9waX9EweJTplTRZ NmoZI02NrlRVoUv1tn/vedMergPfRcNfG9OxzImrX2QEmCRg0rH85CzgR/GzdCve/wtl 63B2VqAVc0QDdB5lDiYFogPW/cISbbuob9GDQhQ4EQQejJ2lCtKQStqw63cVhB5TVnwT gwtdw++mg+gicndNSd+lyyAN3/sD/THHRVN0tQy+KasZQ20Qwj6yUqlQVnCr39EaKs2Y CKaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:references:in-reply-to:message-id:date:subject:cc:to :from; bh=K+9Qilpb1a2vlC9Yh0Xd2i1fFJy7A9HivdV+5j8B/Aw=; b=YLiFRdVQY5oGiBfFTh8W5nJGZohW6G6rCQDsZBYHsO0W9o3YWt3++7Xlxn00NqBNfP R79b/FQb2YkW1R5NcDSEx+GUmabmJhosEcQmmb0988QgOKXQlXistSTOceAdhQVh0wmJ 4j8igogWmpOfLkfGW/yLp2qT0xMFGBhoU4DaelemeEL/CAJ01CiUdNK/NxXC6d4Ww5+m ZxBivZsXlTP46/1XYqc37maCFIWoJyxjm6rE8bPVnj4z5KBRnI57IdXwztnGoNAoUEeU oA86GL3g5H/ug0yrsTFRok48WkNHr1FqTcSNJaC6kj83s/DpQPnMuQaE2jxDlrPDyf3s Pduw== 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 u18si1086146wri.5.2019.07.09.00.43.58 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 Jul 2019 00:43:58 -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 1hkkn7-0004Jq-G3 from Cedric_Hombourger@mentor.com ; Tue, 09 Jul 2019 00:43:57 -0700 Received: from FRG-W10-HOMBOUR.world.mentorg.com (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; Tue, 9 Jul 2019 08:43:52 +0100 From: Cedric Hombourger To: CC: , , , , , , Cedric Hombourger Subject: [PATCH v4] builddeb: generate multi-arch friendly linux-libc-dev package Date: Tue, 9 Jul 2019 09:43:35 +0200 Message-ID: <1562658215-186-2-git-send-email-Cedric_Hombourger@mentor.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1562658215-186-1-git-send-email-Cedric_Hombourger@mentor.com> References: <1562658215-186-1-git-send-email-Cedric_Hombourger@mentor.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) X-TUID: ewWQm1TEIllw 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 # 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