| Message ID | 20231105215622.17493-1-dmitrii.bundin.a@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] kbuild: deb-pkg: apply short -R and -j options | expand |
On Mon, Nov 6, 2023 at 6:56 AM Dmitrii Bundin <dmitrii.bundin.a@gmail.com> wrote: > > The long version --rules-file and --jobs are available since 1.18.8 > while their short analogues -R and -j have been added since 1.14.7. > > The option --rules-file the way it works currently was introduced in the > commit 5cd52673aabdf5eaa58181972119a41041fc85f2 of dpkg dated 23.07.18 > with the following changelog entry: > > * Fix dpkg-buildpackage option --rules-file parsing. It was trying to parse > it as --rules-target, which due to the ordering was a no-op. > > The current behavior of the long version --rules-file is guaranteed to > be in use starting 1.19.1 and might cause build failures for some > versions newer than 1.18.8 even in spite of being documented that way. > > Signed-off-by: Dmitrii Bundin <dmitrii.bundin.a@gmail.com> > --- Applied to linux-kbuild. Thanks. > scripts/Makefile.package | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/scripts/Makefile.package b/scripts/Makefile.package > index 2bcab02da965..af96319be98e 100644 > --- a/scripts/Makefile.package > +++ b/scripts/Makefile.package > @@ -148,7 +148,7 @@ deb-pkg srcdeb-pkg bindeb-pkg: > $(if $(findstring source, $(build-type)), \ > --unsigned-source --compression=$(KDEB_SOURCE_COMPRESS)) \ > $(if $(findstring binary, $(build-type)), \ > - --rules-file='$(MAKE) -f debian/rules' --jobs=1 -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch), \ > + -R'$(MAKE) -f debian/rules' -j1 -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch), \ > --no-check-builddeps) \ > $(DPKG_FLAGS)) > > -- > 2.17.1 >
diff --git a/scripts/Makefile.package b/scripts/Makefile.package index 2bcab02da965..af96319be98e 100644 --- a/scripts/Makefile.package +++ b/scripts/Makefile.package @@ -148,7 +148,7 @@ deb-pkg srcdeb-pkg bindeb-pkg: $(if $(findstring source, $(build-type)), \ --unsigned-source --compression=$(KDEB_SOURCE_COMPRESS)) \ $(if $(findstring binary, $(build-type)), \ - --rules-file='$(MAKE) -f debian/rules' --jobs=1 -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch), \ + -R'$(MAKE) -f debian/rules' -j1 -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch), \ --no-check-builddeps) \ $(DPKG_FLAGS))
The long version --rules-file and --jobs are available since 1.18.8 while their short analogues -R and -j have been added since 1.14.7. The option --rules-file the way it works currently was introduced in the commit 5cd52673aabdf5eaa58181972119a41041fc85f2 of dpkg dated 23.07.18 with the following changelog entry: * Fix dpkg-buildpackage option --rules-file parsing. It was trying to parse it as --rules-target, which due to the ordering was a no-op. The current behavior of the long version --rules-file is guaranteed to be in use starting 1.19.1 and might cause build failures for some versions newer than 1.18.8 even in spite of being documented that way. Signed-off-by: Dmitrii Bundin <dmitrii.bundin.a@gmail.com> --- scripts/Makefile.package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)