linux-kernel - Re: [PATCH 2/2] kbuild: deb-pkg: split debian/rules

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date:   Tue, 1 Aug 2023 20:19:18 +0900
From:   Masahiro Yamada <masahiroy@...nel.org>
To:     Nicolas Schier <nicolas@...sle.eu>
Cc:     linux-kbuild@...r.kernel.org, linux-kernel@...r.kernel.org,
        Ben Hutchings <ben@...adent.org.uk>,
        Nathan Chancellor <nathan@...nel.org>,
        Nick Desaulniers <ndesaulniers@...gle.com>
Subject: Re: [PATCH 2/2] kbuild: deb-pkg: split debian/rules

On Sun, Jul 30, 2023 at 3:23 AM Nicolas Schier <nicolas@...sle.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@...nel.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/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 ?= .
> > +
> > +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=$(ARCH) \
> > +     KERNELRELEASE=$(KERNELRELEASE) \
> > +     run-command KBUILD_RUN_COMMAND=+$(srctree)/scripts/package/builddeb
> > +
> > +.PHONY: build build-indep build-arch
> > +build: build-arch build-indep
> > +build-indep:
> > +build-arch:
> > +     $(MAKE) -f $(srctree)/Makefile ARCH=$(ARCH) \
> > +     KERNELRELEASE=$(KERNELRELEASE) \
> > +     $(shell $(srctree)/scripts/package/deb-build-option) \
> > +     olddefconfig all
> > +
> > +.PHONY: clean
> > +clean:
> > +     rm -rf debian/files debian/linux-*
> > +     $(MAKE) -f $(srctree)/Makefile ARCH=${ARCH} clean
>
> possibly use '$(ARCH)' instead of '${ARCH}' here, too?


Thanks, I will fix it in v2.




-- 
Best Regards
Masahiro Yamada