[PATCH 0/1] kbuild: deb-pkg: default dpkg-buildpackage --build

[PATCH 0/1] kbuild: deb-pkg: default dpkg-buildpackage --build

[Bastian Germann]

deb-pkg's dpkg-buildpackage invocation was changed in v6.2, unnecessarily
adding the --build parameter explicitly. Revert the change.

Bastian Germann (1):
  kbuild: deb-pkg: default dpkg-buildpackage --build

 scripts/Makefile.package | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.39.2

[PATCH 1/1] kbuild: deb-pkg: default dpkg-buildpackage --build

[Bastian Germann]

deb-pkg's dpkg-buildpackage invocation was added --build=source,binary
recently. Before, it relied on the default, which is
--build=source,binary,all and makes no difference for the built packages
as there is no "Arch: all" package.

However, the explicit --build eliminates overriding it via DPKG_FLAGS,
which used to fill the gap of generating only a source package without
building it.

Recover the old, default behavior.

Fixes: 7bf4582d7aad ("kbuild: deb-pkg: create source package without cleaning")
Signed-off-by: Bastian Germann <bage@linutronix.de>
---
 scripts/Makefile.package | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Makefile.package b/scripts/Makefile.package
index b941e6341b36..fe1721915a59 100644
--- a/scripts/Makefile.package
+++ b/scripts/Makefile.package
@@ -120,7 +120,7 @@ debian-orig: linux.tar.gz debian
 PHONY += deb-pkg
 deb-pkg: debian-orig
 	+dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) \
-		--build=source,binary -nc -us -uc
+		-nc -us -uc
 
 PHONY += bindeb-pkg
 bindeb-pkg: debian
-- 
2.39.2

Re: [PATCH 0/1] kbuild: deb-pkg: default dpkg-buildpackage --build

[Nicolas Schier]

On Mon, Mar 06, 2023 at 12:25:34AM +0100, Bastian Germann wrote:
> deb-pkg's dpkg-buildpackage invocation was changed in v6.2, unnecessarily

v6.3

> adding the --build parameter explicitly. Revert the change.
> 
> Bastian Germann (1):
>   kbuild: deb-pkg: default dpkg-buildpackage --build
> 
>  scripts/Makefile.package | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> -- 
> 2.39.2
> 

Masahiro prepared a patch [1] for explicitly introducing a 'srcdeb-pkg'
target, but scheduled its inclusion for v6.4.

Kind regards,
Nicolas

[1]: https://lore.kernel.org/linux-kbuild/CAK7LNAR82ZgvKof9VMXRM4A_h22ZNCyoaKoHW-ONJ+4vctCu_A@mail.gmail.com/T/#m59cc003498dab9b7246198ac3172527256bd1304

Re: [PATCH 0/1] kbuild: deb-pkg: default dpkg-buildpackage --build

[Bastian Germann]

Am 06.03.23 um 15:30 schrieb Nicolas Schier:
> On Mon, Mar 06, 2023 at 12:25:34AM +0100, Bastian Germann wrote:
>> deb-pkg's dpkg-buildpackage invocation was changed in v6.2, unnecessarily
> 
> v6.3
> 
>> adding the --build parameter explicitly. Revert the change.
>>
>> Bastian Germann (1):
>>    kbuild: deb-pkg: default dpkg-buildpackage --build
>>
>>   scripts/Makefile.package | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> -- 
>> 2.39.2
>>
> 
> Masahiro prepared a patch [1] for explicitly introducing a 'srcdeb-pkg'
> target, but scheduled its inclusion for v6.4.

Thanks for the pointer. I would still find it nice not to break the use case in 6.3.

> 
> Kind regards,
> Nicolas
> 
> [1]: https://lore.kernel.org/linux-kbuild/CAK7LNAR82ZgvKof9VMXRM4A_h22ZNCyoaKoHW-ONJ+4vctCu_A@mail.gmail.com/T/#m59cc003498dab9b7246198ac3172527256bd1304

