From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44E95C0651F for ; Thu, 4 Jul 2019 19:42:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 214DB21738 for ; Thu, 4 Jul 2019 19:42:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727093AbfGDTmp (ORCPT ); Thu, 4 Jul 2019 15:42:45 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:61623 "EHLO relay1.mentorg.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726199AbfGDTmo (ORCPT ); Thu, 4 Jul 2019 15:42:44 -0400 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) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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