libubootenv: Update to 0.3.5

Message ID 20240103102305.823320-1-Quirin.Gylstorff@siemens.com
State Superseded, archived
Headers show
Series libubootenv: Update to 0.3.5 | expand

Commit Message

Quirin Gylstorff Jan. 3, 2024, 10:19 a.m. UTC
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

Update to latest version in debian salsa.
Use dpkg as pristine-tar is no longer in use.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
 ...ootenv_0.3-3.bb => libubootenv_0.3.5-0.1.bb} | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)
 rename meta/recipes-bsp/libubootenv/{libubootenv_0.3-3.bb => libubootenv_0.3.5-0.1.bb} (65%)

Comments

Jan Kiszka Jan. 3, 2024, 10:39 a.m. UTC | #1
On 03.01.24 11:19, 'Quirin Gylstorff' via isar-users wrote:
> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> 
> Update to latest version in debian salsa.
> Use dpkg as pristine-tar is no longer in use.

What features does this update bring? Should it (also/rather) be a
bookworm-backports topic?

Jan

> 
> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
> ---
>  ...ootenv_0.3-3.bb => libubootenv_0.3.5-0.1.bb} | 17 ++++++++++++-----
>  1 file changed, 12 insertions(+), 5 deletions(-)
>  rename meta/recipes-bsp/libubootenv/{libubootenv_0.3-3.bb => libubootenv_0.3.5-0.1.bb} (65%)
> 
> diff --git a/meta/recipes-bsp/libubootenv/libubootenv_0.3-3.bb b/meta/recipes-bsp/libubootenv/libubootenv_0.3.5-0.1.bb
> similarity index 65%
> rename from meta/recipes-bsp/libubootenv/libubootenv_0.3-3.bb
> rename to meta/recipes-bsp/libubootenv/libubootenv_0.3.5-0.1.bb
> index dee19c0b..08eab73c 100644
> --- a/meta/recipes-bsp/libubootenv/libubootenv_0.3-3.bb
> +++ b/meta/recipes-bsp/libubootenv/libubootenv_0.3.5-0.1.bb
> @@ -12,11 +12,18 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260
>  
>  PROVIDES = "libubootenv-tool libubootenv-dev libubootenv-doc libubootenv0.1"
>  
> -inherit dpkg-gbp
> +inherit dpkg
>  
> -SRC_URI = "git://salsa.debian.org/debian/libubootenv.git;protocol=https;branch=master"
> -SRCREV = "a1a3504e5cda1883928a8747a0bedc56afff6910"
> -
> -S = "${WORKDIR}/git"
> +SRC_URI = "git://salsa.debian.org/debian/libubootenv.git;protocol=https;branch=master;destsuffix=${P}"
> +SRCREV = "32dcabeea9ed5342a2d1bb254bb4839e2e68ee5e"
>  
>  DEB_BUILD_OPTIONS += "nocheck"
> +
> +
> +CHANGELOG_V ?= "${PV}+isar-${SRCREV}"
> +
> +do_prepare_build() {
> +    deb_add_changelog
> +    cd ${WORKDIR}
> +    tar cJf ${PN}_${PV}+isar.orig.tar.xz --exclude=.git --exclude=debian ${P}
> +}
Quirin Gylstorff Jan. 3, 2024, 2:09 p.m. UTC | #2
On 1/3/24 11:39, Jan Kiszka wrote:
> On 03.01.24 11:19, 'Quirin Gylstorff' via isar-users wrote:
>> From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>>
>> Update to latest version in debian salsa.
>> Use dpkg as pristine-tar is no longer in use.
> 
> What features does this update bring? Should it (also/rather) be a
> bookworm-backports topic?


Backports need to be requested from the maintainer and still leave 
previous Debian release alone.

If we go that route we should delete the recipe from ISAR as it is 
outdated and will interfere with the packages provided by Debian.

The new feature are:
    - 0.3.5 release notes[1]:

     Fix slowness on SPI flash
     Fixes validating Env flags
     Feature: get U-Boot namespace from DT
     Feature: specify UBI volumes from MTD path
   - 0.3.4 release notes[2]:

     Fixes
     Add namespace for multiple environment
     Add new config format based on YAML



[1]: https://github.com/sbabic/libubootenv/releases/tag/v0.3.5
[2]: https://github.com/sbabic/libubootenv/releases/tag/v0.3.4

Quirin

