libubootenv: uprev to v0.3
cover libubootenv: uprev to v0.3
From: Ming Liu <[email protected]>
Cherry pick the patches from master to upgrade libubootenv 0.2 -> 0.3.
Since libubootenv 0.2 is sort of buggy, it lacks of a lot of bug/regression/security fixes which has been included in 0.3.
Ming Liu (3):
conf/machine: set UBOOT_MACHINE for qemumips and qemumips64 multilib.conf: add u-boot to NON_MULTILIB_RECIPES
libubootenv: uprev to v0.3
meta/conf/machine/qemumips.conf | 2 ++
meta/conf/machine/qemumips64.conf | 2 ++
meta/conf/multilib.conf | 2 +-
.../u-boot/{libubootenv_0.2.bb => libubootenv_0.3.bb} | 7 +++++--
4 files changed, 10 insertions(+), 3 deletions(-)
rename meta/recipes-bsp/u-boot/{libubootenv_0.2.bb => libubootenv_0.3.bb} (82%)Signature · 1 line
2.28.0
PATCH 1/3 conf/machine: set UBOOT_MACHINE for qemumips and qemumips64
From: Ming Liu <[email protected]>
These machines support booting U-Boot, so set the machine appropriately.
--- meta/conf/machine/qemumips.conf | 2 ++ meta/conf/machine/qemumips64.conf | 2 ++ 2 files changed, 4 insertions(+)
meta/conf/machine/qemumips.conf +2 -0
@@ -9,6 +9,8 @@ require conf/machine/include/qemuboot-mips.inc KERNEL_IMAGETYPE = "vmlinux" KERNEL_ALT_IMAGETYPE = "vmlinux.bin" +UBOOT_MACHINE ?= "qemu_mips_defconfig" + SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" QB_SYSTEM_NAME = "qemu-system-mips"
meta/conf/machine/qemumips64.conf +2 -0
@@ -11,6 +11,8 @@ QB_CPU = "-cpu MIPS64R2-generic" KERNEL_IMAGETYPE = "vmlinux" KERNEL_ALT_IMAGETYPE = "vmlinux.bin" +UBOOT_MACHINE ?= "qemu_mips64_defconfig" + SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1" QB_SYSTEM_NAME = "qemu-system-mips64"
Signature · 1 line
2.28.0
PATCH 2/3 multilib.conf: add u-boot to NON_MULTILIB_RECIPES
In reply to Ming LiuFrom: 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
@@ -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
PATCH 3/3 libubootenv: uprev to v0.3
In reply to Ming LiuFrom: 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, and turns libubootenv's PACKAGE_ARCH to be MACHINE_ARCH since u-boot-default-env is a machine-arch package.
---
.../u-boot/{libubootenv_0.2.bb => libubootenv_0.3.bb} | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
rename meta/recipes-bsp/u-boot/{libubootenv_0.2.bb => libubootenv_0.3.bb} (82%)meta/recipes-bsp/u-boot/libubootenv_0.3.bb renamed from meta/recipes-bsp/u-boot/libubootenv_0.2.bb +5 -2
@@ -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 = "f4b9cde3815abe84a98079cedd515283ea08c16b" +SRCREV = "ad253cfdb07c8492f2ee46a52fbc607ad0b96414" S = "${WORKDIR}/git"
@@ -24,4 +23,8 @@ DEPENDS = "zlib" PROVIDES += "u-boot-fw-utils" RPROVIDES_${PN}-bin += "u-boot-fw-utils" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +RRECOMMENDS_${PN}-bin_append_class-target = " u-boot-default-env" + BBCLASSEXTEND = "native"
Signature · 1 line
2.28.0
Quoted 74 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 add u-boot-default-env to RRECOMMENDS since
/etc/u-boot-initial-envis being referred in libubootenv source, and turns libubootenv'sPACKAGE_ARCHto beMACHINE_ARCHsince u-boot-default-env is a machine-arch package.Signed-off-by Ming Liu <[email protected]>Signed-off-by Richard Purdie <[email protected]>(cherry picked from commit 02d55cd35aac15095fc44f0cf8f9e7a71638f485)--- .../u-boot/{libubootenv_0.2.bb => libubootenv_0.3.bb} | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) rename meta/recipes-bsp/u-boot/{libubootenv_0.2.bb =>libubootenv_0.3.bb} (82%)
meta/recipes-bsp/u-boot/libubootenv_0.3.bb renamed from meta/recipes-bsp/u-boot/libubootenv_0.2.bb +0
-0@@ -10,9 +10,8 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c"
SECTION = "libs"meta/recipes-bsp/u-boot/libubootenv_0.3.bb renamed from meta/recipes-bsp/u-boot/libubootenv_0.2.bb +1
-2-PV = "0.2+git${SRCPV}" SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https" -SRCREV = "f4b9cde3815abe84a98079cedd515283ea08c16b" +SRCREV = "ad253cfdb07c8492f2ee46a52fbc607ad0b96414" S = "${WORKDIR}/git"
meta/recipes-bsp/u-boot/libubootenv_0.3.bb DEPENDS = "zlib" · line 29
Quoted 7 lines
meta/recipes-bsp/u-boot/libubootenv_0.3.bb renamed from meta/recipes-bsp/u-boot/libubootenv_0.2.bb +4
-0@@ -24,4 +23,8 @@ DEPENDS = "zlib" PROVIDES += "u-boot-fw-utils" RPROVIDES_${PN}-bin += "u-boot-fw-utils" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +RRECOMMENDS_${PN}-bin_append_class-target = " u-boot-default-env" +
This causes world builds to fail when uboot build is skipped for a MACHINE value for example when UBOOT_CONFIG or UBOOT_MACHINE is not defined. Perhaps this recipe should also be skipped in those cases?
Thanks,
Anuj
Hi, Anuj:
Thanks for the review, I think this is a good suggestion, maybe we can let it inherit uboot-config bbclass. Will send a patch to master.
//Ming Liu
Mittal, Anuj <[email protected]> 於 2020年8月24日 週一 上午2:03寫道:
Quoted 91 lines · Ming Liu
Quoted 74 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 add u-boot-default-env to RRECOMMENDS since
/etc/u-boot-initial-envis being referred in libubootenv source, and turns libubootenv'sPACKAGE_ARCHto beMACHINE_ARCHsince u-boot-default-env is a machine-arch package.Signed-off-by Ming Liu <[email protected]>Signed-off-by Richard Purdie <[email protected]>(cherry picked from commit 02d55cd35aac15095fc44f0cf8f9e7a71638f485)--- .../u-boot/{libubootenv_0.2.bb => libubootenv_0.3.bb} | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) rename meta/recipes-bsp/u-boot/{libubootenv_0.2.bb =>libubootenv_0.3.bb} (82%)
meta/recipes-bsp/u-boot/libubootenv_0.3.bb renamed from meta/recipes-bsp/u-boot/libubootenv_0.2.bb +0
-0@@ -10,9 +10,8 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c"
SECTION = "libs"meta/recipes-bsp/u-boot/libubootenv_0.3.bb renamed from meta/recipes-bsp/u-boot/libubootenv_0.2.bb +1
-2-PV = "0.2+git${SRCPV}" SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https" -SRCREV = "f4b9cde3815abe84a98079cedd515283ea08c16b" +SRCREV = "ad253cfdb07c8492f2ee46a52fbc607ad0b96414" S = "${WORKDIR}/git"meta/recipes-bsp/u-boot/libubootenv_0.3.bb DEPENDS = "zlib" · line 29
Quoted 7 lines
meta/recipes-bsp/u-boot/libubootenv_0.3.bb renamed from meta/recipes-bsp/u-boot/libubootenv_0.2.bb +4
-0@@ -24,4 +23,8 @@ DEPENDS = "zlib" PROVIDES += "u-boot-fw-utils" RPROVIDES_${PN}-bin += "u-boot-fw-utils" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +RRECOMMENDS_${PN}-bin_append_class-target = " u-boot-default-env" +This causes world builds to fail when uboot build is skipped for a MACHINE value for example when
UBOOT_CONFIGorUBOOT_MACHINEis not defined. Perhaps this recipe should also be skipped in those cases?Thanks,
Anuj
Quoted 4 lines · Ming Liu
Hi, Anuj:
Thanks for the review, I think this is a good suggestion, maybe we can let it inherit uboot-config bbclass. Will send a patch to master.
Yes, good suggestion! I'll hold off on taking this patch series for dunfell until I can cherry-pick your new patch from master.
Steve
Quoted 96 lines
//Ming Liu
Mittal, Anuj <[email protected]> 於 2020年8月24日 週一 上午2:03寫道:
Quoted 91 lines · Ming Liu
Quoted 74 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 add u-boot-default-env to RRECOMMENDS since
/etc/u-boot-initial-envis being referred in libubootenv source, and turns libubootenv'sPACKAGE_ARCHto beMACHINE_ARCHsince u-boot-default-env is a machine-arch package.Signed-off-by Ming Liu <[email protected]>Signed-off-by Richard Purdie <[email protected]>(cherry picked from commit 02d55cd35aac15095fc44f0cf8f9e7a71638f485)--- .../u-boot/{libubootenv_0.2.bb => libubootenv_0.3.bb} | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) rename meta/recipes-bsp/u-boot/{libubootenv_0.2.bb =>libubootenv_0.3.bb} (82%)
meta/recipes-bsp/u-boot/libubootenv_0.3.bb renamed from meta/recipes-bsp/u-boot/libubootenv_0.2.bb +0
-0@@ -10,9 +10,8 @@ LICENSE = "LGPL-2.1" LIC_FILES_CHKSUM = "file://Licenses/lgpl-2.1.txt;md5=4fbd65380cdd255951079008b364516c"
SECTION = "libs"meta/recipes-bsp/u-boot/libubootenv_0.3.bb renamed from meta/recipes-bsp/u-boot/libubootenv_0.2.bb +1
-2-PV = "0.2+git${SRCPV}" SRC_URI = "git://github.com/sbabic/libubootenv;protocol=https" -SRCREV = "f4b9cde3815abe84a98079cedd515283ea08c16b" +SRCREV = "ad253cfdb07c8492f2ee46a52fbc607ad0b96414" S = "${WORKDIR}/git"meta/recipes-bsp/u-boot/libubootenv_0.3.bb DEPENDS = "zlib" · line 29
Quoted 7 lines
meta/recipes-bsp/u-boot/libubootenv_0.3.bb renamed from meta/recipes-bsp/u-boot/libubootenv_0.2.bb +4
-0@@ -24,4 +23,8 @@ DEPENDS = "zlib" PROVIDES += "u-boot-fw-utils" RPROVIDES_${PN}-bin += "u-boot-fw-utils" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +RRECOMMENDS_${PN}-bin_append_class-target = " u-boot-default-env" +This causes world builds to fail when uboot build is skipped for a MACHINE value for example when
UBOOT_CONFIGorUBOOT_MACHINEis not defined. Perhaps this recipe should also be skipped in those cases?Thanks,
Anuj