[PATCH] Get back to gbp buildpackage command to prepare gbp source

[PATCH] Get back to gbp buildpackage command to prepare gbp source

[Uladzimir Bely]

With removing stretch support we switched to `gbp export-orig` command
instead of `gbp buildpackage --git-ignore-new --git-builder=/bin/true`
one, since gbp versions in >= buster support this.

Unfortunately, this change makes other downstream layers change their
`GBP_EXTRA_OPTIONS` values in multiple recipes, e.g.:

`--git-(no-)pristine-tar` => `--(no-)pristine-tar`
`--git-upstream-branch=master` => `--upstream-branch=master`.

This creates too much inconvenience - we need to mention it in
RECIPE-API-CHANGELOG, use a different variable for `export-orig`
options, warn user if they still use old variable and, finally,
support both vars in Isar until all downstreams stop using old case.

It is not worth implementing all this stuff just for switching from
long 'buildpackage ...' to shorter 'export-orig ...' gbp subcommand

So, it's better to just revert a piece of "stretch removal" patch.

Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
---
 meta/classes/dpkg-gbp.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes/dpkg-gbp.bbclass
index f765eb9a..b1d7b240 100644
--- a/meta/classes/dpkg-gbp.bbclass
+++ b/meta/classes/dpkg-gbp.bbclass
@@ -9,13 +9,13 @@ S = "${WORKDIR}/git"
 
 PATCHTOOL ?= "git"
 
-GBP_EXTRA_OPTIONS ?= "--pristine-tar"
+GBP_EXTRA_OPTIONS ?= "--git-pristine-tar"
 
 SCHROOT_MOUNTS = "${WORKDIR}:${PP} ${GITDIR}:/home/.git-downloads"
 
 dpkg_runbuild_prepend() {
     sh -c "
         cd ${WORKDIR}/${PPS}
-        gbp export-orig ${GBP_EXTRA_OPTIONS}
+        gbp buildpackage --git-ignore-new --git-builder=/bin/true ${GBP_EXTRA_OPTIONS}
     "
 }
-- 
2.20.1

This replaces `Use GBP_EXPORT_ORIG_OPTIONS for dpg-gbp export command`
by switching to previous `gbp buildpackage` functionality.

Re: [PATCH] Get back to gbp buildpackage command to prepare gbp source

[Henning Schild]

LGTM

Am Thu,  5 Jan 2023 07:07:57 +0100
schrieb Uladzimir Bely <ubely@ilbers.de>:

> With removing stretch support we switched to `gbp export-orig` command
> instead of `gbp buildpackage --git-ignore-new --git-builder=/bin/true`
> one, since gbp versions in >= buster support this.
> 
> Unfortunately, this change makes other downstream layers change their
> `GBP_EXTRA_OPTIONS` values in multiple recipes, e.g.:
> 
> `--git-(no-)pristine-tar` => `--(no-)pristine-tar`
> `--git-upstream-branch=master` => `--upstream-branch=master`.
> 
> This creates too much inconvenience - we need to mention it in
> RECIPE-API-CHANGELOG, use a different variable for `export-orig`
> options, warn user if they still use old variable and, finally,
> support both vars in Isar until all downstreams stop using old case.
> 
> It is not worth implementing all this stuff just for switching from
> long 'buildpackage ...' to shorter 'export-orig ...' gbp subcommand
> 
> So, it's better to just revert a piece of "stretch removal" patch.
> 
> Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
> ---
>  meta/classes/dpkg-gbp.bbclass | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/classes/dpkg-gbp.bbclass
> b/meta/classes/dpkg-gbp.bbclass index f765eb9a..b1d7b240 100644
> --- a/meta/classes/dpkg-gbp.bbclass
> +++ b/meta/classes/dpkg-gbp.bbclass
> @@ -9,13 +9,13 @@ S = "${WORKDIR}/git"
>  
>  PATCHTOOL ?= "git"
>  
> -GBP_EXTRA_OPTIONS ?= "--pristine-tar"
> +GBP_EXTRA_OPTIONS ?= "--git-pristine-tar"
>  
>  SCHROOT_MOUNTS = "${WORKDIR}:${PP} ${GITDIR}:/home/.git-downloads"
>  
>  dpkg_runbuild_prepend() {
>      sh -c "
>          cd ${WORKDIR}/${PPS}
> -        gbp export-orig ${GBP_EXTRA_OPTIONS}
> +        gbp buildpackage --git-ignore-new --git-builder=/bin/true
> ${GBP_EXTRA_OPTIONS} "
>  }

