[PATCH 1/4] u-boot: Add missing dependency on swig

[PATCH 1/4] u-boot: Add missing dependency on swig

[Marek Vasut]

The U-Boot build, in particular the pylibfdt, depends on swig-native.
Add the missing dependency.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-bsp/u-boot/u-boot_2018.05.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/recipes-bsp/u-boot/u-boot_2018.05.bb b/meta/recipes-bsp/u-boot/u-boot_2018.05.bb
index 37c21dcaa3..3cdec00cbd 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2018.05.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2018.05.bb
@@ -1,4 +1,4 @@
 require u-boot-common_${PV}.inc
 require u-boot.inc
 
-DEPENDS += "bc-native dtc-native"
+DEPENDS += "bc-native dtc-native swig-native"
-- 
2.16.2

[PATCH 2/4] u-boot: Add missing dependency on flex and bison native

[Marek Vasut]

The U-Boot build, in particular the Kconfig, depends on bison and
flex native. Add the missing dependencies.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-bsp/u-boot/u-boot-common_2018.05.inc  | 1 +
 meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.05.bb | 2 +-
 meta/recipes-bsp/u-boot/u-boot-mkimage_2018.05.bb  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meta/recipes-bsp/u-boot/u-boot-common_2018.05.inc b/meta/recipes-bsp/u-boot/u-boot-common_2018.05.inc
index 61566f5856..deec6e4890 100644
--- a/meta/recipes-bsp/u-boot/u-boot-common_2018.05.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-common_2018.05.inc
@@ -1,5 +1,6 @@
 HOMEPAGE = "http://www.denx.de/wiki/U-Boot/WebHome"
 SECTION = "bootloaders"
+DEPENDS += "flex-native bison-native"
 
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.05.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.05.bb
index 02887a138a..52c13e75d8 100644
--- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.05.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.05.bb
@@ -1,7 +1,7 @@
 require u-boot-common_${PV}.inc
 
 SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
-DEPENDS = "mtd-utils"
+DEPENDS += "mtd-utils"
 
 INSANE_SKIP_${PN} = "already-stripped"
 EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" V=1'
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.05.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.05.bb
index 1c008be96e..08bff1d161 100644
--- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.05.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.05.bb
@@ -1,7 +1,7 @@
 require u-boot-common_${PV}.inc
 
 SUMMARY = "U-Boot bootloader image creation tool"
-DEPENDS = "openssl"
+DEPENDS += "openssl"
 
 EXTRA_OEMAKE_class-target = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC} ${CFLAGS} ${LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1'
 EXTRA_OEMAKE_class-native = 'CC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" HOSTCC="${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_LDFLAGS}" STRIP=true V=1'
-- 
2.16.2

[PATCH 3/4] u-boot: Upgrade to 2018.07 release

[Marek Vasut]

This upgrades the U-Boot from 2018.05 to 2018.07 release.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Ross Burton <ross.burton@intel.com>
---
 .../u-boot/{u-boot-common_2018.05.inc => u-boot-common_2018.07.inc}   | 4 ++--
 .../u-boot/{u-boot-fw-utils_2018.05.bb => u-boot-fw-utils_2018.07.bb} | 0
 .../u-boot/{u-boot-mkimage_2018.05.bb => u-boot-mkimage_2018.07.bb}   | 0
 meta/recipes-bsp/u-boot/{u-boot_2018.05.bb => u-boot_2018.07.bb}      | 0
 4 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-bsp/u-boot/{u-boot-common_2018.05.inc => u-boot-common_2018.07.inc} (68%)
 rename meta/recipes-bsp/u-boot/{u-boot-fw-utils_2018.05.bb => u-boot-fw-utils_2018.07.bb} (100%)
 rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2018.05.bb => u-boot-mkimage_2018.07.bb} (100%)
 rename meta/recipes-bsp/u-boot/{u-boot_2018.05.bb => u-boot_2018.07.bb} (100%)

