[isar-cip-core][PATCH] efibootguard: Update to 0.14

[isar-cip-core][PATCH] efibootguard: Update to 0.14

[Jan Kiszka]

From: Jan Kiszka <jan.kiszka@siemens.com>

Allows to drop the RISC-V patch.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 ...0.13+cip.bb => efibootguard_0.14-1+cip.bb} | 13 +------
 ...01-add-machine-type-name-for-riscv64.patch | 39 -------------------
 2 files changed, 2 insertions(+), 50 deletions(-)
 rename recipes-bsp/efibootguard/{efibootguard_0.13+cip.bb => efibootguard_0.14-1+cip.bb} (78%)
 delete mode 100644 recipes-bsp/efibootguard/files/src-patches/0001-add-machine-type-name-for-riscv64.patch

diff --git a/recipes-bsp/efibootguard/efibootguard_0.13+cip.bb b/recipes-bsp/efibootguard/efibootguard_0.14-1+cip.bb
similarity index 78%
rename from recipes-bsp/efibootguard/efibootguard_0.13+cip.bb
rename to recipes-bsp/efibootguard/efibootguard_0.14-1+cip.bb
index 9fc15a47..f58a3200 100644
--- a/recipes-bsp/efibootguard/efibootguard_0.13+cip.bb
+++ b/recipes-bsp/efibootguard/efibootguard_0.14-1+cip.bb
@@ -17,18 +17,13 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260
 MAINTAINER = "Jan Kiszka <jan.kiszka@siemens.com>"
 
 SRC_URI = " \
-    https://github.com/siemens/efibootguard/archive/refs/tags/v0.13.tar.gz;downloadfilename=efibootguard_0.13.orig.tar.gz;unpack=0;name=tarball \
+    https://github.com/siemens/efibootguard/archive/refs/tags/v0.14.tar.gz;downloadfilename=efibootguard_0.14.orig.tar.gz;unpack=0;name=tarball \
     git://salsa.debian.org/debian/efibootguard.git;protocol=https;branch=master;name=debian \
     file://debian-patches/0001-d-control-Make-compatible-with-debian-buster.patch \
     "
-SRC_URI[tarball.sha256sum] = "639a6d8f687cb099b2e9b01eb08ad1494267fe26b5d903b4d405d0737feb989b"
+SRC_URI[tarball.sha256sum] = "80452a9e37460708113292daf0050d3f4fa7d3d4b8b2308620701112cf18eaa1"
 SRCREV_debian = "e39728f63946d1af2d5edbecd89a30706dc31a9a"
 
-# add riscv64 support
-SRC_URI += "file://src-patches"
-
-CHANGELOG_V = "${PV}+cip"
-
 PROVIDES = "libebgenv-dev libebgenv0 efibootguard"
 
 S = "${WORKDIR}/git"
@@ -46,10 +41,6 @@ python() {
         d.setVar('DEB_HOST_MULTIARCH', proc.read())
 }
 
