From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6703379430489718784 X-Received: by 2002:ab0:69c8:: with SMTP id u8mr924806uaq.132.1562489960174; Sun, 07 Jul 2019 01:59:20 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a67:6844:: with SMTP id d65ls1004204vsc.9.gmail; Sun, 07 Jul 2019 01:59:19 -0700 (PDT) X-Google-Smtp-Source: APXvYqztu5pf3upeM+HnprpITgdfv681zmygcV+aEvc6BYOb4E6dRdXG9VmfBdFpNldZdEXCHe2G X-Received: by 2002:a67:eed3:: with SMTP id o19mr6599225vsp.225.1562489959943; Sun, 07 Jul 2019 01:59:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562489959; cv=none; d=google.com; s=arc-20160816; b=Sxhh2YLKqpivfi3cNK15i3ljRc8u3ryI/WpzofNxonY4gsML1Ea02wASiRsA57gL/h qGpG4KZk4IkVhRXv2wJek8/QqlbDeQ3klNRn1sZRfGn+tUsrNkElH4+mqIK9B0M5pnor pcaOBlNAH+7u5ZdGVAQNsJVW8zmbTRn0BHq0yXwKCgZQ1oJqwIA9C8oEL5hOieMLm57h qhb3ZZq0ifNJRhCkUw3utb32+ghlegqz0Gr4EuemnyYmL8qVsQFvTwfrbe0I9sT/ZJgb 8hTrv7i4wgKvni6gDFTY4/0ACWwT4KniM1V+X0O9no7JVtShE6r0zDJoI4IuDn05TLVG 02Xw== 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=xk4LHRkB8ixAzgbpnPm6KlgGAQsfjqajmImCBvj8dwU=; b=KQundesSEffgTDw+Somblbp8ijaIefMzukVkOSZkSKP6XCOgHnIYY/wH6/fC3qtNAp VvSQfvq3WhUrvOKorAjFIUbQ2yIMXzflpTqt49JIYK1q2LfueLkOJkjtFw+SKdyC8hvR EEeSim5gOlHR7cRjRodVdq5/HmaADqhKMLLTLCAlc3+QGtygKrL1LWPpJMjDfe4xAyUd YeuLGMGY6pkZX0gTxQjC4zPQL1JoaqxjW6WUpIrwUPbvJsokNTsBQ/XEusTtN2WbiNTt nOkOpoklOwiglnuGTaAqF3TDcODvO2ynJcjsRWkTvnvTQBiW/LO1U/8ZIahnN5f/V7YM M2Iw== ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=owwxfN2p; spf=softfail (google.com: domain of transitioning yamada.masahiro@socionext.com does not designate 210.131.2.91 as permitted sender) smtp.mailfrom=yamada.masahiro@socionext.com Return-Path: Received: from conssluserg-06.nifty.com (conssluserg-06.nifty.com. [210.131.2.91]) by gmr-mx.google.com with ESMTPS id k125si353816vkh.4.2019.07.07.01.59.19 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 07 Jul 2019 01:59:19 -0700 (PDT) Received-SPF: softfail (google.com: domain of transitioning yamada.masahiro@socionext.com does not designate 210.131.2.91 as permitted sender) client-ip=210.131.2.91; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@nifty.com header.s=dec2015msa header.b=owwxfN2p; spf=softfail (google.com: domain of transitioning yamada.masahiro@socionext.com does not designate 210.131.2.91 as permitted sender) smtp.mailfrom=yamada.masahiro@socionext.com Received: from mail-vs1-f52.google.com (mail-vs1-f52.google.com [209.85.217.52]) (authenticated) by conssluserg-06.nifty.com with ESMTP id x678wqrJ017965 for ; Sun, 7 Jul 2019 17:58:52 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conssluserg-06.nifty.com x678wqrJ017965 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1562489932; bh=xk4LHRkB8ixAzgbpnPm6KlgGAQsfjqajmImCBvj8dwU=; h=References:In-Reply-To:From:Date:Subject:To:Cc:From; b=owwxfN2pm96CrSazFBkehDrBycCUnIAoXNn5ewieSocEquAp8cm673ZPfeFndsJBN wIFyAHemJ+2aXjrAIkhCk8axZ+xR9HjhCRCoxRsbCEJzAMnr3eXp50plhVyuwnNwn/ lW4rfjaq6VH10c4vwWloqIL3ILFI6JEeyJBrSdyh5ZieoRWXkaLGciQflzgdNGD7f7 OuJKv01NtDG66SC6ZPg7YrZsnlrfglnrUmtTAAscBeUiZtnwrDWaaDVWVxdUodTDZG iMdzqL0E7lYB0noqmD/dAjumpSGonVvUTFnKSm+YfBSXO/PVoMIk2jk8je8BDnP1KK pZPiU2pgFPqKA== X-Nifty-SrcIP: [209.85.217.52] Received: by mail-vs1-f52.google.com with SMTP id v6so6335543vsq.4 for ; Sun, 07 Jul 2019 01:58:52 -0700 (PDT) X-Gm-Message-State: APjAAAVRkh7swOWonHVadbu3BTfLecFhuiVzHfq/b6fA0JfvUsW67/Dn ncUb8mIEF8e/T6mHvcfo/qS4w1fxYPz1bKjXyWI= X-Received: by 2002:a67:cd1a:: with SMTP id u26mr6543185vsl.155.1562489931301; Sun, 07 Jul 2019 01:58:51 -0700 (PDT) MIME-Version: 1.0 References: <432e997617a0669886cd9ea5ceac7c1a2173044b.camel@decadent.org.uk> <1562273427-204-1-git-send-email-Cedric_Hombourger@mentor.com> <1562273427-204-2-git-send-email-Cedric_Hombourger@mentor.com> In-Reply-To: <1562273427-204-2-git-send-email-Cedric_Hombourger@mentor.com> From: Masahiro Yamada Date: Sun, 7 Jul 2019 17:58:15 +0900 X-Gmail-Original-Message-ID: Message-ID: Subject: Re: [PATCH v3 1/1] 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: UkjggXLqEMJT On Fri, Jul 5, 2019 at 5:50 AM 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. > > 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 Is there any smarter way (any command) to get debarch from the builddeb script? scripts/package/Makefile passes -a flag, like follows: dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) -b -nc -uc So, debarch=${debarch} looks somewhat redundant to me. -- Best Regards Masahiro Yamada