Re: [PATCH v3] meta: drop debian stretch support

[Uladzimir Bely <ubely@ilbers.de>]

In the email from Monday, 2 January 2023 16:06:08 +03 user Jan Kiszka wrote:
> On 02.01.23 13:54, Moessbauer, Felix (T CED INW-CN) wrote:
> > On Mon, 2023-01-02 at 12:51 +0000, Moessbauer, Felix wrote:
> >> On Mon, 2023-01-02 at 12:01 +0100, Jan Kiszka wrote:
> >>> On 27.12.22 07:35, Anton Mikanovich wrote:
> >>>> Debian Stretch state was moved to EOL since July 2020, so drop
> >>>> it.
> >>>> This will allow us to get rid of many hacks inside Isar core and
> >>>> single
> >>>> example packages.
> >>>> Also drop raspbian-stretch distro and rpi machine used it.
> >>>> Drop wic_fakeroot fsck hack because it is no more needed.
> >>>> 
> >>>> Update documentation to remove Debian Stretch there also.
> >>>> 
> >>>> Signed-off-by: Anton Mikanovich <amikan@ilbers.de>
> >>> 
> >>> ...
> >>> 
> >>>> diff --git a/meta/classes/dpkg-gbp.bbclass b/meta/classes/dpkg-
> >>>> gbp.bbclass
> >>>> index 68172b3f..f765eb9a 100644
> >>>> --- a/meta/classes/dpkg-gbp.bbclass
> >>>> +++ b/meta/classes/dpkg-gbp.bbclass
> >>>> @@ -9,16 +9,13 @@ S = "${WORKDIR}/git"
> >>>> 
> >>>>  PATCHTOOL ?= "git"
> >>>> 
> >>>> -GBP_EXTRA_OPTIONS ?= "--git-pristine-tar"
> >>>> +GBP_EXTRA_OPTIONS ?= "--pristine-tar"
> >>>> 
> >>>>  SCHROOT_MOUNTS = "${WORKDIR}:${PP} ${GITDIR}:/home/.git-
> >>>> 
> >>>> downloads"
> >>>> 
> >>>>  dpkg_runbuild_prepend() {
> >>>>  
> >>>>      sh -c "
> >>>>      
> >>>>          cd ${WORKDIR}/${PPS}
> >>>> 
> >>>> -        gbp buildpackage --git-ignore-new --git-
> >>>> builder=/bin/true
> >>>> ${GBP_EXTRA_OPTIONS}
> >>>> +        gbp export-orig ${GBP_EXTRA_OPTIONS}
> >>>> 
> >>>>      "
> >>>> 
> >>>> -    # NOTE: `buildpackage --git-builder=/bin/true --git-
> >>>> pristine-
> >>>> tar` is used
> >>>> -    # for compatibility with gbp version froms debian-stretch.
> >>>> In
> >>>> newer distros
> >>>> -    # it's possible to use a subcommand `export-orig --pristine-
> >>>> tar`
> >>>> 
> >>>>  }
> >>> 
> >>> This cleanup is requiring an entry in RECIPE-API-CHANGELOG.md, see
> >>> https://github.com/siemens/meta-coral/blob/66a85fc4958524526d4a5e2eda058
> >>> 8de2a5f46f9/recipes-devtools/bazel-bootstrap/bazel-bootstrap_4.1.0%2Bds-
> >>> 1.bb#L14 and https://github.com/siemens/meta-iot2050/pull/396.
> >> 
> >> Yes, we definitely need that API changelog entry. We have the
> >> following
> >> pattern in many recipes:
> >> 
> >> GBP_EXTRA_OPTIONS = "--git-no-pristine-tar --git-upstream-
> >> branch=master"
> >> 
> >> This now has to become:
> >> GBP_EXTRA_OPTIONS = "--no-pristine-tar --upstream-branch=master"
> > 
> > ... and changing this breaks backwards compatibility. This is
> > especially problematic for layers that also have to support older
> > versions of ISAR. At least, there is no release in-between v0.9 and
> > next, so we could argue that breaking things is OK.
> > 
> > An alternative would be to simply replace the --git-<opt> with --<opt>
> > on the fly using bitbake magic.
> 
> We could do that for existing GBP_EXTRA_OPTIONS and introduce a new
> variable that targets the actually used GBP sub-command:
> GBP_EXPORT_ORIG_EXTRA_OPTIONS.
> 
> Jan

Hello.

I've just sent a patch that makes GBP_EXPORT_ORIG_OPTIONS variable used with 
newer Isar. If downstream wants to use newer Isar, it should consider this in 
the recipe. If not, it still can use old variable. To support both cases (e.g. 
same layer is used in different projects with different Isar versions), both 
variables should be used in the layer.

-- 
Uladzimir Bely