Re: [PATCH 1/1] kbuild: deb-pkg: default dpkg-buildpackage --build

[Nicolas Schier]

[-- Attachment #1: Type: text/plain, Size: 1304 bytes --]

On Mon, Mar 06, 2023 at 12:25:35AM +0100 Bastian Germann wrote:
> deb-pkg's dpkg-buildpackage invocation was added --build=source,binary
> recently. Before, it relied on the default, which is
> --build=source,binary,all and makes no difference for the built packages
> as there is no "Arch: all" package.
> 
> However, the explicit --build eliminates overriding it via DPKG_FLAGS,
> which used to fill the gap of generating only a source package without
> building it.
> 
> Recover the old, default behavior.
> 
> Fixes: 7bf4582d7aad ("kbuild: deb-pkg: create source package without cleaning")
> Signed-off-by: Bastian Germann <bage@linutronix.de>
> ---
>  scripts/Makefile.package | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/scripts/Makefile.package b/scripts/Makefile.package
> index b941e6341b36..fe1721915a59 100644
> --- a/scripts/Makefile.package
> +++ b/scripts/Makefile.package
> @@ -120,7 +120,7 @@ debian-orig: linux.tar.gz debian
>  PHONY += deb-pkg
>  deb-pkg: debian-orig
>  	+dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) \
> -		--build=source,binary -nc -us -uc
> +		-nc -us -uc
>  
>  PHONY += bindeb-pkg
>  bindeb-pkg: debian
> -- 
> 2.39.2

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH 1/1] kbuild: deb-pkg: default dpkg-buildpackage --build

[Masahiro Yamada]

On Mon, Mar 6, 2023 at 8:25 AM Bastian Germann <bage@linutronix.de> wrote:
>
> deb-pkg's dpkg-buildpackage invocation was added --build=source,binary
> recently. Before, it relied on the default, which is
> --build=source,binary,all and makes no difference for the built packages
> as there is no "Arch: all" package.


Is this paragraph true?

--build=source,binary,all sounds strange because
'all' is contained in 'binary'.



According to dpkb-buildpackage(1),

 binary = any,all

 full = source,binary = source,any,all  (default)


--build=source,binary would build everything
even if there were 'Arch: all'.





The code change is fine.
My plan was to use --build=source,binary later,
but I could not finish the entire work in the last cycle.




> However, the explicit --build eliminates overriding it via DPKG_FLAGS,
> which used to fill the gap of generating only a source package without
> building it.
>
> Recover the old, default behavior.
>
> Fixes: 7bf4582d7aad ("kbuild: deb-pkg: create source package without cleaning")
> Signed-off-by: Bastian Germann <bage@linutronix.de>
> ---
>  scripts/Makefile.package | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/Makefile.package b/scripts/Makefile.package
> index b941e6341b36..fe1721915a59 100644
> --- a/scripts/Makefile.package
> +++ b/scripts/Makefile.package
> @@ -120,7 +120,7 @@ debian-orig: linux.tar.gz debian
>  PHONY += deb-pkg
>  deb-pkg: debian-orig
>         +dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) \
> -               --build=source,binary -nc -us -uc
> +               -nc -us -uc
>
>  PHONY += bindeb-pkg
>  bindeb-pkg: debian
> --
> 2.39.2
>


-- 
Best Regards
Masahiro Yamada

Re: [PATCH 1/1] kbuild: deb-pkg: default dpkg-buildpackage --build

[Bastian Germann]

Am 07.03.23 um 04:21 schrieb Masahiro Yamada:
> On Mon, Mar 6, 2023 at 8:25 AM Bastian Germann <bage@linutronix.de> wrote:
>>
>> deb-pkg's dpkg-buildpackage invocation was added --build=source,binary
>> recently. Before, it relied on the default, which is
>> --build=source,binary,all and makes no difference for the built packages
>> as there is no "Arch: all" package.
> 
> 
> Is this paragraph true?
> 
> --build=source,binary,all sounds strange because
> 'all' is contained in 'binary'.
> 
> 
> 
> According to dpkb-buildpackage(1),
> 
>   binary = any,all
> 
>   full = source,binary = source,any,all  (default)
> 
> 
> --build=source,binary would build everything
> even if there were 'Arch: all'.