diff --git a/meta/recipes-bsp/u-boot/u-boot-common_2018.05.inc b/meta/recipes-bsp/u-boot/u-boot-common_2018.07.inc
similarity index 68%
rename from meta/recipes-bsp/u-boot/u-boot-common_2018.05.inc
rename to meta/recipes-bsp/u-boot/u-boot-common_2018.07.inc
index deec6e4890..d945253475 100644
--- a/meta/recipes-bsp/u-boot/u-boot-common_2018.05.inc
+++ b/meta/recipes-bsp/u-boot/u-boot-common_2018.07.inc
@@ -3,12 +3,12 @@ SECTION = "bootloaders"
 DEPENDS += "flex-native bison-native"
 
 LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=a2c678cfd4a4d97135585cad908541c6"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=30503fd321432fc713238f582193b78e"
 PE = "1"
 
 # We use the revision in order to avoid having to fetch it from the
 # repo during parse
-SRCREV = "890e79f2b1c26c5ba1a86d179706348aec7feef7"
+SRCREV = "8c5d4fd0ec222701598a27b26ab7265d4cee45a3"
 
 SRC_URI = "git://git.denx.de/u-boot.git"
 
diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.05.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.07.bb
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.05.bb
rename to meta/recipes-bsp/u-boot/u-boot-fw-utils_2018.07.bb
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.05.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2018.07.bb
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot-mkimage_2018.05.bb
rename to meta/recipes-bsp/u-boot/u-boot-mkimage_2018.07.bb
diff --git a/meta/recipes-bsp/u-boot/u-boot_2018.05.bb b/meta/recipes-bsp/u-boot/u-boot_2018.07.bb
similarity index 100%
rename from meta/recipes-bsp/u-boot/u-boot_2018.05.bb
rename to meta/recipes-bsp/u-boot/u-boot_2018.07.bb
-- 
2.16.2

[PATCH 4/4] qemux86*: Add U-Boot machine configuration

[Marek Vasut]

Add U-Boot machine configuration for the qemux86 and qemux86-64
to allow building U-Boot on those targets. This in turn allows
the auto-updater to update the U-Boot recipe.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Cc: Otavio Salvador <otavio@ossystems.com.br>
Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
Cc: Ross Burton <ross.burton@intel.com>
---
 meta/conf/machine/qemux86-64.conf | 2 ++
 meta/conf/machine/qemux86.conf    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 2330c7d86e..fd1f4142e9 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -12,6 +12,8 @@ DEFAULTTUNE ?= "core2-64"
 require conf/machine/include/tune-core2.inc
 require conf/machine/include/qemuboot-x86.inc
 
+UBOOT_MACHINE ?= "qemu-x86_64_defconfig"
+
 KERNEL_IMAGETYPE = "bzImage"
 
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1"
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 811e3ef7cf..efcebb2782 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -11,6 +11,8 @@ require conf/machine/include/qemu.inc
 require conf/machine/include/tune-i586.inc
 require conf/machine/include/qemuboot-x86.inc
 
+UBOOT_MACHINE ?= "qemu-x86_defconfig"
+
 KERNEL_IMAGETYPE = "bzImage"
 
 SERIAL_CONSOLES ?= "115200;ttyS0 115200;ttyS1"
-- 
2.16.2

Re: [PATCH 1/4] u-boot: Add missing dependency on swig

[Martin Jansa]

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

Doesn't it add dependency on python as well?

It was failing before RSS when swig-native was autodetected in sysroot:
https://www.mail-archive.com/yocto@yoctoproject.org/msg38214.html
https://lists.yoctoproject.org/pipermail/yocto/2017-October/038347.html
IIRC it fails to build only when the Python.h is also missing on host,
which makes it even worse.

On Wed, Jul 11, 2018 at 5:10 PM Marek Vasut <marex@denx.de> wrote:

> The U-Boot build, in particular the pylibfdt, depends on swig-native.
> Add the missing dependency.
>
> Signed-off-by: Marek Vasut <marex@denx.de>
> Cc: Alexander Kanavin <alexander.kanavin@linux.intel.com>
> Cc: Otavio Salvador <otavio@ossystems.com.br>
> Cc: Richard Purdie <richard.purdie@linuxfoundation.org>
> Cc: Ross Burton <ross.burton@intel.com>
> ---
>  meta/recipes-bsp/u-boot/u-boot_2018.05.bb | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/meta/recipes-bsp/u-boot/u-boot_2018.05.bb
> b/meta/recipes-bsp/u-boot/u-boot_2018.05.bb
> index 37c21dcaa3..3cdec00cbd 100644
> --- a/meta/recipes-bsp/u-boot/u-boot_2018.05.bb
> +++ b/meta/recipes-bsp/u-boot/u-boot_2018.05.bb
> @@ -1,4 +1,4 @@
>  require u-boot-common_${PV}.inc
>  require u-boot.inc
>
> -DEPENDS += "bc-native dtc-native"
> +DEPENDS += "bc-native dtc-native swig-native"
> --
> 2.16.2
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

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

