diff mbox series

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

Message ID 2bb4e18b-20bd-4dd0-9301-fb08aea7a730@siemens.com (mailing list archive)
State Superseded
Headers show
Series [isar-cip-core] efibootguard: Update to latest debianization | expand

Commit Message

Jan Kiszka Jan. 16, 2024, 1:32 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.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 ...bootguard_0.16-1+cip.bb => efibootguard_0.16-3+cip.bb} | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)
 rename recipes-bsp/efibootguard/{efibootguard_0.16-1+cip.bb => efibootguard_0.16-3+cip.bb} (89%)

Comments

Quirin Gylstorff Jan. 16, 2024, 3:17 p.m. UTC | #1 
On 1/16/24 14:32, 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.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>   ...bootguard_0.16-1+cip.bb => efibootguard_0.16-3+cip.bb} | 8 +++++---
>   1 file changed, 5 insertions(+), 3 deletions(-)
>   rename recipes-bsp/efibootguard/{efibootguard_0.16-1+cip.bb => efibootguard_0.16-3+cip.bb} (89%)
> 
> 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"
I think :native will fail for buster.

Kind regards,
Quirin

> +
>   # needed for buster, bullseye could use compat >= 13
>   python() {
>       arch = d.getVar('DISTRO_ARCH')
Jan Kiszka Jan. 16, 2024, 4:24 p.m. UTC | #2 
On 16.01.24 16:17, Gylstorff Quirin wrote:
> 
> 
> On 1/16/24 14:32, 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.
>>
>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
>>   ...bootguard_0.16-1+cip.bb => efibootguard_0.16-3+cip.bb} | 8 +++++---
>>   1 file changed, 5 insertions(+), 3 deletions(-)
>>   rename recipes-bsp/efibootguard/{efibootguard_0.16-1+cip.bb =>
>> efibootguard_0.16-3+cip.bb} (89%)
>>
>> 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"
> I think :native will fail for buster.
> 

Yes, and that even for bullseye. I'm not yet understanding why that
breaks - limitation of those apt/dpkg versions?

Jan
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')