You are right. The point was that it does not change the output.

> 
> The code change is fine.
> My plan was to use --build=source,binary later,
> but I could not finish the entire work in the last cycle.
> 
> 
> 
> 
>> However, the explicit --build eliminates overriding it via DPKG_FLAGS,
>> which used to fill the gap of generating only a source package without
>> building it.
>>
>> Recover the old, default behavior.
>>
>> Fixes: 7bf4582d7aad ("kbuild: deb-pkg: create source package without cleaning")
>> Signed-off-by: Bastian Germann <bage@linutronix.de>
>> ---
>>   scripts/Makefile.package | 2 +-
>>   1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/scripts/Makefile.package b/scripts/Makefile.package
>> index b941e6341b36..fe1721915a59 100644
>> --- a/scripts/Makefile.package
>> +++ b/scripts/Makefile.package
>> @@ -120,7 +120,7 @@ debian-orig: linux.tar.gz debian
>>   PHONY += deb-pkg
>>   deb-pkg: debian-orig
>>          +dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) \
>> -               --build=source,binary -nc -us -uc
>> +               -nc -us -uc
>>
>>   PHONY += bindeb-pkg
>>   bindeb-pkg: debian
>> --
>> 2.39.2
>>
> 
> 

Re: [PATCH 1/1] kbuild: deb-pkg: default dpkg-buildpackage --build

[Masahiro Yamada]

On Tue, Mar 7, 2023 at 5:44 PM Bastian Germann <bage@linutronix.de> wrote:
>
> Am 07.03.23 um 04:21 schrieb Masahiro Yamada:
> > On Mon, Mar 6, 2023 at 8:25 AM Bastian Germann <bage@linutronix.de> wrote:
> >>
> >> deb-pkg's dpkg-buildpackage invocation was added --build=source,binary
> >> recently. Before, it relied on the default, which is
> >> --build=source,binary,all and makes no difference for the built packages
> >> as there is no "Arch: all" package.
> >
> >
> > Is this paragraph true?
> >
> > --build=source,binary,all sounds strange because
> > 'all' is contained in 'binary'.
> >
> >
> >
> > According to dpkb-buildpackage(1),
> >
> >   binary = any,all
> >
> >   full = source,binary = source,any,all  (default)
> >
> >
> > --build=source,binary would build everything
> > even if there were 'Arch: all'.
>
> You are right. The point was that it does not change the output.
>


How do you want to rephrase this?




-- 
Best Regards
Masahiro Yamada

[PATCH v2 0/1] kbuild: deb-pkg: default dpkg-buildpackage --build

[Bastian Germann]

deb-pkg's dpkg-buildpackage invocation was changed in v6.2, unnecessarily
adding the --build parameter explicitly. Revert the change.

Changelog:
v2:
 * Rephrase the commit message not to misrepresent the build options

Bastian Germann (1):
  kbuild: deb-pkg: default dpkg-buildpackage --build

 scripts/Makefile.package | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

-- 
2.39.2

[PATCH v2 1/1] kbuild: deb-pkg: default dpkg-buildpackage --build

[Bastian Germann]

deb-pkg's dpkg-buildpackage invocation was added --build=source,binary
recently. Before, it relied on the default, which is the same, so it
no difference for the built packages.

However, the explicit --build eliminates overriding it via DPKG_FLAGS,
which used to fill the gap of generating only a source package without
building it.

Recover the old, default behavior.

Fixes: 7bf4582d7aad ("kbuild: deb-pkg: create source package without cleaning")
Signed-off-by: Bastian Germann <bage@linutronix.de>
---
 scripts/Makefile.package | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/Makefile.package b/scripts/Makefile.package
