Skip to contentSkip to conversation

libubootenv: uprev to v0.3

PATCH Superseded Ming Liu 4 participants 10 messages Aug 13, 2020 – Aug 14, 2020

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Ming Liu

author
#0 lore raw

v2 cover libubootenv: uprev to v0.3

From: Ming Liu <[email protected]>

Changes in V2:

1 Added u-boot to NON_MULTILIB_RECIPES.

Ming Liu (2):
multilib.conf: add u-boot to NON_MULTILIB_RECIPES
libubootenv: uprev to v0.3

 meta/conf/multilib.conf                                     | 2 +-
 .../u-boot/{libubootenv_0.2.bb => libubootenv_git.bb}       | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
 rename meta/recipes-bsp/u-boot/{libubootenv_0.2.bb => libubootenv_git.bb} (84%)
Signature · 1 line
2.28.0
author
#1 lore raw

PATCH v2 1/2 multilib.conf: add u-boot to NON_MULTILIB_RECIPES

From: Ming Liu <[email protected]>

u-boot should be a non multilib recipe, add it in NON_MULTILIB_RECIPES.

---
 meta/conf/multilib.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/conf/multilib.conf +1 -1
index 58f2ac5c86..d231107f8b 100644
@@ -30,4 +30,4 @@ PKG_CONFIG_PATH[vardepvalueexclude] = ":${WORKDIR}/recipe-sysroot/${datadir}/pkg
 
 # These recipes don't need multilib variants, the ${BPN} PROVDES/RPROVDES
 # ${MLPREFIX}${BPN}
-NON_MULTILIB_RECIPES = "grub grub-efi make-mod-scripts ovmf"
+NON_MULTILIB_RECIPES = "grub grub-efi make-mod-scripts ovmf u-boot"
Signature · 1 line
2.28.0
author
#2 lore raw

PATCH v2 2/2 libubootenv: uprev to v0.3

In reply to Ming Liu

From: Ming Liu <[email protected]>

Update libubootenv to the latest 0.3 release, which comprises the following commits:

```
1efed83 Increase max length for device name
6f4fc1c uboot_env: Use canonicalized pathname when reading device
23b3086 Fix bug introduced by commit 52a70114
ed1a53e Dont store to device if no value changes
4a0a466 Merge pull request #7 from TomzBench/cmake-fix
6117831 Added Coverity badge
49372a1 Fix coverity #293496
69a6819 Fix coverity #293503 and #293507
258bf52 Fix coverity #293501
aa52e61 Fix coverity #293505
52a7011 Fix coverity #293504 and #293506
e822218 Fix coverity #293495 and #293497
23b305f Fix coverity #293499
25ef1f6 Add coverity setup for Travis
41b5188 fixed install for static target, fixed BUILD_DOC acknowledgement
86bd30a Restore ability to feed script file via stdin, using `-s -`.
c91dcca ubi, write: fix invalid envsize ptr to UBI_IOCVOLUP
f4b9cde Allow negative offsets
45bf92a Detect sector size if not found in config
9f59db6 uboot_env: remove unused variables
65d243e README: libubootenv is now in oe-core
ba952d0 BUG: variable lists not released in close()
690f868 Variables are not removed when loading from file
9e3586a Make sure there's no file descriptor leakage in case of error
03647c4 Check config file defines a non-zero Sector size
3b2d4f1 Check environment size from fw_env.config
879c073 Do not hardcode path for install
d9c639b libubootenv: add pkg-config support
cc628ee libuboot: wrap libuboot in extern "C" for C++
```

Also change it to be a git recipe, and add u-boot-default-env to RRECOMMENDS since /etc/u-boot-initial-env is being referred in libubootenv source.

---
 .../u-boot/{libubootenv_0.2.bb => libubootenv_git.bb}       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
 rename meta/recipes-bsp/u-boot/{libubootenv_0.2.bb => libubootenv_git.bb} (84%)
meta/recipes-bsp/u-boot/libubootenv_git.bb renamed from meta/recipes-bsp/u-boot/libubootenv_0.2.bb +4 -2
similarity index 84%
rename from meta/recipes-bsp/u-boot/libubootenv_0.2.bb
rename to meta/recipes-bsp/u-boot/libubootenv_git.bb
index 3820ba262e..59b9703d61 100644
@@ -10,9 +10,9 @@ LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c"
 SECTION = "libs"
 
-PV = "0.2+git${SRCPV}"
+PV = "0.3+git${SRCPV}"
 SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https"
