Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Sat, 29 Jul 2023 20:16:15 +0200
From:   Nicolas Schier <nicolas@fjasle.eu>
To:     Masahiro Yamada <masahiroy@kernel.org>
Cc:     linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
        Ben Hutchings <ben@decadent.org.uk>,
        Nathan Chancellor <nathan@kernel.org>,
        Nick Desaulniers <ndesaulniers@google.com>
Subject: Re: [PATCH 2/2] kbuild: deb-pkg: split debian/rules
Message-ID: <ZMVXb008ULiyHLie@bergen.fjasle.eu>
References: <20230729143814.1509196-1-masahiroy@kernel.org>
 <20230729143814.1509196-2-masahiroy@kernel.org>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="QkuvX0QpVWqifrVt"
Content-Disposition: inline
In-Reply-To: <20230729143814.1509196-2-masahiroy@kernel.org>
Jabber-ID: nicolas@jabber.no
UI-OutboundReport: notjunk:1;M01:P0:lW9JgpqhVO4=;GythiiaKa6AJV6XjLu+wbqOSZLL
 wSz/AsOv4OFMLq3ul6PJmw5a51kYqQI7R4b6q16PHNBy+o5mPPtcIN8uwzF63eOtjw51K99Nm
 56QKeNGpGS9u8amGePpkW9WugqKW3l5mxIoZ7r676/2kdvxKz+bOTDx3/WKfhASgKg2AcImnM
 oGlEnMXV5+jTZHr7zOlXodLc8w/QONbyRKQPsPoalUjME6MLlOjnG7oFSBhVeGZmXjhykmvkS
 /zVlRecwyoRlfK4nhetLgEoTJcCW7EBzqHwE+wXTu7v2LwAdWxjOfKGQ+IuUrGhY4hgPnWGfB
 ZjFuitrZAygkxshAHIKvU7AYcLQuqdtiixawmsBm2v+hAxS6/hIJqv33D0bs4EkibsjHau1Re
 xI00dALpivDLE41I9CoKRsjMu0RayrQueLE4muHw8an+CmgHh0w5nByQBEDhe3svgJoWNeahn
 W+DyLnIAk/GmDFUL132ennQk550sXp1LJ1s1BMjpqoj5yaaNMVHAZxfUHMUEIPBmZo5roPNaZ
 Qn1cLsUJI4NQsITSJRKKlplwHy49f6pZz/z1GWL/8LWj1uPUf7f8TK7Q7zlvhdJ4TLQVE2qsh
 zhErq8JpHBSNAQXDITuaQf1h1wvec1ZLBJOA84wiCTenfmdBQVrzbOeRTBG/NgDxBmFvmtARt
 jSjvM2DMiveo8XkhYzmkhAzAnk+fKPDWiESrbqqR9QXV9GJ51rlT2qqbfCS98yU5ufUwrSGr8
 CH7T2nKTSqCB1CUizRqA3twkesytshPZ8mKCLqro6rSTycQk3y7izhEfFPjecBR5u+7sdUydP
 f0UALtpoks/uFje2tsH1pl6tvq2f6z6MPWfh8I0Z0TohtF0DYOqtYwt1F8JfwVdm31LMtIOQx
 +23v94pNBUa1P+g==
Precedence: bulk


--QkuvX0QpVWqifrVt
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Sat 29 Jul 2023 23:38:14 GMT, Masahiro Yamada wrote:
> debian/rules is generated by shell scripting, but the escape sequence
> (\$) is unreadable.
>=20
> debian/rules embeds only two variables (ARCH and KERNELRELEASE).
>=20
> Split them out to debian/rules.vars, and check-in the rest of Makefile
> code to scripts/package/debian/rules.
>=20
> Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> ---
>=20
>  scripts/package/debian/rules | 28 ++++++++++++++++++++++++++++
>  scripts/package/mkdebian     | 32 ++++----------------------------
>  2 files changed, 32 insertions(+), 28 deletions(-)
>  create mode 100755 scripts/package/debian/rules
>=20
> diff --git a/scripts/package/debian/rules b/scripts/package/debian/rules
> new file mode 100755
> index 000000000000..a4e5ab5abdd9
> --- /dev/null
> +++ b/scripts/package/debian/rules
> @@ -0,0 +1,28 @@
> +#!/usr/bin/make -f
> +# SPDX-License-Identifier: GPL-2.0-only
> +
> +srctree ?=3D .
> +
> +include debian/rules.vars
> +
> +.PHONY: binary binary-indep binary-arch
> +binary: binary-arch binary-indep
> +binary-indep: build-indep
> +binary-arch: build-arch
> +	$(MAKE) -f $(srctree)/Makefile ARCH=3D$(ARCH) \
> +	KERNELRELEASE=3D$(KERNELRELEASE) \
> +	run-command KBUILD_RUN_COMMAND=3D+$(srctree)/scripts/package/builddeb
> +
> +.PHONY: build build-indep build-arch
> +build: build-arch build-indep
> +build-indep:
> +build-arch:
> +	$(MAKE) -f $(srctree)/Makefile ARCH=3D$(ARCH) \
> +	KERNELRELEASE=3D$(KERNELRELEASE) \
> +	$(shell $(srctree)/scripts/package/deb-build-option) \
> +	olddefconfig all
> +
> +.PHONY: clean
> +clean:
> +	rm -rf debian/files debian/linux-*
> +	$(MAKE) -f $(srctree)/Makefile ARCH=3D${ARCH} clean

