From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6703379430489718784 X-Received: by 2002:a2e:12dc:: with SMTP id 89mr25975009ljs.40.1562269796585; Thu, 04 Jul 2019 12:49:56 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:998e:: with SMTP id w14ls852032lji.0.gmail; Thu, 04 Jul 2019 12:49:55 -0700 (PDT) X-Google-Smtp-Source: APXvYqzikcS/q57Lz80PYWoqhMkTcJGujsobWuquqbXJnJo7wWJhNYTmZ3mFoEfoPiBUBgpgbpJ2 X-Received: by 2002:a2e:5c6:: with SMTP id 189mr26123493ljf.22.1562269795551; Thu, 04 Jul 2019 12:49:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1562269795; cv=none; d=google.com; s=arc-20160816; b=rm0ZMLRG18KoyvjWRIyfAhyElgJnY3yXC270w+MojdOygbspj8pVsjnL83jWmun3qj XDSMy2EiN1MPJ+znZsOHDJeezwf7YvmiuXCfV46dN3/V+RDi8dUPmOi+odrnlX7mp8Iw +Tyd4TQ3xVg/KDoLHifbTRiR9EmM567mKizSc9ymzFxIrruJuihF1irt0NmkcaN2wJnR w+sN+reprhpN3TtERvI8uyuCqjSKwRU4r33J3LccG8hu5th8aSh0c5+KtVpODQAU00ws GVjmEduSzlJplnlP42Ck4QUJKKdqNSpZFdsTYSMrzmzrR9U80Ovb8ONhSL1WjCEA0hy3 hSlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:date:cc:to:from :subject:message-id; bh=Lan4Oyeynsr68e9IcZKhFXatGcacNGe9ZeX7QuLPlRo=; b=y0ra3Eol4EG9FePTswcz6eGU8be9htIs4HY/DvTk6eqjjmKxJoceJRvBM2PbjMfVK8 oAreBX/qmEtCddh/AlLrVvGdv3a9nAZXYlM6BX7g4SPor/IiK5uhqNScr4dbWECYJKQj ME5noIwFOTsPtrPXVVlXtLHA9FCIqEZr25lspirx9/UpcDaOr8OojPoKEdYpI3y0HRQu koIUq2wSRvf+DyHAnc87KOBO0p2In/rs1Wd0FTYFcMz33CDDcIA/wGRwgzlO56lbYuHo j/TglDcR2NqZN5itXxaTZI4O89VYAdGOcuRClyipdhiPDXUoFtx9ecpaMc+/AOltMSsY fnfg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ben@decadent.org.uk designates 88.96.1.126 as permitted sender) smtp.mailfrom=ben@decadent.org.uk Return-Path: Received: from shadbolt.e.decadent.org.uk (shadbolt.e.decadent.org.uk. [88.96.1.126]) by gmr-mx.google.com with ESMTPS id q11si428246ljg.2.2019.07.04.12.49.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 04 Jul 2019 12:49:55 -0700 (PDT) Received-SPF: pass (google.com: domain of ben@decadent.org.uk designates 88.96.1.126 as permitted sender) client-ip=88.96.1.126; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of ben@decadent.org.uk designates 88.96.1.126 as permitted sender) smtp.mailfrom=ben@decadent.org.uk Received: from [167.98.27.226] (helo=deadeye) by shadbolt.decadent.org.uk with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1hj7jr-0003HC-Uq; Thu, 04 Jul 2019 20:49:52 +0100 Received: from ben by deadeye with local (Exim 4.92) (envelope-from ) id 1hj7jr-0007vM-EP; Thu, 04 Jul 2019 20:49:51 +0100 Message-ID: <432e997617a0669886cd9ea5ceac7c1a2173044b.camel@decadent.org.uk> Subject: Re: [PATCH v2] builddeb: generate multi-arch friendly linux-libc-dev package From: Ben Hutchings To: Cedric Hombourger Cc: yamada.masahiro@socionext.com, isar-users@googlegroups.com, michal.lkml@markovi.net, linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, riku.voipio@linaro.org Date: Thu, 04 Jul 2019 20:49:51 +0100 In-Reply-To: <1562269332-132-1-git-send-email-Cedric_Hombourger@mentor.com> References: <0ff3202ced2b501d6045157f1c7b50810c0571e5.camel@decadent.org.uk> <1562269332-132-1-git-send-email-Cedric_Hombourger@mentor.com> Content-Type: multipart/signed; micalg="pgp-sha512"; protocol="application/pgp-signature"; boundary="=-cA+bfsGVarVXhzkxUgz3" User-Agent: Evolution 3.30.5-1.1 MIME-Version: 1.0 X-SA-Exim-Connect-IP: 167.98.27.226 X-SA-Exim-Mail-From: ben@decadent.org.uk X-SA-Exim-Scanned: No (on shadbolt.decadent.org.uk); SAEximRunCond expanded to false X-TUID: M5HdL2DHHuNk --=-cA+bfsGVarVXhzkxUgz3 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, 2019-07-04 at 21:42 +0200, 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. >=20 > Signed-off-by: Cedric Hombourger > Reviewed-by: Henning Schild > Reviewed-by: Ben Hutchings I haven't reviewed this version of the patch. And this doesn't make a multi-arch package; you will have to add a field to the package's control file too. Ben. > --- > scripts/package/builddeb | 8 ++++++++ > scripts/package/mkdebian | 4 ++-- > 2 files changed, 10 insertions(+), 2 deletions(-) >=20 > 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" !=3D "um" ]; then > $MAKE -f $srctree/Makefile headers_check > $MAKE -f $srctree/Makefile headers_install INSTALL_HDR_PATH=3D"$libc_he= aders_dir/usr" > + if [ -n "$debarch" ]; then > + # move asm headers to /usr/include//asm to match the str= ucture > + # used by Debian-based distros (to support multi-arch) but only if ARC= H was > + # translated to Debian's (debarch) - this is done by mkdebian > + host_arch=3D$(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/$ho= st_arch/ > + fi > fi > =20 > # 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 ?=3D . > =20 > build: > - \$(MAKE) KERNELRELEASE=3D${version} ARCH=3D${ARCH} \ > + \$(MAKE) KERNELRELEASE=3D${version} ARCH=3D${ARCH} debarch=3D${debarch}= \ > KBUILD_BUILD_VERSION=3D${revision} -f \$(srctree)/Makefile > =20 > binary-arch: > - \$(MAKE) KERNELRELEASE=3D${version} ARCH=3D${ARCH} \ > + \$(MAKE) KERNELRELEASE=3D${version} ARCH=3D${ARCH} debarch=3D${debarch}= \ > KBUILD_BUILD_VERSION=3D${revision} -f \$(srctree)/Makefile intdeb-pkg > =20 > clean: --=20 Ben Hutchings Quantity is no substitute for quality, but it's the only one we've got. --=-cA+bfsGVarVXhzkxUgz3 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: This is a digitally signed message part -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEErCspvTSmr92z9o8157/I7JWGEQkFAl0eWF8ACgkQ57/I7JWG EQk4AA/9G5jY7ubQDfOO6pEMnOMb1V6QBMMDT+eIBVyiXxW4xBN7yFz6WjKLTC+k mYeNcPWL1iI0Tl9LpAmsOKHffJYc1BWbjo46gDk1nP5s6V/Mc8qXVhKcHSYWTjnI 3upub1vcb6dWvimjeOubCCSM6mvwrRyxibwO7Cqr/vuWfcFK4JG5/bO9+3nri9zX RKR2746PLfg5UBU1GrBvEtgBV5bXmOX11j6APOre9GHEw6j5zKB95jF+ufL6opqM 3KcRmg8gj+khqtOWoLMKc/U3cn4zvEmgROyU6Dv32c6EXD73AKov8A36WD5BwHb6 YtJ3MrfNFMSPgFTM3K/+vRTmwoV9bUcK4b4yhrl64yOMjk2GkuilO3o9+sDTmHiY KRWQjeVbWMd2z4QlGYzcJ5qfxljuSegEzISnUhZcEAb7pxzPmq/CvJGGE0iSdQqa 2PC6jTXcM3ELZOmXIRcnTi8sog8DG7b3J2a/dHVnqkeklqRZBg/w9uTAcSvxKLv3 UnYhfj0bn0fFTZgfGoFWYkZSSk2vnXTJbYEGrzjDIhqTaW5xwU+9pMKwngO47ny0 vcNqsg6VDLzjFNWyGBt8pOq3DIq0Ud1D/j8c5Fod+Jlz3ScF3KLhq2YSqjU9iBVC k5Tj8F/AR4HsjR7bJJ5YDO7fzpeHJj6ClCP1PqUEelc41hIK2bA= =MsmZ -----END PGP SIGNATURE----- --=-cA+bfsGVarVXhzkxUgz3--