diff mbox series

[isar-cip-core,v2] efibootguard: Update to latest debianization

Message ID 2b28ca7e-846f-47f3-bf8d-20e98cbe08b9@siemens.com (mailing list archive)
State Superseded
Headers show
Series [isar-cip-core,v2] efibootguard: Update to latest debianization | expand

Commit Message

Jan Kiszka Jan. 18, 2024, 7:50 p.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

This fixes cross-building and allows to use python3-shtab in bookworm
and newer from Debian directly - at least as long as that version does
not include the Multi-Arch hint that was recently added and that also
our own shtab recipe uses. That one, in turn, is incompatible with the
:native suffix that was now added to efibootguard's dependency. We
therefore also need to switch our shtab debianization to a version
without Multi-Arch yet. What a mess.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

I was considering to hold this back until python3-shtab 1.5.5-4 has been 
uploaded by Debian but that would delay our CI testing of riscv64 
because cross-building python3-shtab for that arch is currently broken.

Note, though, that the generated swupdate image will not boot in qemu
because  the 6.1 kernel (just like other upstream kernels) is missing 
https://lore.kernel.org/lkml/42c63cb9-87d0-49db-9af8-95771b186684@siemens.com/

 ...bootguard_0.16-1+cip.bb => efibootguard_0.16-3+cip.bb} | 8 +++++---
 ...{python3-shtab_1.5.5-4.bb => python3-shtab_1.5.5-3.bb} | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)
 rename recipes-bsp/efibootguard/{efibootguard_0.16-1+cip.bb => efibootguard_0.16-3+cip.bb} (89%)
 rename recipes-python/shtab/{python3-shtab_1.5.5-4.bb => python3-shtab_1.5.5-3.bb} (91%)

Comments

Jan Kiszka Jan. 18, 2024, 8:18 p.m. UTC | #1 
On 18.01.24 20:50, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> This fixes cross-building and allows to use python3-shtab in bookworm
> and newer from Debian directly - at least as long as that version does
> not include the Multi-Arch hint that was recently added and that also
> our own shtab recipe uses. That one, in turn, is incompatible with the
> :native suffix that was now added to efibootguard's dependency. We
> therefore also need to switch our shtab debianization to a version
> without Multi-Arch yet. What a mess.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
> 
> I was considering to hold this back until python3-shtab 1.5.5-4 has been 
> uploaded by Debian but that would delay our CI testing of riscv64 
> because cross-building python3-shtab for that arch is currently broken.
> 
> Note, though, that the generated swupdate image will not boot in qemu
> because  the 6.1 kernel (just like other upstream kernels) is missing 
> https://lore.kernel.org/lkml/42c63cb9-87d0-49db-9af8-95771b186684@siemens.com/
> 
>  ...bootguard_0.16-1+cip.bb => efibootguard_0.16-3+cip.bb} | 8 +++++---
>  ...{python3-shtab_1.5.5-4.bb => python3-shtab_1.5.5-3.bb} | 2 +-
>  2 files changed, 6 insertions(+), 4 deletions(-)
>  rename recipes-bsp/efibootguard/{efibootguard_0.16-1+cip.bb => efibootguard_0.16-3+cip.bb} (89%)
>  rename recipes-python/shtab/{python3-shtab_1.5.5-4.bb => python3-shtab_1.5.5-3.bb} (91%)
> 
> diff --git a/recipes-bsp/efibootguard/efibootguard_0.16-1+cip.bb b/recipes-bsp/efibootguard/efibootguard_0.16-3+cip.bb
> similarity index 89%
> rename from recipes-bsp/efibootguard/efibootguard_0.16-1+cip.bb
> rename to recipes-bsp/efibootguard/efibootguard_0.16-3+cip.bb
> index a7ffb00b..83be2a4d 100644
> --- a/recipes-bsp/efibootguard/efibootguard_0.16-1+cip.bb
> +++ b/recipes-bsp/efibootguard/efibootguard_0.16-3+cip.bb
> @@ -1,7 +1,7 @@
>  #
>  # CIP Core, generic profile
>  #
> -# Copyright (c) Siemens AG, 2020-2023
> +# Copyright (c) Siemens AG, 2020-2024
>  #
>  # Authors:
>  #  Quirin Gylstorff <quirin.gylstorff@siemens.com>
> @@ -24,7 +24,7 @@ SRC_URI = " \
>      file://debian-patches/0001-d-control-Make-compatible-with-debian-buster.patch \
>      "
>  SRC_URI[tarball.sha256sum] = "d6d37c59aed17489d02b4f0b63db16994dfb8f9f70f54be4d65c366f58c6be9d"
> -SRCREV_debian = "2e80fafa87f8f6fd093f49ff33ad7cac61592871"
> +SRCREV_debian = "22b173a3293c976c9dff2ae92085d7ed995f6768"