Re: [PATCH] Get back to gbp buildpackage command to prepare gbp source

[Uladzimir Bely]

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

In the email from Thursday, 5 January 2023 14:27:14 +03 user Henning Schild 
wrote:
> LGTM
> 

Since this patch is a hotfix for previous patch and it is unlikely to break 
something, I would prefer to merge it to 'next' a bit faster than usually. 

What about Tue, 10 Jan, for example?

> Am Thu,  5 Jan 2023 07:07:57 +0100
> 
> schrieb Uladzimir Bely <ubely@ilbers.de>:
> > With removing stretch support we switched to `gbp export-orig` command
> > instead of `gbp buildpackage --git-ignore-new --git-builder=/bin/true`
> > one, since gbp versions in >= buster support this.
> > 
> > Unfortunately, this change makes other downstream layers change their
> > `GBP_EXTRA_OPTIONS` values in multiple recipes, e.g.:
> > 
> > `--git-(no-)pristine-tar` => `--(no-)pristine-tar`
> > `--git-upstream-branch=master` => `--upstream-branch=master`.
> > 
> > This creates too much inconvenience - we need to mention it in
> > RECIPE-API-CHANGELOG, use a different variable for `export-orig`
> > options, warn user if they still use old variable and, finally,
> > support both vars in Isar until all downstreams stop using old case.
> > 
> > It is not worth implementing all this stuff just for switching from
> > long 'buildpackage ...' to shorter 'export-orig ...' gbp subcommand
> > 
> > So, it's better to just revert a piece of "stretch removal" patch.
> > 
> > Signed-off-by: Uladzimir Bely <ubely@ilbers.de>
> > ---
> > 
> >  meta/classes/dpkg-gbp.bbclass | 4 ++--
> >  1 file changed, 2 insertions(+), 2 deletions(-)
> > 
> > diff --git a/meta/classes/dpkg-gbp.bbclass
> > b/meta/classes/dpkg-gbp.bbclass index f765eb9a..b1d7b240 100644
> > --- a/meta/classes/dpkg-gbp.bbclass
> > +++ b/meta/classes/dpkg-gbp.bbclass
> > @@ -9,13 +9,13 @@ S = "${WORKDIR}/git"
> > 
> >  PATCHTOOL ?= "git"
> > 
> > -GBP_EXTRA_OPTIONS ?= "--pristine-tar"
> > +GBP_EXTRA_OPTIONS ?= "--git-pristine-tar"
> > 
> >  SCHROOT_MOUNTS = "${WORKDIR}:${PP} ${GITDIR}:/home/.git-downloads"
> >  
> >  dpkg_runbuild_prepend() {
> >  
> >      sh -c "
> >      
> >          cd ${WORKDIR}/${PPS}
> > 
> > -        gbp export-orig ${GBP_EXTRA_OPTIONS}
> > +        gbp buildpackage --git-ignore-new --git-builder=/bin/true
> > ${GBP_EXTRA_OPTIONS} "
> > 
> >  }


[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: [PATCH] Get back to gbp buildpackage command to prepare gbp source

[Uladzimir Bely]

In the email from Thursday, 5 January 2023 09:07:57 +03 user Uladzimir Bely 
wrote:
> With removing stretch support we switched to `gbp export-orig` command
> instead of `gbp buildpackage --git-ignore-new --git-builder=/bin/true`
> one, since gbp versions in >= buster support this.
> 
> Unfortunately, this change makes other downstream layers change their
> `GBP_EXTRA_OPTIONS` values in multiple recipes, e.g.:
> 
> `--git-(no-)pristine-tar` => `--(no-)pristine-tar`
> `--git-upstream-branch=master` => `--upstream-branch=master`.
> 
> This creates too much inconvenience - we need to mention it in
> RECIPE-API-CHANGELOG, use a different variable for `export-orig`
> options, warn user if they still use old variable and, finally,
> support both vars in Isar until all downstreams stop using old case.
> 
> It is not worth implementing all this stuff just for switching from
> long 'buildpackage ...' to shorter 'export-orig ...' gbp subcommand
> 
> So, it's better to just revert a piece of "stretch removal" patch.
> 
> Signed-off-by: Uladzimir Bely <ubely@ilbers.de>

Applied to next.