possibly use '$(ARCH)' instead of '${ARCH}' here, too?


Tested-by: Nicolas Schier <nicolas@fjasle.eu>
Reviewed-by: Nicolas Schier <nicolas@fjasle.eu>

> diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian
> index 2829f5b8aea6..498b579c6320 100755
> --- a/scripts/package/mkdebian
> +++ b/scripts/package/mkdebian
> @@ -263,35 +263,11 @@ Description: Linux kernel debugging symbols for $ve=
rsion
>  EOF
>  fi
> =20
> -cat <<EOF > debian/rules
> -#!/usr/bin/make -f
> -
> -srctree ?=3D .
> +cat <<EOF > debian/rules.vars
> +ARCH =3D ${ARCH}
>  KERNELRELEASE =3D ${KERNELRELEASE}
> -
> -.PHONY: clean build build-arch build-indep binary binary-arch binary-ind=
ep
> -
> -build-indep:
> -build-arch:
> -	\$(MAKE) -f \$(srctree)/Makefile ARCH=3D${ARCH} \
> -	KERNELRELEASE=3D\$(KERNELRELEASE) \
> -	\$(shell \$(srctree)/scripts/package/deb-build-option) \
> -	olddefconfig all
> -
> -build: build-arch
> -
> -binary-indep:
> -binary-arch: build-arch
> -	\$(MAKE) -f \$(srctree)/Makefile ARCH=3D${ARCH} \
> -	KERNELRELEASE=3D\$(KERNELRELEASE) \
> -	run-command KBUILD_RUN_COMMAND=3D+\$(srctree)/scripts/package/builddeb
> -
> -clean:
> -	rm -rf debian/files debian/linux-*
> -	\$(MAKE) -f \$(srctree)/Makefile ARCH=3D${ARCH} clean
> -
> -binary: binary-arch
>  EOF
> -chmod +x debian/rules
> +
> +cp ${srctree}/scripts/package/debian/rules debian/
> =20
>  exit 0
> --=20
> 2.39.2

--=20
Nicolas Schier
=20
epost|xmpp: nicolas@fjasle.eu          irc://oftc.net/nsc
=E2=86=B3 gpg: 18ed 52db e34f 860e e9fb  c82b 7d97 0932 55a0 ce7f
     -- frykten for herren er opphav til kunnskap --

--QkuvX0QpVWqifrVt
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEEh0E3p4c3JKeBvsLGB1IKcBYmEmkFAmTFV28ACgkQB1IKcBYm
EmnIkQ/7BduSX3gN7+L0G7MMt4WSSRThiZNV5uUKKOVuukNYBppdXBer4Y0/VCTa
LD1D3lvCkvl5rTUlR9lp/J2wJKMb9zsHnV7BNPnTWxTJgHm0+dA8/5+yEIfevIqw
t2TMlEr7zxUvRwPokZP2QtmbFLFf6wqvLZP9rC3QbPaZagdyk4eOhsg7pXH9QJsO
O5C+4yn2hMlhbspASdDc3yOLOZlzdJr+sGXs563qBc4DtjzXUXgCknC47Cl24fH/
ySUq8jPOQZoAD+T8kYBIZe23yIJV7usLhmRm4NC4obwlLOZ+NoRUikCPwW3jYXuc
iMDqg67Y4fgDd2QtqHfRGmiU2SG4TRpTS4oJYsXrXGulhKRcEymqqJs6tvSVA5Kz
qdHOy43AiEg5c6rf3WaUBocxYUNqitG+SX3Bfxrj99WJleLNtWkNcQkPmSiI0Bnp
JnRqA80XQhFJowtA+xkMrYeNNJ8FC3HeIr/8hdDMPlKiN/S1XxylVHOcQaLDzMct
z2tQcby3jhdtIS/axMUn4Y+WfIiQIYa1VecOMF5vuB/s35N12JMBBng9dBU7JBIc
Vi9PvGdvLD4PG2c/dS+55hgJEFtkQIUf73UujOd6tTYvePpwqoimmdw3RR6eUyww
zaBNk+YpDkwP42Skb2n10O5lHHttraT3kio3Z/5I/tbrzKZaWUk=
=Ohj/
-----END PGP SIGNATURE-----

--QkuvX0QpVWqifrVt--