-SRCREV = "86bd30a14e153a18f670b25708795253d8736f0f"
+SRCREV = "ad253cfdb07c8492f2ee46a52fbc607ad0b96414"
 
 S = "${WORKDIR}/git"
 
@@ -24,4 +24,6 @@ DEPENDS = "zlib"
 PROVIDES += "u-boot-fw-utils"
 RPROVIDES_${PN}-bin += "u-boot-fw-utils"
 
+RRECOMMENDS_${PN}-bin_class-target += "u-boot-default-env"
+
 BBCLASSEXTEND = "native"
Signature · 1 line
2.28.0
#3 lore raw

meta/recipes-bsp/u-boot/libubootenv_git.bb LICENSE = "LGPL-2.1" · line 15

Quoted 7 lines · Ming Liu

...

meta/recipes-bsp/u-boot/libubootenv_git.bb renamed from meta/recipes-bsp/u-boot/libubootenv_0.2.bb +2 -2
-PV = "0.2+git${SRCPV}"
+PV = "0.3+git${SRCPV}"
 SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https"
-SRCREV = "86bd30a14e153a18f670b25708795253d8736f0f"
+SRCREV = "ad253cfdb07c8492f2ee46a52fbc607ad0b96414"
...

This is exactly the 0.3 release, so PV should be
PV = "0.3"

cu
Adrian

author
#4 lore raw

OK, will change back to 0.3 recipe in V3.

//Ming Liu

Adrian Bunk <[email protected]> 於 2020年8月13日 週四 下午9:05寫道:

Quoted 15 lines · Ming Liu

meta/recipes-bsp/u-boot/libubootenv_git.bb LICENSE = "LGPL-2.1" · line 15

Quoted 7 lines

...

meta/recipes-bsp/u-boot/libubootenv_git.bb renamed from meta/recipes-bsp/u-boot/libubootenv_0.2.bb +2 -2
-PV = "0.2+git${SRCPV}"
+PV = "0.3+git${SRCPV}"
 SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https"
-SRCREV = "86bd30a14e153a18f670b25708795253d8736f0f"
+SRCREV = "ad253cfdb07c8492f2ee46a52fbc607ad0b96414"
...

This is exactly the 0.3 release, so PV should be
PV = "0.3"

cu
Adrian

author
#5 lore raw

@Adrian Bunk <[email protected]> Sorry, just double checked your comment, are you sure "PV = 0.3" without git+SRCPV is a right way to go? This seems is not like all other git recipes.

//Ming Liu

Ming Liu <[email protected]> 於 2020年8月14日 週五 上午10:09寫道:

Quoted 22 lines

OK, will change back to 0.3 recipe in V3.

//Ming Liu

Adrian Bunk <[email protected]> 於 2020年8月13日 週四 下午9:05寫道:

Quoted 15 lines · Ming Liu

meta/recipes-bsp/u-boot/libubootenv_git.bb LICENSE = "LGPL-2.1" · line 15

Quoted 7 lines

...

meta/recipes-bsp/u-boot/libubootenv_git.bb renamed from meta/recipes-bsp/u-boot/libubootenv_0.2.bb +2 -2
-PV = "0.2+git${SRCPV}"
+PV = "0.3+git${SRCPV}"
 SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https"
-SRCREV = "86bd30a14e153a18f670b25708795253d8736f0f"
+SRCREV = "ad253cfdb07c8492f2ee46a52fbc607ad0b96414"
...

This is exactly the 0.3 release, so PV should be
PV = "0.3"

cu
Adrian

#6 lore raw
Quoted 3 lines · Ming Liu

@Adrian Bunk Sorry, just double checked your comment, are you sure "PV = 0.3" without git+SRCPV is a right way to go? This seems is not like all other git recipes.

Adrian is correct, if this is 0.3, PV should be 0.3. The addition of SRCPV is only appropriate if it is some number of git commits past the 0.3 release.

Cheers,

Richard

author
#7 lore raw

Got that, will make a V3 dropping PV definition and _git version suffix from recipe.

//Ming Liu

Richard Purdie <[email protected]> 於 2020年8月14日 週五 上午11:04寫道:

Quoted 14 lines · Ming Liu
Quoted 3 lines

@Adrian Bunk Sorry, just double checked your comment, are you sure "PV = 0.3" without git+SRCPV is a right way to go? This seems is not like all other git recipes.

Adrian is correct, if this is 0.3, PV should be 0.3. The addition of SRCPV is only appropriate if it is some number of git commits past the 0.3 release.

Cheers,

Richard