> 
> Jan
> 
>>
>> Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
>> ---
>>   ...ootenv_0.3-3.bb => libubootenv_0.3.5-0.1.bb} | 17 ++++++++++++-----
>>   1 file changed, 12 insertions(+), 5 deletions(-)
>>   rename meta/recipes-bsp/libubootenv/{libubootenv_0.3-3.bb => libubootenv_0.3.5-0.1.bb} (65%)
>>
>> diff --git a/meta/recipes-bsp/libubootenv/libubootenv_0.3-3.bb b/meta/recipes-bsp/libubootenv/libubootenv_0.3.5-0.1.bb
>> similarity index 65%
>> rename from meta/recipes-bsp/libubootenv/libubootenv_0.3-3.bb
>> rename to meta/recipes-bsp/libubootenv/libubootenv_0.3.5-0.1.bb
>> index dee19c0b..08eab73c 100644
>> --- a/meta/recipes-bsp/libubootenv/libubootenv_0.3-3.bb
>> +++ b/meta/recipes-bsp/libubootenv/libubootenv_0.3.5-0.1.bb
>> @@ -12,11 +12,18 @@ LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260
>>   
>>   PROVIDES = "libubootenv-tool libubootenv-dev libubootenv-doc libubootenv0.1"
>>   
>> -inherit dpkg-gbp
>> +inherit dpkg
>>   
>> -SRC_URI = "git://salsa.debian.org/debian/libubootenv.git;protocol=https;branch=master"
>> -SRCREV = "a1a3504e5cda1883928a8747a0bedc56afff6910"
>> -
>> -S = "${WORKDIR}/git"
>> +SRC_URI = "git://salsa.debian.org/debian/libubootenv.git;protocol=https;branch=master;destsuffix=${P}"
>> +SRCREV = "32dcabeea9ed5342a2d1bb254bb4839e2e68ee5e"
>>   
>>   DEB_BUILD_OPTIONS += "nocheck"
>> +
>> +
>> +CHANGELOG_V ?= "${PV}+isar-${SRCREV}"
>> +
>> +do_prepare_build() {
>> +    deb_add_changelog
>> +    cd ${WORKDIR}
>> +    tar cJf ${PN}_${PV}+isar.orig.tar.xz --exclude=.git --exclude=debian ${P}
>> +}
>
Michael Adler Jan. 4, 2024, 8:46 a.m. UTC | #3
Hi Jan,
  
> What features does this update bring? Should it (also/rather) be a
> bookworm-backports topic?

it also provides the function libuboot_get_namespace which is now
unconditionally required by the latest (2023.12) SWUpdate.

Kind regards,
Michael
Jan Kiszka Jan. 4, 2024, 9:10 a.m. UTC | #4
On 04.01.24 09:46, Michael Adler wrote:
> Hi Jan,
>   
>> What features does this update bring? Should it (also/rather) be a
>> bookworm-backports topic?
> 
> it also provides the function libuboot_get_namespace which is now
> unconditionally required by the latest (2023.12) SWUpdate.
> 

OK, then let's improve the commit message.

Jan

Patch

diff --git a/meta/recipes-bsp/libubootenv/libubootenv_0.3-3.bb b/meta/recipes-bsp/libubootenv/libubootenv_0.3.5-0.1.bb
similarity index 65%
rename from meta/recipes-bsp/libubootenv/libubootenv_0.3-3.bb
rename to meta/recipes-bsp/libubootenv/libubootenv_0.3.5-0.1.bb
index dee19c0b..08eab73c 100644
--- a/meta/recipes-bsp/libubootenv/libubootenv_0.3-3.bb
+++ b/meta/recipes-bsp/libubootenv/libubootenv_0.3.5-0.1.bb
@@ -12,11 +12,18 @@  LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260
 
 PROVIDES = "libubootenv-tool libubootenv-dev libubootenv-doc libubootenv0.1"
 
-inherit dpkg-gbp
+inherit dpkg
 
-SRC_URI = "git://salsa.debian.org/debian/libubootenv.git;protocol=https;branch=master"
-SRCREV = "a1a3504e5cda1883928a8747a0bedc56afff6910"
-
-S = "${WORKDIR}/git"
+SRC_URI = "git://salsa.debian.org/debian/libubootenv.git;protocol=https;branch=master;destsuffix=${P}"
+SRCREV = "32dcabeea9ed5342a2d1bb254bb4839e2e68ee5e"
 
 DEB_BUILD_OPTIONS += "nocheck"
+
+
+CHANGELOG_V ?= "${PV}+isar-${SRCREV}"
+
+do_prepare_build() {
+    deb_add_changelog
+    cd ${WORKDIR}
+    tar cJf ${PN}_${PV}+isar.orig.tar.xz --exclude=.git --exclude=debian ${P}
+}