Skip to contentSkip to conversation

libubootenv: uprev to v0.3

PATCH Superseded Ming Liu 3 participants 6 messages Aug 14, 2020 – Aug 17, 2020

v3 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Ming Liu

author
#0 lore raw

v3 cover libubootenv: uprev to v0.3

From: Ming Liu <[email protected]>

Changes in V3:

1 Drop PV definition from recipe as suggested by Adrian Bunk. 2 Change a '+=' to "_append" as suggested by Khem Raj.

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_0.3.bb}        | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)
 rename meta/recipes-bsp/u-boot/{libubootenv_0.2.bb => libubootenv_0.3.bb} (85%)
Signature · 1 line
2.28.0
author
#1 lore raw

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

for qemumips I am still seeing

00:01:59.669 WARNING: No bb files in default matched
BBFILE_PATTERN_odroid-extras '^/mnt/jenkins/workspace/yocto-world-glibc/sources/meta-odroid/meta-odroid-extras/' 00:02:03.245 ERROR: Nothing RPROVIDES 'u-boot-default-env' (but /mnt/jenkins/workspace/yocto-world-glibc/sources/openembedded-core/meta/recipes-bsp/u-boot/libubootenv_0.3.bb RDEPENDS on or otherwise requires it)
00:02:03.534 ERROR: Nothing RPROVIDES 'libubootenv-dev' (but /mnt/jenkins/workspace/yocto-world-glibc/sources/openembedded-core/meta/recipes-bsp/u-boot/libubootenv_0.3.bb RDEPENDS on or otherwise requires it)
00:02:03.534 No eligible RPROVIDERs exist for 'libubootenv-dev'

Quoted 75 lines · On Fri, Aug 14, 2020 at 2:29 AM <[email protected]> wrote:

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 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_0.3.bb}        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
 rename meta/recipes-bsp/u-boot/{libubootenv_0.2.bb => libubootenv_0.3.bb} (85%)
meta/recipes-bsp/u-boot/libubootenv_0.3.bb renamed from meta/recipes-bsp/u-boot/libubootenv_0.2.bb +3 -3
similarity index 85%
rename from meta/recipes-bsp/u-boot/libubootenv_0.2.bb
rename to meta/recipes-bsp/u-boot/libubootenv_0.3.bb
index 3820ba262e..55b2eb60f7 100644
@@ -10,9 +10,8 @@ LICENSE = "LGPL-2.1"
 LIC_FILES_CHKSUM = "file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c"
 SECTION = "libs"
 
-PV = "0.2+git${SRCPV}"
 SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https"
-SRCREV = "86bd30a14e153a18f670b25708795253d8736f0f"
+SRCREV = "ad253cfdb07c8492f2ee46a52fbc607ad0b96414"
 
 S = "${WORKDIR}/git"
 
@@ -24,4 +23,6 @@ DEPENDS = "zlib"
 PROVIDES += "u-boot-fw-utils"
 RPROVIDES_${PN}-bin += "u-boot-fw-utils"
 
+RRECOMMENDS_${PN}-bin_append_class-target = " u-boot-default-env"
+
 BBCLASSEXTEND = "native"
--

2.28.0

#4 lore raw
Quoted 12 lines · Khem Raj

for qemumips I am still seeing

00:01:59.669 WARNING: No bb files in default matched
BBFILE_PATTERN_odroid-extras '^/mnt/jenkins/workspace/yocto-world-glibc/sources/meta-odroid/meta-odroid-extras/' 00:02:03.245 ERROR: Nothing RPROVIDES 'u-boot-default-env' (but /mnt/jenkins/workspace/yocto-world-glibc/sources/openembedded-core/meta/recipes-bsp/u-boot/libubootenv_0.3.bb RDEPENDS on or otherwise requires it)
00:02:03.534 ERROR: Nothing RPROVIDES 'libubootenv-dev' (but /mnt/jenkins/workspace/yocto-world-glibc/sources/openembedded-core/meta/recipes-bsp/u-boot/libubootenv_0.3.bb RDEPENDS on or otherwise requires it)
00:02:03.534 No eligible RPROVIDERs exist for 'libubootenv-dev'

Its also breaking sstate testing:

"oe-selftest -r sstatetests.SStateTests.test_sstate_sametune_samesigs"

