From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6703379430489718784 X-Received: by 2002:a50:d0d6:: with SMTP id g22mr325790edf.250.1562269364088; Thu, 04 Jul 2019 12:42:44 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a50:9728:: with SMTP id c37ls2002805edb.12.gmail; Thu, 04 Jul 2019 12:42:43 -0700 (PDT) X-Google-Smtp-Source: APXvYqzcDl2LQidQycosnrEjBekp/xYiOYvWOpob0+fndfJVO8UcqCqGDsgM8zOOQBskKJWB/ctU X-Received: by 2002:a05:6402:1507:: with SMTP id f7mr338629edw.94.1562269363624; Thu, 04 Jul 2019 12:42:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562269363; cv=none; d=google.com; s=arc-20160816; b=cu9M973DPI+d4tJnfEHNYRu2WGgra4I9s0h2XJvbOC6NDYmNZEpj1RJZtOcJ9OBVXM Ib6WSQFvff5D7mTM6+WToirKAIC+3+JqrWF+CnrXryZXe8mwOvCETDP6bMP3aTPmpo+7 /8xRLiLLJPDYXuD7IphVfexlyodS8aC9DVPFpNBy/gs18JmTbrZ+TWs7GZgiu9RKwpWk Uz8NkQBVnv+y3IoqAyP8VL1sZGEbk0abKgKpsmSDAL19KKH8eLNylaWVNi60qrdDQcPk HglZgK5p2pBST3wmezF4JPrvGO9Vp+noHsEjv/avSTzWnHhI6H2TXaCBPakK0ZkXr7mO mqPQ== 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=B3nrKRABr21YJGNKi/1yUI5amCee3piU5KG2MmUR6Js=; b=AToJAbQU1HF8fvbXFM35BXAK5XB8X9Lo10oqHVXgwnOpDXAuD07SEYgsfnf68wiBvX 0X4A0NiIYIJ3eDZrZW6L+c35ljv/bRwIiHVAuG/IcBd9vVk96eUyrpKWH2TtIZfYLisf ZAVuQhsT7v0yfb1K5iGdWcx/PMqTS9hzVfo7Fc/EdD5cEdUCIjU+02aZs9DvT73a3Szq Pg+q5IFkomCdMIOiqY/X7HFrTQpDtFW222YyJs0Q0Vy4AjD5ZB59CFMCEEh0jMctxYVI VaKrFqHWyZou1tB910Q5WOkfvtA5MnsBsUc1YYA7anpYjj3PIUgq/HRLDut4SZ1dCknL MfyA== 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 a41si344954edc.5.2019.07.04.12.42.43 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jul 2019 12:42:43 -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 1hj7cu-0001QA-6l from Cedric_Hombourger@mentor.com ; Thu, 04 Jul 2019 12:42:40 -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; Thu, 4 Jul 2019 20:42:35 +0100 From: Cedric Hombourger To: CC: , , , , , , Cedric Hombourger Subject: [PATCH v2] builddeb: generate multi-arch friendly linux-libc-dev package Date: Thu, 4 Jul 2019 21:42:12 +0200 Message-ID: <1562269332-132-1-git-send-email-Cedric_Hombourger@mentor.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <0ff3202ced2b501d6045157f1c7b50810c0571e5.camel@decadent.org.uk> References: <0ff3202ced2b501d6045157f1c7b50810c0571e5.camel@decadent.org.uk> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: SVR-IES-MBX-03.mgc.mentorg.com (139.181.222.3) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) X-TUID: F6jd8p+ApPjN 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 --- 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: -- 2.11.0