#8 lore raw
In reply to Ming Liu
Quoted 69 lines · Ming Liu

From: Ming Liu <[email protected]>

Update libubootenv to the latest 0.3 release, which comprises the following commits:

```
1efed83 Increase max length for device name
6f4fc1c uboot_env: Use canonicalized pathname when reading device
23b3086 Fix bug introduced by commit 52a70114
ed1a53e Dont store to device if no value changes
4a0a466 Merge pull request #7 from TomzBench/cmake-fix
6117831 Added Coverity badge
49372a1 Fix coverity #293496
69a6819 Fix coverity #293503 and #293507
258bf52 Fix coverity #293501
aa52e61 Fix coverity #293505
52a7011 Fix coverity #293504 and #293506
e822218 Fix coverity #293495 and #293497
23b305f Fix coverity #293499
25ef1f6 Add coverity setup for Travis
41b5188 fixed install for static target, fixed BUILD_DOC acknowledgement
86bd30a Restore ability to feed script file via stdin, using `-s -`.
c91dcca ubi, write: fix invalid envsize ptr to UBI_IOCVOLUP
f4b9cde Allow negative offsets
45bf92a Detect sector size if not found in config
9f59db6 uboot_env: remove unused variables
65d243e README: libubootenv is now in oe-core
ba952d0 BUG: variable lists not released in close()
690f868 Variables are not removed when loading from file
9e3586a Make sure there's no file descriptor leakage in case of error
03647c4 Check config file defines a non-zero Sector size
3b2d4f1 Check environment size from fw_env.config
879c073 Do not hardcode path for install
d9c639b libubootenv: add pkg-config support
cc628ee libuboot: wrap libuboot in extern "C" for C++
```

Also change it to be a git recipe, and add u-boot-default-env to RRECOMMENDS since /etc/u-boot-initial-env is being referred in libubootenv source.

---
 .../u-boot/{libubootenv_0.2.bb => libubootenv_git.bb}       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
 rename meta/recipes-bsp/u-boot/{libubootenv_0.2.bb => libubootenv_git.bb} (84%)
meta/recipes-bsp/u-boot/libubootenv_git.bb renamed from meta/recipes-bsp/u-boot/libubootenv_0.2.bb +2 -2
similarity index 84%
rename from meta/recipes-bsp/u-boot/libubootenv_0.2.bb
rename to meta/recipes-bsp/u-boot/libubootenv_git.bb
index 3820ba262e..59b9703d61 100644
@@ -10,9 +10,9 @@ LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c"
 SECTION = "libs"
 
-PV = "0.2+git${SRCPV}"
+PV = "0.3+git${SRCPV}"
 SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https"
-SRCREV = "86bd30a14e153a18f670b25708795253d8736f0f"
+SRCREV = "ad253cfdb07c8492f2ee46a52fbc607ad0b96414"
 
 S = "${WORKDIR}/git"
 

meta/recipes-bsp/u-boot/libubootenv_git.bb DEPENDS = "zlib" · line 28

Quoted 5 lines
meta/recipes-bsp/u-boot/libubootenv_git.bb renamed from meta/recipes-bsp/u-boot/libubootenv_0.2.bb +2 -0
@@ -24,4 +24,6 @@ DEPENDS = "zlib"
 PROVIDES += "u-boot-fw-utils"
 RPROVIDES_${PN}-bin += "u-boot-fw-utils"
 
+RRECOMMENDS_${PN}-bin_class-target += "u-boot-default-env"
+

should this be RRECOMMENDS_${PN}-bin_append_class-target = "u-boot-default-env"

I see

ERROR: Nothing RPROVIDES 'u-boot-default-env' (but /mnt/jenkins/workspace/yocto-world-glibc/sources/openembedded-core/meta/recipes-bsp/u-boot/libubootenv_git.bb RDEPENDS on or otherwise requires it)

Quoted 5 lines
meta/recipes-bsp/u-boot/libubootenv_git.bb renamed from meta/recipes-bsp/u-boot/libubootenv_0.2.bb +0 -1
 BBCLASSEXTEND = "native"
--

2.28.0

author
#9 lore raw

Yes, I am on board that RRECOMMENDS_${PN}-bin_append_class-target = " u-boot-default-env" might be better, will change to that in V3, but this error probably due to you dont have RPROVIDES_${PN}-env += "u-boot-default-env" in your uboot recipe?

//Ming Liu

Khem Raj <[email protected]> 於 2020年8月14日 週五 上午7:05寫道:

Quoted 97 lines · Ming Liu
Quoted 42 lines

