From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6703379430489718784 X-Received: by 2002:a50:92c4:: with SMTP id l4mr650149eda.34.1562273452809; Thu, 04 Jul 2019 13:50:52 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:906:95a:: with SMTP id j26ls1683556ejd.14.gmail; Thu, 04 Jul 2019 13:50:52 -0700 (PDT) X-Google-Smtp-Source: APXvYqx5IjlpjPpETBKmfnKQdnK7FfctaNQXXSfAP4bWrlWx6Ti++BcBPJpPfNG3mdN9LDgTu7su X-Received: by 2002:a17:906:edcb:: with SMTP id sb11mr222149ejb.260.1562273452436; Thu, 04 Jul 2019 13:50:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562273452; cv=none; d=google.com; s=arc-20160816; b=p3yfgFvVAzAKwbE/8UUULL8qqRBHwwWcSaCxNsPl5BzngrlmyfrDE5lWp1QbyrMypx Kktn3ju8TjcUwh5I1AiPoZ/KkG8tgWyzCsiE8SGgNnbrNmjGQNOv2Yod7/wAoPsSjj3B joN0rr4dbuORJSosv+iLv2RVCnstL1RBz9B8DMaFjSH7434U8qO0BfHbxJtCDmbEgGFv 9J2eblSP8qBtvIj0MU3RLajN0v0ALD9ODsGeA2hcVPlasLXMisPdlpQL/QiuhVNKwer3 UJ1GrebMhPt/EnnouUHmd3t32FT18ckQA+WHTuVJKENjB5qbLiq95eFv0YeXHgqDSPxj d0Jg== 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=bgjD4f6vg+Zp9Aj5abcfe/ylFnvcI/EJn28dWl+B5lk=; b=uEc6LNtn8UamtcBYKF2WWUqa/wcrzZ6Gr++N/C8zYiDZ2XQhguWGpqR5MC4dCjUfDl ZTPEde7hsQZFKmlGbg6HnIkKjgbg8qUsxHT0vIU4/nB2slk3tiuGLYG0X4JWgGyq1BKC kns2edVMHml+UVDYbf0VlH5LlHYhWFGSQdFIp9CDOgSOpps0ZjI6oq2K85X8jeUVRneV lIuFn9E6BlFi2U70UQUWyB/RRm031g8SY2ldSVIwCkTq126mftJ8cfV7WH5jEScEh2rW FMgnyLB/kWp/wQNgF1YwAbeeFBWEpQ+V8h0Tb3kqzty62ykQzsR2rwLiQqerOUOWrRF5 nVWA== 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 k51si473760edd.0.2019.07.04.13.50.52 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Jul 2019 13:50:52 -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 1hj8gs-0006Im-Ui from Cedric_Hombourger@mentor.com ; Thu, 04 Jul 2019 13:50:50 -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 21:50:46 +0100 From: Cedric Hombourger To: CC: , , , , , , Cedric Hombourger Subject: [PATCH v3 1/1] builddeb: generate multi-arch friendly linux-libc-dev package Date: Thu, 4 Jul 2019 22:50:27 +0200 Message-ID: <1562273427-204-2-git-send-email-Cedric_Hombourger@mentor.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1562273427-204-1-git-send-email-Cedric_Hombourger@mentor.com> References: <432e997617a0669886cd9ea5ceac7c1a2173044b.camel@decadent.org.uk> <1562273427-204-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-02.mgc.mentorg.com (139.181.222.2) To svr-ies-mbx-02.mgc.mentorg.com (139.181.222.2) X-TUID: W/oQWumdDCbU 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 --- scripts/package/builddeb | 8 ++++++++ scripts/package/mkdebian | 5 +++-- 2 files changed, 11 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..2d670ae2cabc 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 @@ -212,11 +213,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