index b941e6341b36..fe1721915a59 100644
--- a/scripts/Makefile.package
+++ b/scripts/Makefile.package
@@ -120,7 +120,7 @@ debian-orig: linux.tar.gz debian
 PHONY += deb-pkg
 deb-pkg: debian-orig
 	+dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) \
-		--build=source,binary -nc -us -uc
+		-nc -us -uc
 
 PHONY += bindeb-pkg
 bindeb-pkg: debian
-- 
2.39.2

Re: [PATCH v2 1/1] kbuild: deb-pkg: default dpkg-buildpackage --build

[Masahiro Yamada]

On Tue, Mar 7, 2023 at 8:20 PM Bastian Germann <bage@linutronix.de> wrote:
>
> deb-pkg's dpkg-buildpackage invocation was added --build=source,binary
> recently. Before, it relied on the default, which is the same, so it
> no difference for the built packages.
>
> However, the explicit --build eliminates overriding it via DPKG_FLAGS,
> which used to fill the gap of generating only a source package without
> building it.
>
> Recover the old, default behavior.
>
> Fixes: 7bf4582d7aad ("kbuild: deb-pkg: create source package without cleaning")
> Signed-off-by: Bastian Germann <bage@linutronix.de>
> ---
>  scripts/Makefile.package | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/scripts/Makefile.package b/scripts/Makefile.package
> index b941e6341b36..fe1721915a59 100644
> --- a/scripts/Makefile.package
> +++ b/scripts/Makefile.package
> @@ -120,7 +120,7 @@ debian-orig: linux.tar.gz debian
>  PHONY += deb-pkg
>  deb-pkg: debian-orig
>         +dpkg-buildpackage -r$(KBUILD_PKG_ROOTCMD) -a$$(cat debian/arch) $(DPKG_FLAGS) \
> -               --build=source,binary -nc -us -uc
> +               -nc -us -uc
>
>  PHONY += bindeb-pkg
>  bindeb-pkg: debian
> --
> 2.39.2
>



I applied this, then dropped it.

This patch is wrong.


If this patch is applied, 'make deb-pkg'
would not produce the source package at all.


Now I recalled the reason why I added this.



dpkg-buildpackage(1):

 full
     Builds everything.  This is an alias for source,any,all, and the
     same as the default case when no build option is specified.
                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^


NACK





--
Best Regards
Masahiro Yamada

Re: [PATCH v2 1/1] kbuild: deb-pkg: default dpkg-buildpackage --build

[Bastian Germann]

Am 10.03.23 um 15:37 schrieb Masahiro Yamada:
> If this patch is applied, 'make deb-pkg'
> would not produce the source package at all.

How so? Are you saying `make deb-pkg` never built a source package with <= 6.2?
Because those never specified a --build.

> Now I recalled the reason why I added this.
> 
> 
> 
> dpkg-buildpackage(1):
> 
>   full
>       Builds everything.  This is an alias for source,any,all, and the
>       same as the default case when no build option is specified.
>                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

full is the default for --build. I guess the wording here is so tedious
because you can have -S, -b, -B and so on which all imply some --build.

> NACK

Re: [PATCH v2 1/1] kbuild: deb-pkg: default dpkg-buildpackage --build

[Bastian Germann]

Am 10.03.23 um 15:49 schrieb Bastian Germann:
> Am 10.03.23 um 15:37 schrieb Masahiro Yamada:
>> If this patch is applied, 'make deb-pkg'
>> would not produce the source package at all.
> 
> How so? Are you saying `make deb-pkg` never built a source package with <= 6.2?
> Because those never specified a --build.
> 
>> Now I recalled the reason why I added this.
>>
>>
>>
>> dpkg-buildpackage(1):
>>
>>   full
>>       Builds everything.  This is an alias for source,any,all, and the
>>       same as the default case when no build option is specified.
>>                                ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> 
> full is the default for --build. I guess the wording here is so tedious
> because you can have -S, -b, -B and so on which all imply some --build.
> 
>> NACK

I see. The option -nc implies -b. So yes, you are right.