causing:

https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/1248/steps/8/logs/step2d

2020-08-14 19:36:15,406 - oe-selftest - INFO - sstatetests.SStateTests.test_sstate_sametune_samesigs (subunit.RemotedTestCase)
2020-08-14 19:36:15,407 - oe-selftest - INFO -  ... FAIL
2020-08-14 19:36:15,407 - oe-selftest - INFO - 9: 38/38 378/414 (153.36s) (sstatetests.SStateTests.test_sstate_sametune_samesigs)
2020-08-14 19:36:15,407 - oe-selftest - INFO - testtools.testresult.real._StringException: Traceback (most recent call last):
  File "/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/lib/oeqa/selftest/cases/sstatetests.py", line 449, in test_sstate_sametune_samesigs
    self.assertCountEqual(files1, files2)
  File "/usr/lib64/python3.6/unittest/case.py", line 1200, in assertCountEqual
    self.fail(msg)
  File "/usr/lib64/python3.6/unittest/case.py", line 687, in fail
    raise self.failureException(msg)
AssertionError: Element counts were not equal:
First has 1, Second has 0:  '/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-3335289/tmp-sstatesamehash/stamps/core2-32-poky-linux/libubootenv/0.3-r0.do_package_write_rpm.sigdata.05d757878a1583dd222357a916105e1723de0b287d61d4d217953102ef4b6710'
First has 1, Second has 0:  '/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-3335289/tmp-sstatesamehash/stamps/core2-32-poky-linux/libubootenv/0.3-r0.do_package_qa.sigdata.d5d478843b014fcf9715070611562e969b0ebf37e49b284509293a5956d3544b'
First has 1, Second has 0:  '/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-3335289/tmp-sstatesamehash/stamps/x86-pokymllib32-linux/lib32-libubootenv/0.3-r0.do_package_qa.sigdata.f8638f649c6aebeda30a11f6d2e9379c7e389ded8b84f6b5b57fa36c18868bfb'
First has 1, Second has 0:  '/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-3335289/tmp-sstatesamehash/stamps/x86-pokymllib32-linux/lib32-libubootenv/0.3-r0.do_package_write_rpm.sigdata.f74b2e6332d343f4800eefa823f0462649a549edd90c2c671f623493f9598756'
First has 0, Second has 1:  '/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-3335289/tmp-sstatesamehash/stamps/core2-32-poky-linux/libubootenv/0.3-r0.do_package_qa.sigdata.a60efa593fff1e0ed60834ecd0fb7f20b94a9534bb66e1b5fd968aca5a9eb831'
First has 0, Second has 1:  '/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-3335289/tmp-sstatesamehash/stamps/core2-32-poky-linux/libubootenv/0.3-r0.do_package_write_rpm.sigdata.b7097c279aba4be43e13e35cfeccc331bdf11dc2d6240da12430c953926796b1'
First has 0, Second has 1:  '/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-3335289/tmp-sstatesamehash/stamps/x86-pokymllib32-linux/lib32-libubootenv/0.3-r0.do_package_write_rpm.sigdata.0cd26580e083cbf8ac677e1deb8cbfa1c4ef4c35e29b2ea2bb61282b48cda68a'
First has 0, Second has 1:  '/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-3335289/tmp-sstatesamehash/stamps/x86-pokymllib32-linux/lib32-libubootenv/0.3-r0.do_package_qa.sigdata.89a10fd2c56db51620a1b5492a894abacb4b38e9eee8ba05fe70f4ca46278ccd'

Cheers,

Richard

author
#5 lore raw

Will investigate the build issues. Thanks.

//Ming Liu

Richard Purdie <[email protected]> 於 2020年8月15日 週六 上午12:06寫道:

Quoted 69 lines · Khem Raj
Quoted 5 lines

for qemumips I am still seeing

00:01:59.669 WARNING: No bb files in default matched BBFILE_PATTERN_odroid-extras

'^/mnt/jenkins/workspace/yocto-world-glibc/sources/meta-odroid/meta-odroid-extras/'

Quoted 2 lines

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

/mnt/jenkins/workspace/yocto-world-glibc/sources/openembedded-core/meta/recipes-bsp/u-boot/ libubootenv_0.3.bb

Quoted 3 lines