Someone reset history on salsa, for the master branch - tss, tss. So
this won't work anymore.

Jan

>  
>  PROVIDES = "libebgenv-dev libebgenv0 efibootguard"
>  
> @@ -34,7 +34,9 @@ PATCHTOOL = "git"
>  
>  inherit dpkg
>  
> -DEPENDS = "python3-shtab"
> +DEPENDS:buster = "python3-shtab"
> +DEPENDS:bullseye = "python3-shtab"
> +
>  # needed for buster, bullseye could use compat >= 13
>  python() {
>      arch = d.getVar('DISTRO_ARCH')
> diff --git a/recipes-python/shtab/python3-shtab_1.5.5-4.bb b/recipes-python/shtab/python3-shtab_1.5.5-3.bb
> similarity index 91%
> rename from recipes-python/shtab/python3-shtab_1.5.5-4.bb
> rename to recipes-python/shtab/python3-shtab_1.5.5-3.bb
> index 7a5cfd2d..f20cdcf7 100644
> --- a/recipes-python/shtab/python3-shtab_1.5.5-4.bb
> +++ b/recipes-python/shtab/python3-shtab_1.5.5-3.bb
> @@ -19,7 +19,7 @@ SRC_URI += " \
>  SRC_URI:append:buster = " \
>      file://0001-Lower-requirements-on-setuptools.patch"
>  
> -SRCREV ="8db4615b2c3ee0a9332b6030687e1179fcfc8670"
> +SRCREV ="3cdca7c8f4ead23c194c4e8a84e2631989e26b3c"
>  
>  # We don't have pristine-tar in this tree hence use this option
>  GBP_EXTRA_OPTIONS = "--git-no-pristine-tar"
Felix Moessbauer Jan. 19, 2024, 8:41 a.m. UTC | #2 
On Thu, 2024-01-18 at 21:18 +0100, Jan Kiszka wrote:
> On 18.01.24 20:50, Jan Kiszka wrote:
> > From: Jan Kiszka <jan.kiszka@siemens.com>
> > 
> > This fixes cross-building and allows to use python3-shtab in
> > bookworm
> > and newer from Debian directly - at least as long as that version
> > does
> > not include the Multi-Arch hint that was recently added and that
> > also
> > our own shtab recipe uses. That one, in turn, is incompatible with
> > the
> > :native suffix that was now added to efibootguard's dependency. We
> > therefore also need to switch our shtab debianization to a version
> > without Multi-Arch yet. What a mess.

Why not simply always build shtab from the latest commit on salsa
(including the Multi-Arch specifier)? Helmut confirmed, that the Multi-
Arch specifier is indeed correct and the way to move forward [1]. By
that, once debian updates, we anyways need to update EBG as well and
remove the :native. Otherwise it becomes FTBFS.

[1] https://lists.debian.org/debian-cross/2024/01/msg00012.html

> > 
> > Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> > ---
> > 
> > I was considering to hold this back until python3-shtab 1.5.5-4 has
> > been 
> > uploaded by Debian but that would delay our CI testing of riscv64 
> > because cross-building python3-shtab for that arch is currently
> > broken.
> > 
> > Note, though, that the generated swupdate image will not boot in
> > qemu
> > because  the 6.1 kernel (just like other upstream kernels) is
> > missing 
> > https://lore.kernel.org/lkml/42c63cb9-87d0-49db-9af8-95771b186684@siemens.com/
> > 
> >  ...bootguard_0.16-1+cip.bb => efibootguard_0.16-3+cip.bb} | 8
> > +++++---
> >  ...{python3-shtab_1.5.5-4.bb => python3-shtab_1.5.5-3.bb} | 2 +-
> >  2 files changed, 6 insertions(+), 4 deletions(-)
> >  rename recipes-bsp/efibootguard/{efibootguard_0.16-1+cip.bb =>
> > efibootguard_0.16-3+cip.bb} (89%)
> >  rename recipes-python/shtab/{python3-shtab_1.5.5-4.bb => python3-
> > shtab_1.5.5-3.bb} (91%)
> > 
> > diff --git a/recipes-bsp/efibootguard/efibootguard_0.16-1+cip.bb
> > b/recipes-bsp/efibootguard/efibootguard_0.16-3+cip.bb
> > similarity index 89%
> > rename from recipes-bsp/efibootguard/efibootguard_0.16-1+cip.bb
> > rename to recipes-bsp/efibootguard/efibootguard_0.16-3+cip.bb
> > index a7ffb00b..83be2a4d 100644
> > --- a/recipes-bsp/efibootguard/efibootguard_0.16-1+cip.bb
> > +++ b/recipes-bsp/efibootguard/efibootguard_0.16-3+cip.bb
> > @@ -1,7 +1,7 @@
> >  #
> >  # CIP Core, generic profile
> >  #
> > -# Copyright (c) Siemens AG, 2020-2023
> > +# Copyright (c) Siemens AG, 2020-2024
> >  #
> >  # Authors:
> >  #  Quirin Gylstorff <quirin.gylstorff@siemens.com>
> > @@ -24,7 +24,7 @@ SRC_URI = " \
> >     
> > file://debian-patches/0001-d-control-Make-compatible-with-debian-buster.patch
> >  \
> >      "
> >  SRC_URI[tarball.sha256sum] =
> > "d6d37c59aed17489d02b4f0b63db16994dfb8f9f70f54be4d65c366f58c6be9d"
> > -SRCREV_debian = "2e80fafa87f8f6fd093f49ff33ad7cac61592871"
> > +SRCREV_debian = "22b173a3293c976c9dff2ae92085d7ed995f6768"
> 
> Someone reset history on salsa, for the master branch - tss, tss. So
> this won't work anymore.