Re: [PATCH 1/4] u-boot: Add missing dependency on swig

[Marek Vasut]

On 07/11/2018 05:20 PM, Martin Jansa wrote:
> Doesn't it add dependency on python as well?

It does as python is needed too.

> It was failing before RSS when swig-native was autodetected in sysroot:

RSS ?

> https://www.mail-archive.com/yocto@yoctoproject.org/msg38214.html
> https://lists.yoctoproject.org/pipermail/yocto/2017-October/038347.html
> IIRC it fails to build only when the Python.h is also missing on host,
> which makes it even worse.

Can you check if it still fails with this patchset ? I believe this
problem you linked is fixed in upstream now, but let's see. I could
never replicate the problem myself.

> On Wed, Jul 11, 2018 at 5:10 PM Marek Vasut <marex@denx.de
> <mailto:marex@denx.de>> wrote:
> 
>     The U-Boot build, in particular the pylibfdt, depends on swig-native.
>     Add the missing dependency.
> 
>     Signed-off-by: Marek Vasut <marex@denx.de <mailto:marex@denx.de>>
>     Cc: Alexander Kanavin <alexander.kanavin@linux.intel.com
>     <mailto:alexander.kanavin@linux.intel.com>>
>     Cc: Otavio Salvador <otavio@ossystems.com.br
>     <mailto:otavio@ossystems.com.br>>
>     Cc: Richard Purdie <richard.purdie@linuxfoundation.org
>     <mailto:richard.purdie@linuxfoundation.org>>
>     Cc: Ross Burton <ross.burton@intel.com <mailto:ross.burton@intel.com>>
>     ---
>      meta/recipes-bsp/u-boot/u-boot_2018.05.bb
>     <http://u-boot_2018.05.bb> | 2 +-
>      1 file changed, 1 insertion(+), 1 deletion(-)
> 
>     diff --git a/meta/recipes-bsp/u-boot/u-boot_2018.05.bb
>     <http://u-boot_2018.05.bb>
>     b/meta/recipes-bsp/u-boot/u-boot_2018.05.bb <http://u-boot_2018.05.bb>
>     index 37c21dcaa3..3cdec00cbd 100644
>     --- a/meta/recipes-bsp/u-boot/u-boot_2018.05.bb
>     <http://u-boot_2018.05.bb>
>     +++ b/meta/recipes-bsp/u-boot/u-boot_2018.05.bb
>     <http://u-boot_2018.05.bb>
>     @@ -1,4 +1,4 @@
>      require u-boot-common_${PV}.inc
>      require u-boot.inc
> 
>     -DEPENDS += "bc-native dtc-native"
>     +DEPENDS += "bc-native dtc-native swig-native"
>     -- 
>     2.16.2
> 
>     -- 
>     _______________________________________________
>     Openembedded-core mailing list
>     Openembedded-core@lists.openembedded.org
>     <mailto:Openembedded-core@lists.openembedded.org>
>     http://lists.openembedded.org/mailman/listinfo/openembedded-core
> 


-- 
Best regards,
Marek Vasut

Re: [PATCH 1/4] u-boot: Add missing dependency on swig

[Burton, Ross]

On 11 July 2018 at 16:03, Marek Vasut <marex@denx.de> wrote:
> The U-Boot build, in particular the pylibfdt, depends on swig-native.
> Add the missing dependency.

If pylibfdt isn't usually needed (which it cant be, if swig is an
optional build dependency which isn't on my machines, or the
autobuilders, right?) can we just disable the building of pylibfdt
instead?

Ross

Re: [PATCH 1/4] u-boot: Add missing dependency on swig

[Marek Vasut]