-CHANGELOG_V = "<orig-version>+isar"
-
 do_prepare_build() {
     deb_add_changelog
-    cd ${S}/debian
-    quilt import ${WORKDIR}/src-patches/*.patch
 }
diff --git a/recipes-bsp/efibootguard/files/src-patches/0001-add-machine-type-name-for-riscv64.patch b/recipes-bsp/efibootguard/files/src-patches/0001-add-machine-type-name-for-riscv64.patch
deleted file mode 100644
index adc7962c..00000000
--- a/recipes-bsp/efibootguard/files/src-patches/0001-add-machine-type-name-for-riscv64.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 391dd5e04b17be6f5184afb2de4853795f1d5620 Mon Sep 17 00:00:00 2001
-From: Felix Moessbauer <felix.moessbauer@siemens.com>
-Date: Tue, 31 Jan 2023 09:27:31 +0100
-Subject: [PATCH 1/1] add machine type name for riscv64
-
-By adding the machine type name, the generated efi binary for
-riscv64 is suffixed with the corresponding efi machine name.
-
-Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
-Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
----
- configure.ac | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index d8f9d3a..90d70b0 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -87,6 +87,7 @@ SET_ARCH(X86_64, x86_64*)
- SET_ARCH(IA64, ia64*)
- SET_ARCH(AARCH64, aarch64*)
- SET_ARCH(ARM, arm*)
-+SET_ARCH(RISCV64, riscv64*)
- 
- ARCH=$(echo $host | sed "s/\(-\).*$//")
- 
-@@ -103,6 +104,9 @@ AM_COND_IF(ARCH_AARCH64, [
- AM_COND_IF(ARCH_ARM, [
- 	   MACHINE_TYPE_NAME=arm])
- 
-+AM_COND_IF(ARCH_RISCV64, [
-+	   MACHINE_TYPE_NAME=riscv64])
-+
- AC_SUBST([ARCH])
- AC_SUBST([MACHINE_TYPE_NAME])
- AM_CONDITIONAL([ARCH_IS_X86], [test "$ARCH" = "ia32" -o "$ARCH" = "x86_64"])
--- 
-2.30.2
-
-- 
2.35.3

Re: [isar-cip-core][PATCH] efibootguard: Update to 0.14

[Gylstorff Quirin]

On 6/17/23 15:09, Jan Kiszka wrote:
> From: Jan Kiszka <jan.kiszka@siemens.com>
> 
> Allows to drop the RISC-V patch.
> 
> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ---
>   ...0.13+cip.bb => efibootguard_0.14-1+cip.bb} | 13 +------
>   ...01-add-machine-type-name-for-riscv64.patch | 39 -------------------
>   2 files changed, 2 insertions(+), 50 deletions(-)
>   rename recipes-bsp/efibootguard/{efibootguard_0.13+cip.bb => efibootguard_0.14-1+cip.bb} (78%)
>   delete mode 100644 recipes-bsp/efibootguard/files/src-patches/0001-add-machine-type-name-for-riscv64.patch
> 
> diff --git a/recipes-bsp/efibootguard/efibootguard_0.13+cip.bb b/recipes-bsp/efibootguard/efibootguard_0.14-1+cip.bb
> similarity index 78%
> rename from recipes-bsp/efibootguard/efibootguard_0.13+cip.bb
> rename to recipes-bsp/efibootguard/efibootguard_0.14-1+cip.bb
> index 9fc15a47..f58a3200 100644
> --- a/recipes-bsp/efibootguard/efibootguard_0.13+cip.bb
> +++ b/recipes-bsp/efibootguard/efibootguard_0.14-1+cip.bb
> @@ -17,18 +17,13 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260
>   MAINTAINER = "Jan Kiszka <jan.kiszka@siemens.com>"
>   
>   SRC_URI = " \
> -    https://github.com/siemens/efibootguard/archive/refs/tags/v0.13.tar.gz;downloadfilename=efibootguard_0.13.orig.tar.gz;unpack=0;name=tarball \
> +    https://github.com/siemens/efibootguard/archive/refs/tags/v0.14.tar.gz;downloadfilename=efibootguard_0.14.orig.tar.gz;unpack=0;name=tarball \
I would not use downloadfile to create the orig tarbal. Reason is that 
the usage of downloadfilename currently breaks mirrors, see bug report 
https://bugzilla.yoctoproject.org/show_bug.cgi?id=15126.

Quirin

>       git://salsa.debian.org/debian/efibootguard.git;protocol=https;branch=master;name=debian \
>       file://debian-patches/0001-d-control-Make-compatible-with-debian-buster.patch \
>       "
> -SRC_URI[tarball.sha256sum] = "639a6d8f687cb099b2e9b01eb08ad1494267fe26b5d903b4d405d0737feb989b"
> +SRC_URI[tarball.sha256sum] = "80452a9e37460708113292daf0050d3f4fa7d3d4b8b2308620701112cf18eaa1"
>   SRCREV_debian = "e39728f63946d1af2d5edbecd89a30706dc31a9a"
>   
> -# add riscv64 support
> -SRC_URI += "file://src-patches"
> -
> -CHANGELOG_V = "${PV}+cip"
> -
>   PROVIDES = "libebgenv-dev libebgenv0 efibootguard"
>   
>   S = "${WORKDIR}/git"
> @@ -46,10 +41,6 @@ python() {
>           d.setVar('DEB_HOST_MULTIARCH', proc.read())
>   }
>   
> -CHANGELOG_V = "<orig-version>+isar"
> -
>   do_prepare_build() {
>       deb_add_changelog
> -    cd ${S}/debian
> -    quilt import ${WORKDIR}/src-patches/*.patch
>   }
> diff --git a/recipes-bsp/efibootguard/files/src-patches/0001-add-machine-type-name-for-riscv64.patch b/recipes-bsp/efibootguard/files/src-patches/0001-add-machine-type-name-for-riscv64.patch
> deleted file mode 100644
> index adc7962c..00000000
> --- a/recipes-bsp/efibootguard/files/src-patches/0001-add-machine-type-name-for-riscv64.patch
> +++ /dev/null
> @@ -1,39 +0,0 @@
> -From 391dd5e04b17be6f5184afb2de4853795f1d5620 Mon Sep 17 00:00:00 2001
> -From: Felix Moessbauer <felix.moessbauer@siemens.com>
> -Date: Tue, 31 Jan 2023 09:27:31 +0100
> -Subject: [PATCH 1/1] add machine type name for riscv64
> -
> -By adding the machine type name, the generated efi binary for
> -riscv64 is suffixed with the corresponding efi machine name.
> -
> -Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
> -Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
> ----
> - configure.ac | 4 ++++
> - 1 file changed, 4 insertions(+)
> -
> -diff --git a/configure.ac b/configure.ac
> -index d8f9d3a..90d70b0 100644
> ---- a/configure.ac
> -+++ b/configure.ac
> -@@ -87,6 +87,7 @@ SET_ARCH(X86_64, x86_64*)
> - SET_ARCH(IA64, ia64*)
> - SET_ARCH(AARCH64, aarch64*)
> - SET_ARCH(ARM, arm*)
> -+SET_ARCH(RISCV64, riscv64*)
> -
> - ARCH=$(echo $host | sed "s/\(-\).*$//")
> -
> -@@ -103,6 +104,9 @@ AM_COND_IF(ARCH_AARCH64, [
> - AM_COND_IF(ARCH_ARM, [
> - 	   MACHINE_TYPE_NAME=arm])
> -
> -+AM_COND_IF(ARCH_RISCV64, [
> -+	   MACHINE_TYPE_NAME=riscv64])
> -+
> - AC_SUBST([ARCH])
> - AC_SUBST([MACHINE_TYPE_NAME])
> - AM_CONDITIONAL([ARCH_IS_X86], [test "$ARCH" = "ia32" -o "$ARCH" = "x86_64"])
> ---
> -2.30.2
> -

Re: [isar-cip-core][PATCH] efibootguard: Update to 0.14

[Jan Kiszka]

On 19.06.23 15:29, Gylstorff Quirin wrote:
> 
> 
> On 6/17/23 15:09, Jan Kiszka wrote:
>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>
>> Allows to drop the RISC-V patch.
>>
>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>> ---
>>   ...0.13+cip.bb => efibootguard_0.14-1+cip.bb} | 13 +------
>>   ...01-add-machine-type-name-for-riscv64.patch | 39 -------------------
>>   2 files changed, 2 insertions(+), 50 deletions(-)
>>   rename recipes-bsp/efibootguard/{efibootguard_0.13+cip.bb =>
>> efibootguard_0.14-1+cip.bb} (78%)
>>   delete mode 100644
>> recipes-bsp/efibootguard/files/src-patches/0001-add-machine-type-name-for-riscv64.patch
>>
>> diff --git a/recipes-bsp/efibootguard/efibootguard_0.13+cip.bb
>> b/recipes-bsp/efibootguard/efibootguard_0.14-1+cip.bb
>> similarity index 78%
>> rename from recipes-bsp/efibootguard/efibootguard_0.13+cip.bb
>> rename to recipes-bsp/efibootguard/efibootguard_0.14-1+cip.bb
>> index 9fc15a47..f58a3200 100644
>> --- a/recipes-bsp/efibootguard/efibootguard_0.13+cip.bb
>> +++ b/recipes-bsp/efibootguard/efibootguard_0.14-1+cip.bb
>> @@ -17,18 +17,13 @@ LIC_FILES_CHKSUM =
>> "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260
>>   MAINTAINER = "Jan Kiszka <jan.kiszka@siemens.com>"
>>     SRC_URI = " \
>> -   
>> https://github.com/siemens/efibootguard/archive/refs/tags/v0.13.tar.gz;downloadfilename=efibootguard_0.13.orig.tar.gz;unpack=0;name=tarball \
>> +   
>> https://github.com/siemens/efibootguard/archive/refs/tags/v0.14.tar.gz;downloadfilename=efibootguard_0.14.orig.tar.gz;unpack=0;name=tarball \
> I would not use downloadfile to create the orig tarbal. Reason is that
> the usage of downloadfilename currently breaks mirrors, see bug report
> https://bugzilla.yoctoproject.org/show_bug.cgi?id=15126.
> 

You mean rename the file in do_prepare_build?

But that's not really a regression of this update ;).

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux

Re: [isar-cip-core][PATCH] efibootguard: Update to 0.14

[Jan Kiszka]

On 19.06.23 15:42, Jan Kiszka wrote:
> On 19.06.23 15:29, Gylstorff Quirin wrote:
>>
>>
>> On 6/17/23 15:09, Jan Kiszka wrote:
>>> From: Jan Kiszka <jan.kiszka@siemens.com>
>>>
>>> Allows to drop the RISC-V patch.
>>>
>>> Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
>>> ---
>>>   ...0.13+cip.bb => efibootguard_0.14-1+cip.bb} | 13 +------
>>>   ...01-add-machine-type-name-for-riscv64.patch | 39 -------------------
>>>   2 files changed, 2 insertions(+), 50 deletions(-)
>>>   rename recipes-bsp/efibootguard/{efibootguard_0.13+cip.bb =>
>>> efibootguard_0.14-1+cip.bb} (78%)
>>>   delete mode 100644
>>> recipes-bsp/efibootguard/files/src-patches/0001-add-machine-type-name-for-riscv64.patch
>>>
>>> diff --git a/recipes-bsp/efibootguard/efibootguard_0.13+cip.bb
>>> b/recipes-bsp/efibootguard/efibootguard_0.14-1+cip.bb
>>> similarity index 78%
>>> rename from recipes-bsp/efibootguard/efibootguard_0.13+cip.bb
>>> rename to recipes-bsp/efibootguard/efibootguard_0.14-1+cip.bb
>>> index 9fc15a47..f58a3200 100644
>>> --- a/recipes-bsp/efibootguard/efibootguard_0.13+cip.bb
>>> +++ b/recipes-bsp/efibootguard/efibootguard_0.14-1+cip.bb
>>> @@ -17,18 +17,13 @@ LIC_FILES_CHKSUM =
>>> "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260
>>>   MAINTAINER = "Jan Kiszka <jan.kiszka@siemens.com>"
>>>     SRC_URI = " \
>>> -   
>>> https://github.com/siemens/efibootguard/archive/refs/tags/v0.13.tar.gz;downloadfilename=efibootguard_0.13.orig.tar.gz;unpack=0;name=tarball \
>>> +   
>>> https://github.com/siemens/efibootguard/archive/refs/tags/v0.14.tar.gz;downloadfilename=efibootguard_0.14.orig.tar.gz;unpack=0;name=tarball \
>> I would not use downloadfile to create the orig tarbal. Reason is that
>> the usage of downloadfilename currently breaks mirrors, see bug report
>> https://bugzilla.yoctoproject.org/show_bug.cgi?id=15126.
>>
> 
> You mean rename the file in do_prepare_build?
> 
> But that's not really a regression of this update ;).
> 

And it would leave some "v0.14.tar.gz" file in the download folder,
waiting for collisions - we really need a real bitbake fix.

Jan

-- 
Siemens AG, Technology
Competence Center Embedded Linux