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;
MIME-Version: 1.0
References: <20230729143814.1509196-1-masahiroy@kernel.org>
 <20230729143814.1509196-2-masahiroy@kernel.org> <ZMVXb008ULiyHLie@bergen.fjasle.eu>
In-Reply-To: <ZMVXb008ULiyHLie@bergen.fjasle.eu>
From:   Masahiro Yamada <masahiroy@kernel.org>
Date:   Tue, 1 Aug 2023 20:19:18 +0900
Message-ID: <CAK7LNATC_3BjAgc=6EkyK6FFqvYFd6hLbk0p1k4JSW8nru16Ng@mail.gmail.com>
Subject: Re: [PATCH 2/2] kbuild: deb-pkg: split debian/rules
To:     Nicolas Schier <nicolas@fjasle.eu>
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>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Sun, Jul 30, 2023 at 3:23=E2=80=AFAM Nicolas Schier <nicolas@fjasle.eu> =
wrote:
>
> 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.
> >
> > debian/rules embeds only two variables (ARCH and KERNELRELEASE).
> >
> > Split them out to debian/rules.vars, and check-in the rest of Makefile
> > code to scripts/package/debian/rules.
> >
> > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
> > ---
> >
> >  scripts/package/debian/rules | 28 ++++++++++++++++++++++++++++
> >  scripts/package/mkdebian     | 32 ++++----------------------------
> >  2 files changed, 32 insertions(+), 28 deletions(-)
> >  create mode 100755 scripts/package/debian/rules
> >
> > diff --git a/scripts/package/debian/rules b/scripts/package/debian/rule=
s
> > 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/buil=
ddeb
> > +
> > +.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?


Thanks, I will fix it in v2.


--=20
Best Regards
Masahiro Yamada