From: Ming Liu <[email protected]>

Update libubootenv to the latest 0.3 release, which comprises the following commits:

```
1efed83 Increase max length for device name
6f4fc1c uboot_env: Use canonicalized pathname when reading device
23b3086 Fix bug introduced by commit 52a70114
ed1a53e Dont store to device if no value changes
4a0a466 Merge pull request #7 from TomzBench/cmake-fix
6117831 Added Coverity badge
49372a1 Fix coverity #293496
69a6819 Fix coverity #293503 and #293507
258bf52 Fix coverity #293501
aa52e61 Fix coverity #293505
52a7011 Fix coverity #293504 and #293506
e822218 Fix coverity #293495 and #293497
23b305f Fix coverity #293499
25ef1f6 Add coverity setup for Travis
41b5188 fixed install for static target, fixed BUILD_DOC acknowledgement
86bd30a Restore ability to feed script file via stdin, using `-s -`.
c91dcca ubi, write: fix invalid envsize ptr to UBI_IOCVOLUP
f4b9cde Allow negative offsets
45bf92a Detect sector size if not found in config
9f59db6 uboot_env: remove unused variables
65d243e README: libubootenv is now in oe-core
ba952d0 BUG: variable lists not released in close()
690f868 Variables are not removed when loading from file
9e3586a Make sure there's no file descriptor leakage in case of error
03647c4 Check config file defines a non-zero Sector size
3b2d4f1 Check environment size from fw_env.config
879c073 Do not hardcode path for install
d9c639b libubootenv: add pkg-config support
cc628ee libuboot: wrap libuboot in extern "C" for C++
```

Also change it to be a git recipe, and add u-boot-default-env to RRECOMMENDS since /etc/u-boot-initial-env is being referred in libubootenv source.

Quoted 6 lines
---
 .../u-boot/{libubootenv_0.2.bb => libubootenv_git.bb}       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
 rename meta/recipes-bsp/u-boot/{libubootenv_0.2.bb =>

libubootenv_git.bb} (84%)

Review

Quoted 2 lines
(quoted diff) +0 -0

b/meta/recipes-bsp/u-boot/libubootenv_git.bb

meta/recipes-bsp/u-boot/libubootenv_git.bb LICENSE = "LGPL-2.1" · line 10

Quoted 8 lines

similarity index 84%
rename from meta/recipes-bsp/u-boot/libubootenv_0.2.bb rename to meta/recipes-bsp/u-boot/libubootenv_git.bb index 3820ba262e..59b9703d61 100644

meta/recipes-bsp/u-boot/libubootenv_git.bb renamed from meta/recipes-bsp/u-boot/libubootenv_0.2.bb +0 -0
@@ -10,9 +10,9 @@ LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM =

"file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c"

Quoted 11 lines
meta/recipes-bsp/u-boot/libubootenv_git.bb renamed from meta/recipes-bsp/u-boot/libubootenv_0.2.bb +2 -2
 SECTION = "libs"
 
-PV = "0.2+git${SRCPV}"
+PV = "0.3+git${SRCPV}"
 SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https"
-SRCREV = "86bd30a14e153a18f670b25708795253d8736f0f"
+SRCREV = "ad253cfdb07c8492f2ee46a52fbc607ad0b96414"
 
 S = "${WORKDIR}/git"
 

meta/recipes-bsp/u-boot/libubootenv_git.bb DEPENDS = "zlib" · line 28

Quoted 5 lines
meta/recipes-bsp/u-boot/libubootenv_git.bb renamed from meta/recipes-bsp/u-boot/libubootenv_0.2.bb +2 -0
@@ -24,4 +24,6 @@ DEPENDS = "zlib"
 PROVIDES += "u-boot-fw-utils"
 RPROVIDES_${PN}-bin += "u-boot-fw-utils"
 
+RRECOMMENDS_${PN}-bin_class-target += "u-boot-default-env"
+

should this be RRECOMMENDS_${PN}-bin_append_class-target = "u-boot-default-env"

I see

ERROR: Nothing RPROVIDES 'u-boot-default-env' (but

/mnt/jenkins/workspace/yocto-world-glibc/sources/openembedded-core/meta/recipes-bsp/u-boot/ libubootenv_git.bb
RDEPENDS on or otherwise requires it)

Quoted 5 lines
meta/recipes-bsp/u-boot/libubootenv_git.bb renamed from meta/recipes-bsp/u-boot/libubootenv_0.2.bb +0 -1
 BBCLASSEXTEND = "native"
--

2.28.0