This is indeed bad. Maybe we should create a branch for the cip history
that is stable.

Felix

> 
> Jan
> 
> >  
> >  PROVIDES = "libebgenv-dev libebgenv0 efibootguard"
> >  
> > @@ -34,7 +34,9 @@ PATCHTOOL = "git"
> >  
> >  inherit dpkg
> >  
> > -DEPENDS = "python3-shtab"
> > +DEPENDS:buster = "python3-shtab"
> > +DEPENDS:bullseye = "python3-shtab"
> > +
> >  # needed for buster, bullseye could use compat >= 13
> >  python() {
> >      arch = d.getVar('DISTRO_ARCH')
> > diff --git a/recipes-python/shtab/python3-shtab_1.5.5-4.bb
> > b/recipes-python/shtab/python3-shtab_1.5.5-3.bb
> > similarity index 91%
> > rename from recipes-python/shtab/python3-shtab_1.5.5-4.bb
> > rename to recipes-python/shtab/python3-shtab_1.5.5-3.bb
> > index 7a5cfd2d..f20cdcf7 100644
> > --- a/recipes-python/shtab/python3-shtab_1.5.5-4.bb
> > +++ b/recipes-python/shtab/python3-shtab_1.5.5-3.bb
> > @@ -19,7 +19,7 @@ SRC_URI += " \
> >  SRC_URI:append:buster = " \
> >      file://0001-Lower-requirements-on-setuptools.patch"
> >  
> > -SRCREV ="8db4615b2c3ee0a9332b6030687e1179fcfc8670"
> > +SRCREV ="3cdca7c8f4ead23c194c4e8a84e2631989e26b3c"
> >  
> >  # We don't have pristine-tar in this tree hence use this option
> >  GBP_EXTRA_OPTIONS = "--git-no-pristine-tar"
>
Jan Kiszka Jan. 19, 2024, 9:41 a.m. UTC | #3 
On 19.01.24 09:41, Moessbauer, Felix (T CED OES-DE) wrote:
> On Thu, 2024-01-18 at 21:18 +0100, Jan Kiszka wrote:
>> On 18.01.24 20:50, Jan Kiszka wrote:
>>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>>
>>> This fixes cross-building and allows to use python3-shtab in
>>> bookworm
>>> and newer from Debian directly - at least as long as that version
>>> does
>>> not include the Multi-Arch hint that was recently added and that
>>> also
>>> our own shtab recipe uses. That one, in turn, is incompatible with
>>> the
>>> :native suffix that was now added to efibootguard's dependency. We
>>> therefore also need to switch our shtab debianization to a version
>>> without Multi-Arch yet. What a mess.
> 
> Why not simply always build shtab from the latest commit on salsa
> (including the Multi-Arch specifier)? Helmut confirmed, that the Multi-

https://gitlab.com/cip-project/cip-core/isar-cip-core/-/jobs/5961907081

Jan

> Arch specifier is indeed correct and the way to move forward [1]. By
> that, once debian updates, we anyways need to update EBG as well and
> remove the :native. Otherwise it becomes FTBFS.
> 
> [1] https://lists.debian.org/debian-cross/2024/01/msg00012.html
> 
>>>
>>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>>> ---
>>>
>>> I was considering to hold this back until python3-shtab 1.5.5-4 has
>>> been 
>>> uploaded by Debian but that would delay our CI testing of riscv64 
>>> because cross-building python3-shtab for that arch is currently
>>> broken.
>>>
>>> Note, though, that the generated swupdate image will not boot in
>>> qemu
>>> because  the 6.1 kernel (just like other upstream kernels) is
>>> missing 
>>> https://lore.kernel.org/lkml/42c63cb9-87d0-49db-9af8-95771b186684@siemens.com/
>>>
>>>  ...bootguard_0.16-1+cip.bb => efibootguard_0.16-3+cip.bb} | 8
>>> +++++---
>>>  ...{python3-shtab_1.5.5-4.bb => python3-shtab_1.5.5-3.bb} | 2 +-
>>>  2 files changed, 6 insertions(+), 4 deletions(-)
>>>  rename recipes-bsp/efibootguard/{efibootguard_0.16-1+cip.bb =>
>>> efibootguard_0.16-3+cip.bb} (89%)
>>>  rename recipes-python/shtab/{python3-shtab_1.5.5-4.bb => python3-
>>> shtab_1.5.5-3.bb} (91%)
>>>
>>> diff --git a/recipes-bsp/efibootguard/efibootguard_0.16-1+cip.bb
>>> b/recipes-bsp/efibootguard/efibootguard_0.16-3+cip.bb
>>> similarity index 89%
>>> rename from recipes-bsp/efibootguard/efibootguard_0.16-1+cip.bb
>>> rename to recipes-bsp/efibootguard/efibootguard_0.16-3+cip.bb
>>> index a7ffb00b..83be2a4d 100644
>>> --- a/recipes-bsp/efibootguard/efibootguard_0.16-1+cip.bb
>>> +++ b/recipes-bsp/efibootguard/efibootguard_0.16-3+cip.bb
>>> @@ -1,7 +1,7 @@
>>>  #
>>>  # CIP Core, generic profile
>>>  #
>>> -# Copyright (c) Siemens AG, 2020-2023
>>> +# Copyright (c) Siemens AG, 2020-2024
>>>  #
>>>  # Authors:
>>>  #  Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>> @@ -24,7 +24,7 @@ SRC_URI = " \
>>>     
>>> file://debian-patches/0001-d-control-Make-compatible-with-debian-buster.patch
>>>  \
>>>      "
>>>  SRC_URI[tarball.sha256sum] =
>>> "d6d37c59aed17489d02b4f0b63db16994dfb8f9f70f54be4d65c366f58c6be9d"
>>> -SRCREV_debian = "2e80fafa87f8f6fd093f49ff33ad7cac61592871"
>>> +SRCREV_debian = "22b173a3293c976c9dff2ae92085d7ed995f6768"
>>
>> Someone reset history on salsa, for the master branch - tss, tss. So
>> this won't work anymore.
> 
> This is indeed bad. Maybe we should create a branch for the cip history
> that is stable.
> 
> Felix
> 
>>
>> Jan
>>
>>>  
>>>  PROVIDES = "libebgenv-dev libebgenv0 efibootguard"
>>>  
>>> @@ -34,7 +34,9 @@ PATCHTOOL = "git"
>>>  
>>>  inherit dpkg
>>>  
>>> -DEPENDS = "python3-shtab"
>>> +DEPENDS:buster = "python3-shtab"
>>> +DEPENDS:bullseye = "python3-shtab"
>>> +
>>>  # needed for buster, bullseye could use compat >= 13
>>>  python() {
>>>      arch = d.getVar('DISTRO_ARCH')
>>> diff --git a/recipes-python/shtab/python3-shtab_1.5.5-4.bb
>>> b/recipes-python/shtab/python3-shtab_1.5.5-3.bb
>>> similarity index 91%
>>> rename from recipes-python/shtab/python3-shtab_1.5.5-4.bb
>>> rename to recipes-python/shtab/python3-shtab_1.5.5-3.bb
>>> index 7a5cfd2d..f20cdcf7 100644
>>> --- a/recipes-python/shtab/python3-shtab_1.5.5-4.bb
>>> +++ b/recipes-python/shtab/python3-shtab_1.5.5-3.bb
>>> @@ -19,7 +19,7 @@ SRC_URI += " \
>>>  SRC_URI:append:buster = " \
>>>      file://0001-Lower-requirements-on-setuptools.patch"
>>>  
>>> -SRCREV ="8db4615b2c3ee0a9332b6030687e1179fcfc8670"
>>> +SRCREV ="3cdca7c8f4ead23c194c4e8a84e2631989e26b3c"
>>>  
>>>  # We don't have pristine-tar in this tree hence use this option
>>>  GBP_EXTRA_OPTIONS = "--git-no-pristine-tar"
>>
>
Gylstorff Quirin Jan. 19, 2024, 9:46 a.m. UTC | #4 
On 1/18/24 21:18, Jan Kiszka wrote:
> On 18.01.24 20:50, Jan Kiszka wrote:
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> This fixes cross-building and allows to use python3-shtab in bookworm
>> and newer from Debian directly - at least as long as that version does
>> not include the Multi-Arch hint that was recently added and that also
>> our own shtab recipe uses. That one, in turn, is incompatible with the
>> :native suffix that was now added to efibootguard's dependency. We
>> therefore also need to switch our shtab debianization to a version
>> without Multi-Arch yet. What a mess.
>>
>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
>>
>> I was considering to hold this back until python3-shtab 1.5.5-4 has been
>> uploaded by Debian but that would delay our CI testing of riscv64
>> because cross-building python3-shtab for that arch is currently broken.
>>
>> Note, though, that the generated swupdate image will not boot in qemu
>> because  the 6.1 kernel (just like other upstream kernels) is missing
>> https://lore.kernel.org/lkml/42c63cb9-87d0-49db-9af8-95771b186684@siemens.com/
>>
>>   ...bootguard_0.16-1+cip.bb => efibootguard_0.16-3+cip.bb} | 8 +++++---
>>   ...{python3-shtab_1.5.5-4.bb => python3-shtab_1.5.5-3.bb} | 2 +-
>>   2 files changed, 6 insertions(+), 4 deletions(-)
>>   rename recipes-bsp/efibootguard/{efibootguard_0.16-1+cip.bb => efibootguard_0.16-3+cip.bb} (89%)
>>   rename recipes-python/shtab/{python3-shtab_1.5.5-4.bb => python3-shtab_1.5.5-3.bb} (91%)
>>
>> diff --git a/recipes-bsp/efibootguard/efibootguard_0.16-1+cip.bb b/recipes-bsp/efibootguard/efibootguard_0.16-3+cip.bb
>> similarity index 89%
>> rename from recipes-bsp/efibootguard/efibootguard_0.16-1+cip.bb
>> rename to recipes-bsp/efibootguard/efibootguard_0.16-3+cip.bb
>> index a7ffb00b..83be2a4d 100644
>> --- a/recipes-bsp/efibootguard/efibootguard_0.16-1+cip.bb
>> +++ b/recipes-bsp/efibootguard/efibootguard_0.16-3+cip.bb
>> @@ -1,7 +1,7 @@
>>   #
>>   # CIP Core, generic profile
>>   #
>> -# Copyright (c) Siemens AG, 2020-2023
>> +# Copyright (c) Siemens AG, 2020-2024
>>   #
>>   # Authors:
>>   #  Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> @@ -24,7 +24,7 @@ SRC_URI = " \
>>       file://debian-patches/0001-d-control-Make-compatible-with-debian-buster.patch \
>>       "
>>   SRC_URI[tarball.sha256sum] = "d6d37c59aed17489d02b4f0b63db16994dfb8f9f70f54be4d65c366f58c6be9d"
>> -SRCREV_debian = "2e80fafa87f8f6fd093f49ff33ad7cac61592871"
>> +SRCREV_debian = "22b173a3293c976c9dff2ae92085d7ed995f6768"
> 
> Someone reset history on salsa, for the master branch - tss, tss. So
> this won't work anymore.
> 