RDEPENDS on or otherwise requires it)
00:02:03.534 ERROR: Nothing RPROVIDES 'libubootenv-dev' (but

/mnt/jenkins/workspace/yocto-world-glibc/sources/openembedded-core/meta/recipes-bsp/u-boot/ libubootenv_0.3.bb

Quoted 2 lines

RDEPENDS on or otherwise requires it)
00:02:03.534 No eligible RPROVIDERs exist for 'libubootenv-dev'

Its also breaking sstate testing:

"oe-selftest -r sstatetests.SStateTests.test_sstate_sametune_samesigs"

causing:

https://autobuilder.yoctoproject.org/typhoon/#/builders/79/builds/1248/steps/8/logs/step2d

2020-08-14 19:36:15,406 - oe-selftest - INFO -
sstatetests.SStateTests.test_sstate_sametune_samesigs
(subunit.RemotedTestCase)
2020-08-14 19:36:15,407 - oe-selftest - INFO -  ... FAIL
2020-08-14 19:36:15,407 - oe-selftest - INFO - 9: 38/38 378/414 (153.36s)
(sstatetests.SStateTests.test_sstate_sametune_samesigs)
2020-08-14 19:36:15,407 - oe-selftest - INFO -

testtools.testresult.real._StringException: Traceback (most recent call
last):
File
"/home/pokybuild/yocto-worker/oe-selftest-centos/build/meta/lib/oeqa/selftest/cases/sstatetests.py",
line 449, in test_sstate_sametune_samesigs
self.assertCountEqual(files1, files2)
File "/usr/lib64/python3.6/unittest/case.py", line 1200, in
assertCountEqual
self.fail(msg)
File "/usr/lib64/python3.6/unittest/case.py", line 687, in fail
raise self.failureException(msg)
AssertionError: Element counts were not equal:
First has 1, Second has 0:
'/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-3335289/tmp-sstatesamehash/stamps/core2-32-poky-linux/libubootenv/0.3-r0.do_package_write_rpm.sigdata.05d757878a1583dd222357a916105e1723de0b287d61d4d217953102ef4b6710' First has 1, Second has 0:
'/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-3335289/tmp-sstatesamehash/stamps/core2-32-poky-linux/libubootenv/0.3-r0.do_package_qa.sigdata.d5d478843b014fcf9715070611562e969b0ebf37e49b284509293a5956d3544b' First has 1, Second has 0:
'/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-3335289/tmp-sstatesamehash/stamps/x86-pokymllib32-linux/lib32-libubootenv/0.3-r0.do_package_qa.sigdata.f8638f649c6aebeda30a11f6d2e9379c7e389ded8b84f6b5b57fa36c18868bfb' First has 1, Second has 0:
'/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-3335289/tmp-sstatesamehash/stamps/x86-pokymllib32-linux/lib32-libubootenv/0.3-r0.do_package_write_rpm.sigdata.f74b2e6332d343f4800eefa823f0462649a549edd90c2c671f623493f9598756' First has 0, Second has 1:
'/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-3335289/tmp-sstatesamehash/stamps/core2-32-poky-linux/libubootenv/0.3-r0.do_package_qa.sigdata.a60efa593fff1e0ed60834ecd0fb7f20b94a9534bb66e1b5fd968aca5a9eb831' First has 0, Second has 1:
'/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-3335289/tmp-sstatesamehash/stamps/core2-32-poky-linux/libubootenv/0.3-r0.do_package_write_rpm.sigdata.b7097c279aba4be43e13e35cfeccc331bdf11dc2d6240da12430c953926796b1' First has 0, Second has 1:
'/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-3335289/tmp-sstatesamehash/stamps/x86-pokymllib32-linux/lib32-libubootenv/0.3-r0.do_package_write_rpm.sigdata.0cd26580e083cbf8ac677e1deb8cbfa1c4ef4c35e29b2ea2bb61282b48cda68a' First has 0, Second has 1:
'/home/pokybuild/yocto-worker/oe-selftest-centos/build/build-st-3335289/tmp-sstatesamehash/stamps/x86-pokymllib32-linux/lib32-libubootenv/0.3-r0.do_package_qa.sigdata.89a10fd2c56db51620a1b5492a894abacb4b38e9eee8ba05fe70f4ca46278ccd'

Cheers,

Richard