[OE-core] [PATCH] [dunfell 0/3] libubootenv: uprev to v0.3

[OE-core] [PATCH] [dunfell 0/3] libubootenv: uprev to v0.3

[Ming Liu]

From: Ming Liu <liu.ming50@gmail.com>

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%)

-- 
2.28.0

[OE-core] [PATCH] [dunfell 1/3] conf/machine: set UBOOT_MACHINE for qemumips and qemumips64

[Ming Liu]

From: Ming Liu <liu.ming50@gmail.com>

These machines support booting U-Boot, so set the machine appropriately.

Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit b812fad85aed6cb9e433c689f3b14425488dfc68)
---
 meta/conf/machine/qemumips.conf   | 2 ++
 meta/conf/machine/qemumips64.conf | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/meta/conf/machine/qemumips.conf b/meta/conf/machine/qemumips.conf
index 4617c3c7b6..1373e4cba0 100644
--- a/meta/conf/machine/qemumips.conf
+++ b/meta/conf/machine/qemumips.conf
@@ -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"
diff --git a/meta/conf/machine/qemumips64.conf b/meta/conf/machine/qemumips64.conf
index 6d5174665f..1e77486491 100644
--- a/meta/conf/machine/qemumips64.conf
+++ b/meta/conf/machine/qemumips64.conf
@@ -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"
-- 
2.28.0

[OE-core] [PATCH] [dunfell 2/3] multilib.conf: add u-boot to NON_MULTILIB_RECIPES

[Ming Liu]

From: Ming Liu <liu.ming50@gmail.com>

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

Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 5e7dc0d68efb2d43bbd5b1be9e6d555fc4456fb6)
---
 meta/conf/multilib.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/conf/multilib.conf b/meta/conf/multilib.conf
index 58f2ac5c86..d231107f8b 100644
--- a/meta/conf/multilib.conf
+++ b/meta/conf/multilib.conf
@@ -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"
-- 
2.28.0

[OE-core] [PATCH] [dunfell 3/3] libubootenv: uprev to v0.3

[Ming Liu]

From: Ming Liu <liu.ming50@gmail.com>

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.

Signed-off-by: Ming Liu <liu.ming50@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(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%)

diff --git a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb b/meta/recipes-bsp/u-boot/libubootenv_0.3.bb
similarity index 82%
rename from meta/recipes-bsp/u-boot/libubootenv_0.2.bb
rename to meta/recipes-bsp/u-boot/libubootenv_0.3.bb
index ea29b668e8..47e64f9114 100644
--- a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb
+++ b/meta/recipes-bsp/u-boot/libubootenv_0.3.bb
@@ -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"
-- 
2.28.0

Re: [OE-core] [PATCH] [dunfell 3/3] libubootenv: uprev to v0.3

[Anuj Mittal]

On Sat, 2020-08-22 at 17:22 +0200, Ming Liu wrote:
> From: Ming Liu <liu.ming50@gmail.com>
> 
> 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.
> 
> Signed-off-by: Ming Liu <liu.ming50@gmail.com>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> (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%)
> 
> diff --git a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb
> b/meta/recipes-bsp/u-boot/libubootenv_0.3.bb
> similarity index 82%
> rename from meta/recipes-bsp/u-boot/libubootenv_0.2.bb
> rename to meta/recipes-bsp/u-boot/libubootenv_0.3.bb
> index ea29b668e8..47e64f9114 100644
> --- a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb
> +++ b/meta/recipes-bsp/u-boot/libubootenv_0.3.bb
> @@ -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"
> +

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

Re: [OE-core] [PATCH] [dunfell 3/3] libubootenv: uprev to v0.3

[Ming Liu]

[-- Attachment #1: Type: text/plain, Size: 4002 bytes --]

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 <anuj.mittal@intel.com> 於 2020年8月24日 週一 上午2:03寫道：

> On Sat, 2020-08-22 at 17:22 +0200, Ming Liu wrote:
> > From: Ming Liu <liu.ming50@gmail.com>
> >
> > 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.
> >
> > Signed-off-by: Ming Liu <liu.ming50@gmail.com>
> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> > (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%)
> >
> > diff --git a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb
> > b/meta/recipes-bsp/u-boot/libubootenv_0.3.bb
> > similarity index 82%
> > rename from meta/recipes-bsp/u-boot/libubootenv_0.2.bb
> > rename to meta/recipes-bsp/u-boot/libubootenv_0.3.bb
> > index ea29b668e8..47e64f9114 100644
> > --- a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb
> > +++ b/meta/recipes-bsp/u-boot/libubootenv_0.3.bb
> > @@ -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"
> > +
>
> 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
>

[-- Attachment #2: Type: text/html, Size: 5969 bytes --]

Re: [OE-core] [PATCH] [dunfell 3/3] libubootenv: uprev to v0.3

[Steve Sakoman]

On Sun, Aug 23, 2020 at 8:56 PM Ming Liu <liu.ming50@gmail.com> wrote:
>
> 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


> //Ming Liu
>
> Mittal, Anuj <anuj.mittal@intel.com> 於 2020年8月24日 週一 上午2:03寫道：
>>
>> On Sat, 2020-08-22 at 17:22 +0200, Ming Liu wrote:
>> > From: Ming Liu <liu.ming50@gmail.com>
>> >
>> > 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.
>> >
>> > Signed-off-by: Ming Liu <liu.ming50@gmail.com>
>> > Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
>> > (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%)
>> >
>> > diff --git a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb
>> > b/meta/recipes-bsp/u-boot/libubootenv_0.3.bb
>> > similarity index 82%
>> > rename from meta/recipes-bsp/u-boot/libubootenv_0.2.bb
>> > rename to meta/recipes-bsp/u-boot/libubootenv_0.3.bb
>> > index ea29b668e8..47e64f9114 100644
>> > --- a/meta/recipes-bsp/u-boot/libubootenv_0.2.bb
>> > +++ b/meta/recipes-bsp/u-boot/libubootenv_0.3.bb
>> > @@ -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"
>> > +
>>
>> 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
>
>