Sorry this was due to uploading efibootguard-0.16-1.

Quirin

> Jan
> 
>>   
>>   PROVIDES = "libebgenv-dev libebgenv0 efibootguard"
>>   
>> @@ -34,7 +34,9 @@ PATCHTOOL = "git"
>>   
>>   inherit dpkg
>>   
>> -DEPENDS = "python3-shtab"
>> +DEPENDS:buster = "python3-shtab"
>> +DEPENDS:bullseye = "python3-shtab"
>> +
>>   # needed for buster, bullseye could use compat >= 13
>>   python() {
>>       arch = d.getVar('DISTRO_ARCH')
>> diff --git a/recipes-python/shtab/python3-shtab_1.5.5-4.bb b/recipes-python/shtab/python3-shtab_1.5.5-3.bb
>> similarity index 91%
>> rename from recipes-python/shtab/python3-shtab_1.5.5-4.bb
>> rename to recipes-python/shtab/python3-shtab_1.5.5-3.bb
>> index 7a5cfd2d..f20cdcf7 100644
>> --- a/recipes-python/shtab/python3-shtab_1.5.5-4.bb
>> +++ b/recipes-python/shtab/python3-shtab_1.5.5-3.bb
>> @@ -19,7 +19,7 @@ SRC_URI += " \
>>   SRC_URI:append:buster = " \
>>       file://0001-Lower-requirements-on-setuptools.patch"
>>   
>> -SRCREV ="8db4615b2c3ee0a9332b6030687e1179fcfc8670"
>> +SRCREV ="3cdca7c8f4ead23c194c4e8a84e2631989e26b3c"
>>   
>>   # We don't have pristine-tar in this tree hence use this option
>>   GBP_EXTRA_OPTIONS = "--git-no-pristine-tar"
>
diff mbox series

Patch

diff --git a/recipes-bsp/efibootguard/efibootguard_0.16-1+cip.bb b/recipes-bsp/efibootguard/efibootguard_0.16-3+cip.bb
similarity index 89%
rename from recipes-bsp/efibootguard/efibootguard_0.16-1+cip.bb
rename to recipes-bsp/efibootguard/efibootguard_0.16-3+cip.bb
index a7ffb00b..83be2a4d 100644
--- a/recipes-bsp/efibootguard/efibootguard_0.16-1+cip.bb
+++ b/recipes-bsp/efibootguard/efibootguard_0.16-3+cip.bb
@@ -1,7 +1,7 @@ 
 #
 # CIP Core, generic profile
 #
-# Copyright (c) Siemens AG, 2020-2023
+# Copyright (c) Siemens AG, 2020-2024
 #
 # Authors:
 #  Quirin Gylstorff <quirin.gylstorff@siemens.com>
@@ -24,7 +24,7 @@  SRC_URI = " \
     file://debian-patches/0001-d-control-Make-compatible-with-debian-buster.patch \
     "
 SRC_URI[tarball.sha256sum] = "d6d37c59aed17489d02b4f0b63db16994dfb8f9f70f54be4d65c366f58c6be9d"
-SRCREV_debian = "2e80fafa87f8f6fd093f49ff33ad7cac61592871"
+SRCREV_debian = "22b173a3293c976c9dff2ae92085d7ed995f6768"
 
 PROVIDES = "libebgenv-dev libebgenv0 efibootguard"
 
@@ -34,7 +34,9 @@  PATCHTOOL = "git"
 
 inherit dpkg
 
-DEPENDS = "python3-shtab"
+DEPENDS:buster = "python3-shtab"
+DEPENDS:bullseye = "python3-shtab"
+
 # needed for buster, bullseye could use compat >= 13
 python() {
     arch = d.getVar('DISTRO_ARCH')
diff --git a/recipes-python/shtab/python3-shtab_1.5.5-4.bb b/recipes-python/shtab/python3-shtab_1.5.5-3.bb
similarity index 91%
rename from recipes-python/shtab/python3-shtab_1.5.5-4.bb
rename to recipes-python/shtab/python3-shtab_1.5.5-3.bb
index 7a5cfd2d..f20cdcf7 100644
--- a/recipes-python/shtab/python3-shtab_1.5.5-4.bb
+++ b/recipes-python/shtab/python3-shtab_1.5.5-3.bb
@@ -19,7 +19,7 @@  SRC_URI += " \
 SRC_URI:append:buster = " \
     file://0001-Lower-requirements-on-setuptools.patch"
 
-SRCREV ="8db4615b2c3ee0a9332b6030687e1179fcfc8670"
+SRCREV ="3cdca7c8f4ead23c194c4e8a84e2631989e26b3c"
 
 # We don't have pristine-tar in this tree hence use this option
 GBP_EXTRA_OPTIONS = "--git-no-pristine-tar"