On 07/11/2018 06:10 PM, Burton, Ross wrote:
> On 11 July 2018 at 16:03, Marek Vasut <marex@denx.de> wrote:
>> The U-Boot build, in particular the pylibfdt, depends on swig-native.
>> Add the missing dependency.
> 
> If pylibfdt isn't usually needed (which it cant be, if swig is an
> optional build dependency which isn't on my machines, or the
> autobuilders, right?) can we just disable the building of pylibfdt
> instead?

Why do you think libpyfdt isn't usually needed ?

Why do you think swig is optional dependency ?

> Ross
> 


-- 
Best regards,
Marek Vasut

Re: [PATCH 1/4] u-boot: Add missing dependency on swig

[Joshua Watt]

On Wed, 2018-07-11 at 20:56 +0200, Marek Vasut wrote:
> On 07/11/2018 06:10 PM, Burton, Ross wrote:
> > On 11 July 2018 at 16:03, Marek Vasut <marex@denx.de> wrote:
> > > The U-Boot build, in particular the pylibfdt, depends on swig-
> > > native.
> > > Add the missing dependency.
> > 
> > If pylibfdt isn't usually needed (which it cant be, if swig is an
> > optional build dependency which isn't on my machines, or the
> > autobuilders, right?) can we just disable the building of pylibfdt
> > instead?
> 
> Why do you think libpyfdt isn't usually needed ?
> 
> Why do you think swig is optional dependency ?

I encountered this same issue and was able to track it down. The
problem is that u-boot is building pylibfdt using the host Python
instead of using python-native provided by bitbake. pylibfdt is a non-
optional dependency for several u-boot configurations, in my case qemu-
x86 and qemu-x84_64.

I pushed a patch to the mailing list that I think fixes this: http://li
sts.openembedded.org/pipermail/openembedded-core/2018-July/153115.html

> 
> > Ross
> > 
> 
> 
> -- 
> Best regards,
> Marek Vasut

Re: [PATCH 1/4] u-boot: Add missing dependency on swig

[Martin Jansa]

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

FWIW: my do_compile_prepend hack to stop autodetecting swig from sysroot
(in pre-RSS - recipe specific sysroots in Yocto 2.2) stopped working in
2017.07 version where it was moved from tools/Makefile:
https://github.com/u-boot/u-boot/commit/727f153629719c93f9c5df6e391fdfee32377ca7#diff-c9b3e9a4c86396781af56d6bdfc8c9f3

It was still building without swig I belive until 2018.07 version which
doesn't use "$(if $(shell which swig 2> /dev/null)" to check for native
swig anymore since:
https://github.com/u-boot/u-boot/commit/15b97f5c5e6d88e0560c6928f3acd01c999a494d#diff-c9b3e9a4c86396781af56d6bdfc8c9f3

Thanks Joshua for the fix.

On Thu, Jul 19, 2018 at 7:00 PM Joshua Watt <jpewhacker@gmail.com> wrote:

> On Wed, 2018-07-11 at 20:56 +0200, Marek Vasut wrote:
> > On 07/11/2018 06:10 PM, Burton, Ross wrote:
> > > On 11 July 2018 at 16:03, Marek Vasut <marex@denx.de> wrote:
> > > > The U-Boot build, in particular the pylibfdt, depends on swig-
> > > > native.
> > > > Add the missing dependency.
> > >
> > > If pylibfdt isn't usually needed (which it cant be, if swig is an
> > > optional build dependency which isn't on my machines, or the
> > > autobuilders, right?) can we just disable the building of pylibfdt
> > > instead?
> >
> > Why do you think libpyfdt isn't usually needed ?
> >
> > Why do you think swig is optional dependency ?
>
> I encountered this same issue and was able to track it down. The
> problem is that u-boot is building pylibfdt using the host Python
> instead of using python-native provided by bitbake. pylibfdt is a non-
> optional dependency for several u-boot configurations, in my case qemu-
> x86 and qemu-x84_64.
>
> I pushed a patch to the mailing list that I think fixes this: http://li
> sts.openembedded.org/pipermail/openembedded-core/2018-July/153115.html
>
> >
> > > Ross
> > >
> >
> >
> > --
> > Best regards,
> > Marek Vasut
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
>

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