* Re: [PATCH v2] u-boot: update to version 2015.01
@ 2015-01-29 14:07 Denys Dmytriyenko
2015-01-29 19:33 ` Denys Dmytriyenko
0 siblings, 1 reply; 19+ messages in thread
From: Denys Dmytriyenko @ 2015-01-29 14:07 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core, Denys Dmytriyenko
[-- Attachment #1: Type: text/html, Size: 1590 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2] u-boot: update to version 2015.01
2015-01-29 14:07 [PATCH v2] u-boot: update to version 2015.01 Denys Dmytriyenko
@ 2015-01-29 19:33 ` Denys Dmytriyenko
2015-01-29 19:59 ` Burton, Ross
0 siblings, 1 reply; 19+ messages in thread
From: Denys Dmytriyenko @ 2015-01-29 19:33 UTC (permalink / raw)
To: Burton, Ross; +Cc: Denys Dmytriyenko, OE-core
On Thu, Jan 29, 2015 at 09:07:29AM -0500, Denys Dmytriyenko wrote:
> I believe I had that in DEPENDS... I'll check.
So, yes, the patch does have DEPENDS = "openssl"
Does it become openssl-native due to BBCLASSEXTEND = "native"? Or do I need a
separate DEPENDS_class-native?
--
Denys
> On Jan 29, 2015 8:19 AM, "Burton, Ross" <ross.burton@intel.com> wrote:
>
> On 23 January 2015 at 22:40, Denys Dmytriyenko <denis@denix.org> wrote:
>
> A rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2014.07.bb =>
> u-boot-mkimage_2015.01.bb} (45%)
>
> u-book-mkimage-native is failing on some autobuilders:
> | In file included from tools/default_image.c:18:0:
> | include/image.h:877:27: fatal error: openssl/evp.h: No such file or
> directory
> | A # include A <openssl/evp.h>
> https://autobuilder.yoctoproject.org/main/builders/nightly-fsl-ppc/builds/170/steps/BuildImages/logs/stdio
> Non-deterministic build dependency on openssl?
> Ross
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2] u-boot: update to version 2015.01
2015-01-29 19:33 ` Denys Dmytriyenko
@ 2015-01-29 19:59 ` Burton, Ross
2015-01-29 20:06 ` Denys Dmytriyenko
0 siblings, 1 reply; 19+ messages in thread
From: Burton, Ross @ 2015-01-29 19:59 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: Denys Dmytriyenko, OE-core
[-- Attachment #1: Type: text/plain, Size: 417 bytes --]
On 29 January 2015 at 19:33, Denys Dmytriyenko <denis@denix.org> wrote:
> > I believe I had that in DEPENDS... I'll check.
>
> So, yes, the patch does have DEPENDS = "openssl"
>
> Does it become openssl-native due to BBCLASSEXTEND = "native"? Or do I
> need a
> separate DEPENDS_class-native?
Unless you have an explicit DEPENDS_class-native assignment, openssl will
become openssl-native.
Ross
[-- Attachment #2: Type: text/html, Size: 818 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2] u-boot: update to version 2015.01
2015-01-29 19:59 ` Burton, Ross
@ 2015-01-29 20:06 ` Denys Dmytriyenko
2015-02-10 16:03 ` Denys Dmytriyenko
0 siblings, 1 reply; 19+ messages in thread
From: Denys Dmytriyenko @ 2015-01-29 20:06 UTC (permalink / raw)
To: Burton, Ross; +Cc: Denys Dmytriyenko, OE-core
On Thu, Jan 29, 2015 at 07:59:09PM +0000, Burton, Ross wrote:
> On 29 January 2015 at 19:33, Denys Dmytriyenko <denis@denix.org> wrote:
>
> > > I believe I had that in DEPENDS... I'll check.
> >
> > So, yes, the patch does have DEPENDS = "openssl"
> >
> > Does it become openssl-native due to BBCLASSEXTEND = "native"? Or do I
> > need a
> > separate DEPENDS_class-native?
>
>
> Unless you have an explicit DEPENDS_class-native assignment, openssl will
> become openssl-native.
Ok, as I suspected... Then, I'm not really sure what the problem might be.
--
Denys
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2] u-boot: update to version 2015.01
2015-01-29 20:06 ` Denys Dmytriyenko
@ 2015-02-10 16:03 ` Denys Dmytriyenko
0 siblings, 0 replies; 19+ messages in thread
From: Denys Dmytriyenko @ 2015-02-10 16:03 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core, Denys Dmytriyenko
On Thu, Jan 29, 2015 at 03:06:48PM -0500, Denys Dmytriyenko wrote:
> On Thu, Jan 29, 2015 at 07:59:09PM +0000, Burton, Ross wrote:
> > On 29 January 2015 at 19:33, Denys Dmytriyenko <denis@denix.org> wrote:
> >
> > > > I believe I had that in DEPENDS... I'll check.
> > >
> > > So, yes, the patch does have DEPENDS = "openssl"
> > >
> > > Does it become openssl-native due to BBCLASSEXTEND = "native"? Or do I
> > > need a
> > > separate DEPENDS_class-native?
> >
> >
> > Unless you have an explicit DEPENDS_class-native assignment, openssl will
> > become openssl-native.
>
> Ok, as I suspected... Then, I'm not really sure what the problem might be.
So, just in case, I've added DEPENDS_class-native explicitly and sent a v2 of
the patch. Please let me know how it works. Thanks.
--
Denys
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2] u-boot: update to version 2015.01
2015-02-10 17:09 ` Denys Dmytriyenko
@ 2015-02-10 17:12 ` Burton, Ross
0 siblings, 0 replies; 19+ messages in thread
From: Burton, Ross @ 2015-02-10 17:12 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: OE-core, Otavio Salvador, Denys Dmytriyenko
[-- Attachment #1: Type: text/plain, Size: 359 bytes --]
Hi Denys,
On 10 February 2015 at 17:09, Denys Dmytriyenko <denis@denix.org> wrote:
> D'oh! I should have dug dipper and notice the native sysroot is not being
> used... Thanks, I'll send a fixed patch shortly.
>
Fresh eyes and all that. :) Can you add V=1 to EXTRA_OEMAKE so this sort
of thing is easier to debug in the future?
Cheers,
Ross
[-- Attachment #2: Type: text/html, Size: 816 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2] u-boot: update to version 2015.01
2015-02-10 16:48 ` Burton, Ross
@ 2015-02-10 17:09 ` Denys Dmytriyenko
2015-02-10 17:12 ` Burton, Ross
0 siblings, 1 reply; 19+ messages in thread
From: Denys Dmytriyenko @ 2015-02-10 17:09 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core, Otavio Salvador, Denys Dmytriyenko
On Tue, Feb 10, 2015 at 04:48:51PM +0000, Burton, Ross wrote:
> On 10 February 2015 at 16:38, Burton, Ross <ross.burton@intel.com> wrote:
>
> > ? Are you saying it's meta-fsl-ppc specific issue?
> >
> >
> > I just replicated with qemuarm and interestingly with zero tasks happening
> > at the same time. I'm wondering if there's a file being written with an
> > old sysroot in that isn't being deleted. I'll dig quickly now.
>
>
> Passing V=1 to EXTRA_OEMAKE (should do this by default as quite logs are
> useless for debugging) shows:
>
> | gcc -Wp,-MD,tools/.mkimage.o.d -Wall -Wstrict-prototypes -O2
> -fomit-frame-pointer -DCONFIG_FIT_SIGNATURE -include
> ./include/libfdt_env.h -idirafterinclude -idirafter./arch/sandbox/include
> -I./lib/libfdt -I./tools -DCONFIG_SYS_TEXT_BASE=0 -DUSE_HOSTCC
> -D__KERNEL_STRICT_NAMES -D_GNU_SOURCE -c -o tools/mkimage.o tools/mkimage.c
> | In file included from tools/ublimage.c:17:0:
> | include/image.h:877:27: fatal error: openssl/evp.h: No such file or
> directory
>
> It's using the host's GCC but there is no pointer to the native sysroot...
> Presumably the trigger here is that I don't have openssl-dev installed on
> the build host.
D'oh! I should have dug dipper and notice the native sysroot is not being
used... Thanks, I'll send a fixed patch shortly.
--
Denys
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2] u-boot: update to version 2015.01
2015-02-10 16:38 ` Burton, Ross
@ 2015-02-10 16:48 ` Burton, Ross
2015-02-10 17:09 ` Denys Dmytriyenko
0 siblings, 1 reply; 19+ messages in thread
From: Burton, Ross @ 2015-02-10 16:48 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: OE-core, Otavio Salvador, Denys Dmytriyenko
[-- Attachment #1: Type: text/plain, Size: 1116 bytes --]
On 10 February 2015 at 16:38, Burton, Ross <ross.burton@intel.com> wrote:
> ? Are you saying it's meta-fsl-ppc specific issue?
>
>
> I just replicated with qemuarm and interestingly with zero tasks happening
> at the same time. I'm wondering if there's a file being written with an
> old sysroot in that isn't being deleted. I'll dig quickly now.
Passing V=1 to EXTRA_OEMAKE (should do this by default as quite logs are
useless for debugging) shows:
| gcc -Wp,-MD,tools/.mkimage.o.d -Wall -Wstrict-prototypes -O2
-fomit-frame-pointer -DCONFIG_FIT_SIGNATURE -include
./include/libfdt_env.h -idirafterinclude -idirafter./arch/sandbox/include
-I./lib/libfdt -I./tools -DCONFIG_SYS_TEXT_BASE=0 -DUSE_HOSTCC
-D__KERNEL_STRICT_NAMES -D_GNU_SOURCE -c -o tools/mkimage.o tools/mkimage.c
| In file included from tools/ublimage.c:17:0:
| include/image.h:877:27: fatal error: openssl/evp.h: No such file or
directory
It's using the host's GCC but there is no pointer to the native sysroot...
Presumably the trigger here is that I don't have openssl-dev installed on
the build host.
Ross
[-- Attachment #2: Type: text/html, Size: 1986 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2] u-boot: update to version 2015.01
2015-02-10 16:29 ` Denys Dmytriyenko
@ 2015-02-10 16:38 ` Burton, Ross
2015-02-10 16:48 ` Burton, Ross
0 siblings, 1 reply; 19+ messages in thread
From: Burton, Ross @ 2015-02-10 16:38 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: OE-core, Otavio Salvador, Denys Dmytriyenko
[-- Attachment #1: Type: text/plain, Size: 584 bytes --]
On 10 February 2015 at 16:29, Denys Dmytriyenko <denis@denix.org> wrote:
> > >> +DEPENDS_class-native = "openssl-native"
> > >
> > >
> > > That *really* shouldn't be required. :(
> >
> > I agree it is not needed and it does seem to be a fail in meta-fsl-ppc
> > which should be fixed there.
>
> ? Are you saying it's meta-fsl-ppc specific issue?
I just replicated with qemuarm and interestingly with zero tasks happening
at the same time. I'm wondering if there's a file being written with an
old sysroot in that isn't being deleted. I'll dig quickly now.
Ross
[-- Attachment #2: Type: text/html, Size: 1034 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2] u-boot: update to version 2015.01
2015-02-10 16:17 ` Otavio Salvador
@ 2015-02-10 16:29 ` Denys Dmytriyenko
2015-02-10 16:38 ` Burton, Ross
0 siblings, 1 reply; 19+ messages in thread
From: Denys Dmytriyenko @ 2015-02-10 16:29 UTC (permalink / raw)
To: Otavio Salvador; +Cc: OE-core, Denys Dmytriyenko
On Tue, Feb 10, 2015 at 02:17:55PM -0200, Otavio Salvador wrote:
> Hello Ross,
>
> On Tue, Feb 10, 2015 at 2:16 PM, Burton, Ross <ross.burton@intel.com> wrote:
> > On 10 February 2015 at 16:02, Denys Dmytriyenko <denis@denix.org> wrote:
> >>
> >> +DEPENDS = "openssl"
> >> +DEPENDS_class-native = "openssl-native"
> >
> >
> > That *really* shouldn't be required. :(
>
> I agree it is not needed and it does seem to be a fail in meta-fsl-ppc
> which should be fixed there.
? Are you saying it's meta-fsl-ppc specific issue?
--
Denys
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2] u-boot: update to version 2015.01
2015-02-10 16:16 ` Burton, Ross
2015-02-10 16:17 ` Otavio Salvador
@ 2015-02-10 16:26 ` Denys Dmytriyenko
1 sibling, 0 replies; 19+ messages in thread
From: Denys Dmytriyenko @ 2015-02-10 16:26 UTC (permalink / raw)
To: Burton, Ross; +Cc: Denys Dmytriyenko, OE-core
On Tue, Feb 10, 2015 at 04:16:00PM +0000, Burton, Ross wrote:
> Hi Denys,
>
> On 10 February 2015 at 16:02, Denys Dmytriyenko <denis@denix.org> wrote:
>
> > +DEPENDS = "openssl"
> > +DEPENDS_class-native = "openssl-native"
> >
>
> That *really* shouldn't be required. :(
>
> And indeed, the old patch with -e shows that it isn't:
Yes, I understand it completely and my tests show the same exact -e output.
But since there were no other suggestions, I decided to cheat a bit... :)
> # $DEPENDS [6 operations]
> # set /home/ross/Yocto/poky/meta/conf/bitbake.conf:246
> # ""
> # set /home/ross/Yocto/poky/meta/conf/documentation.conf:135
> # [doc] "Lists a recipe's build-time dependencies (i.e. other recipe
> files)."
> # _prepend /home/ross/Yocto/poky/meta/classes/base.bbclass:81
> # "${BASEDEPENDS} "
> # set /home/ross/Yocto/poky/meta/recipes-bsp/u-boot/
> u-boot-mkimage_2015.01.bb:6
> # "openssl"
> # set native_virtclass_handler(e):27 [map_dependencies]
> # "openssl-native"
> # set data_smart.py:437 [finalize]
> # "${BASEDEPENDS} openssl-native"
> # pre-expansion value:
> # "${BASEDEPENDS} openssl-native"
> DEPENDS=" openssl-native"
>
> This is *very* strange. When the AB is free I'll do another rebuild to see
> what happens under load.
Thanks a lot! Looking forward for the results.
> Was the DEPENDS_class-native change the only difference between v1 and v2?
Yes, that was the only change.
--
Denys
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2] u-boot: update to version 2015.01
2015-02-10 16:16 ` Burton, Ross
@ 2015-02-10 16:17 ` Otavio Salvador
2015-02-10 16:29 ` Denys Dmytriyenko
2015-02-10 16:26 ` Denys Dmytriyenko
1 sibling, 1 reply; 19+ messages in thread
From: Otavio Salvador @ 2015-02-10 16:17 UTC (permalink / raw)
To: Burton, Ross; +Cc: OE-core, Denys Dmytriyenko
Hello Ross,
On Tue, Feb 10, 2015 at 2:16 PM, Burton, Ross <ross.burton@intel.com> wrote:
> On 10 February 2015 at 16:02, Denys Dmytriyenko <denis@denix.org> wrote:
>>
>> +DEPENDS = "openssl"
>> +DEPENDS_class-native = "openssl-native"
>
>
> That *really* shouldn't be required. :(
I agree it is not needed and it does seem to be a fail in meta-fsl-ppc
which should be fixed there.
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2] u-boot: update to version 2015.01
2015-02-10 16:02 Denys Dmytriyenko
@ 2015-02-10 16:16 ` Burton, Ross
2015-02-10 16:17 ` Otavio Salvador
2015-02-10 16:26 ` Denys Dmytriyenko
0 siblings, 2 replies; 19+ messages in thread
From: Burton, Ross @ 2015-02-10 16:16 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: Denys Dmytriyenko, OE-core
[-- Attachment #1: Type: text/plain, Size: 1136 bytes --]
Hi Denys,
On 10 February 2015 at 16:02, Denys Dmytriyenko <denis@denix.org> wrote:
> +DEPENDS = "openssl"
> +DEPENDS_class-native = "openssl-native"
>
That *really* shouldn't be required. :(
And indeed, the old patch with -e shows that it isn't:
# $DEPENDS [6 operations]
# set /home/ross/Yocto/poky/meta/conf/bitbake.conf:246
# ""
# set /home/ross/Yocto/poky/meta/conf/documentation.conf:135
# [doc] "Lists a recipe's build-time dependencies (i.e. other recipe
files)."
# _prepend /home/ross/Yocto/poky/meta/classes/base.bbclass:81
# "${BASEDEPENDS} "
# set /home/ross/Yocto/poky/meta/recipes-bsp/u-boot/
u-boot-mkimage_2015.01.bb:6
# "openssl"
# set native_virtclass_handler(e):27 [map_dependencies]
# "openssl-native"
# set data_smart.py:437 [finalize]
# "${BASEDEPENDS} openssl-native"
# pre-expansion value:
# "${BASEDEPENDS} openssl-native"
DEPENDS=" openssl-native"
This is *very* strange. When the AB is free I'll do another rebuild to see
what happens under load. Was the DEPENDS_class-native change the only
difference between v1 and v2?
Ross
[-- Attachment #2: Type: text/html, Size: 2435 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v2] u-boot: update to version 2015.01
@ 2015-02-10 16:02 Denys Dmytriyenko
2015-02-10 16:16 ` Burton, Ross
0 siblings, 1 reply; 19+ messages in thread
From: Denys Dmytriyenko @ 2015-02-10 16:02 UTC (permalink / raw)
To: openembedded-core; +Cc: Denys Dmytriyenko
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
v2 - explicitly depend u-boot-mkimage-native on openssl-native
.../0001-tools-env-fix-build-error.patch | 36 ++++++++++++++++++++++
...utils_2014.07.bb => u-boot-fw-utils_2015.01.bb} | 21 +++++++------
...kimage_2014.07.bb => u-boot-mkimage_2015.01.bb} | 21 ++++++-------
meta/recipes-bsp/u-boot/u-boot.inc | 2 +-
.../{u-boot_2014.07.bb => u-boot_2015.01.bb} | 6 ++--
5 files changed, 62 insertions(+), 24 deletions(-)
create mode 100644 meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch
rename meta/recipes-bsp/u-boot/{u-boot-fw-utils_2014.07.bb => u-boot-fw-utils_2015.01.bb} (58%)
rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2014.07.bb => u-boot-mkimage_2015.01.bb} (45%)
rename meta/recipes-bsp/u-boot/{u-boot_2014.07.bb => u-boot_2015.01.bb} (50%)
diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch b/meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch
new file mode 100644
index 0000000..381b505
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch
@@ -0,0 +1,36 @@
+From ee2d75513452aa6d5306fd380104adc8a2f6d8f2 Mon Sep 17 00:00:00 2001
+From: Masahiro Yamada <yamada.m@jp.panasonic.com>
+Date: Wed, 3 Dec 2014 10:22:50 +0900
+Subject: [PATCH] tools: env: fix build error
+
+Since CONFIG_SYS_ARCH, CONFIG_SYS_CPU, ... were moved to Kconfig,
+tools/env/fw_printenv fails to build if CONFIG_ENV_VARS_UBOOT_CONFIG
+is defined.
+(I do not think this is the right way to fix the problem, but
+for now I do not have enough time to take a close look.)
+
+Upstream-Status: Submitted [http://patchwork.ozlabs.org/patch/417192/]
+
+Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
+Reported-by: Denys Dmytriyenko <denys@ti.com>
+---
+ tools/env/fw_env.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
+index 1173eea..698fe51 100644
+--- a/tools/env/fw_env.c
++++ b/tools/env/fw_env.c
+@@ -8,6 +8,9 @@
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
++/* FIXME: Do not include this */
++#include <linux/kconfig.h>
++
+ #include <errno.h>
+ #include <env_flags.h>
+ #include <fcntl.h>
+--
+2.2.0
+
diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2014.07.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2015.01.bb
similarity index 58%
rename from meta/recipes-bsp/u-boot/u-boot-fw-utils_2014.07.bb
rename to meta/recipes-bsp/u-boot/u-boot-fw-utils_2015.01.bb
index 9a304c8..17453ca 100644
--- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2014.07.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2015.01.bb
@@ -1,21 +1,24 @@
SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
SECTION = "bootloader"
DEPENDS = "mtd-utils"
-# This revision corresponds to the tag "v2014.07"
+# This revision corresponds to the tag "v2015.01"
# We use the revision in order to avoid having to fetch it from the
# repo during parse
-SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959"
+SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368"
-PV = "v2014.07+git${SRCPV}"
+PV = "v2015.01+git${SRCPV}"
-SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
+SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git \
+ file://0001-tools-env-fix-build-error.patch"
S = "${WORKDIR}/git"
INSANE_SKIP_${PN} = "already-stripped"
+EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}"'
+EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH}'
inherit uboot-config
@@ -33,14 +36,14 @@ do_install () {
}
do_install_class-cross () {
- install -d ${D}${bindir_cross}
- install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv
- install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv
+ install -d ${D}${bindir_cross}
+ install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv
+ install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv
}
SYSROOT_PREPROCESS_FUNCS_class-cross = "uboot_fw_utils_cross"
uboot_fw_utils_cross() {
- sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross}
+ sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross}
}
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2014.07.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb
similarity index 45%
rename from meta/recipes-bsp/u-boot/u-boot-mkimage_2014.07.bb
rename to meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb
index eabf680..e68b5ee 100644
--- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2014.07.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb
@@ -1,28 +1,27 @@
SUMMARY = "U-Boot bootloader image creation tool"
LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
SECTION = "bootloader"
-# This revision corresponds to the tag "v2014.07"
+DEPENDS = "openssl"
+DEPENDS_class-native = "openssl-native"
+
+# This revision corresponds to the tag "v2015.01"
# We use the revision in order to avoid having to fetch it from the
# repo during parse
-SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959"
+SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368"
-PV = "v2014.07+git${SRCPV}"
+PV = "v2015.01+git${SRCPV}"
SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
S = "${WORKDIR}/git"
-EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTLD="${LD}" HOSTLDFLAGS="${LDFLAGS}" HOSTSTRIP=true'
+EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC}" STRIP=true'
do_compile () {
- # Make sure the recompile is OK
- rm -f ${B}/tools/.depend
-
- make HOSTCC="${BUILD_CC}" HOSTLD="${BUILD_LD}" HOSTLDFLAGS="${BUILD_LDFLAGS}" HOSTSTRIP=true dot-config=0 scripts_basic
- sed 's/^tools-only: scripts_basic /tools-only: /' -i Makefile
- oe_runmake tools-only
+ oe_runmake sandbox_defconfig
+ oe_runmake cross_tools NO_SDL=1
}
do_install () {
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index 58725fa..5c6cb4e 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -4,7 +4,7 @@ SECTION = "bootloaders"
PROVIDES = "virtual/bootloader"
LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
diff --git a/meta/recipes-bsp/u-boot/u-boot_2014.07.bb b/meta/recipes-bsp/u-boot/u-boot_2015.01.bb
similarity index 50%
rename from meta/recipes-bsp/u-boot/u-boot_2014.07.bb
rename to meta/recipes-bsp/u-boot/u-boot_2015.01.bb
index 44cc52e..6feac31 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2014.07.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2015.01.bb
@@ -2,8 +2,8 @@ require u-boot.inc
DEPENDS += "dtc-native"
-# This revision corresponds to the tag "v2014.07"
+# This revision corresponds to the tag "v2015.01"
# We use the revision in order to avoid having to fetch it from the repo during parse
-SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959"
+SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368"
-PV = "v2014.07+git${SRCPV}"
+PV = "v2015.01+git${SRCPV}"
--
2.2.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
* Re: [PATCH v2] u-boot: update to version 2015.01
2015-01-23 22:40 Denys Dmytriyenko
2015-01-26 17:13 ` Denys Dmytriyenko
@ 2015-01-29 13:19 ` Burton, Ross
1 sibling, 0 replies; 19+ messages in thread
From: Burton, Ross @ 2015-01-29 13:19 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: Denys Dmytriyenko, OE-core
[-- Attachment #1: Type: text/plain, Size: 574 bytes --]
On 23 January 2015 at 22:40, Denys Dmytriyenko <denis@denix.org> wrote:
> rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2014.07.bb => u-boot
> -mkimage_2015.01.bb} (45%)
>
u-book-mkimage-native is failing on some autobuilders:
| In file included from tools/default_image.c:18:0:
| include/image.h:877:27: fatal error: openssl/evp.h: No such file or
directory
| # include <openssl/evp.h>
https://autobuilder.yoctoproject.org/main/builders/nightly-fsl-ppc/builds/170/steps/BuildImages/logs/stdio
Non-deterministic build dependency on openssl?
Ross
[-- Attachment #2: Type: text/html, Size: 1695 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2] u-boot: update to version 2015.01
2015-01-26 17:15 ` Burton, Ross
@ 2015-01-26 17:17 ` Otavio Salvador
0 siblings, 0 replies; 19+ messages in thread
From: Otavio Salvador @ 2015-01-26 17:17 UTC (permalink / raw)
To: Burton, Ross; +Cc: Denys Dmytriyenko, OE-core
On Mon, Jan 26, 2015 at 3:15 PM, Burton, Ross <ross.burton@intel.com> wrote:
>
> On 26 January 2015 at 17:13, Denys Dmytriyenko <denis@denix.org> wrote:
>>
>> Any feedback so far?
>
>
> Builds for me for beaglebone, totally untested. An ack from Otavio would be
> greatly appreciated :)
Acked-by: Otavio Salvador <otavio@ossystems.com.br>
--
Otavio Salvador O.S. Systems
http://www.ossystems.com.br http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854 Mobile: +1 (347) 903-9750
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2] u-boot: update to version 2015.01
2015-01-26 17:13 ` Denys Dmytriyenko
@ 2015-01-26 17:15 ` Burton, Ross
2015-01-26 17:17 ` Otavio Salvador
0 siblings, 1 reply; 19+ messages in thread
From: Burton, Ross @ 2015-01-26 17:15 UTC (permalink / raw)
To: Denys Dmytriyenko; +Cc: Denys Dmytriyenko, Otavio Salvador, OE-core
[-- Attachment #1: Type: text/plain, Size: 214 bytes --]
On 26 January 2015 at 17:13, Denys Dmytriyenko <denis@denix.org> wrote:
> Any feedback so far?
>
Builds for me for beaglebone, totally untested. An ack from Otavio would
be greatly appreciated :)
Ross
[-- Attachment #2: Type: text/html, Size: 598 bytes --]
^ permalink raw reply [flat|nested] 19+ messages in thread
* Re: [PATCH v2] u-boot: update to version 2015.01
2015-01-23 22:40 Denys Dmytriyenko
@ 2015-01-26 17:13 ` Denys Dmytriyenko
2015-01-26 17:15 ` Burton, Ross
2015-01-29 13:19 ` Burton, Ross
1 sibling, 1 reply; 19+ messages in thread
From: Denys Dmytriyenko @ 2015-01-26 17:13 UTC (permalink / raw)
To: openembedded-core; +Cc: Otavio Salvador, Denys Dmytriyenko
Any feedback so far?
On Fri, Jan 23, 2015 at 05:40:18PM -0500, Denys Dmytriyenko wrote:
> From: Denys Dmytriyenko <denys@ti.com>
>
> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
> ---
> v2 - rebase on top of fw-utils combining patch from Otavio
>
> .../0001-tools-env-fix-build-error.patch | 36 ++++++++++++++++++++++
> ...utils_2014.07.bb => u-boot-fw-utils_2015.01.bb} | 21 +++++++------
> ...kimage_2014.07.bb => u-boot-mkimage_2015.01.bb} | 20 ++++++------
> meta/recipes-bsp/u-boot/u-boot.inc | 2 +-
> .../{u-boot_2014.07.bb => u-boot_2015.01.bb} | 6 ++--
> 5 files changed, 61 insertions(+), 24 deletions(-)
> create mode 100644 meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch
> rename meta/recipes-bsp/u-boot/{u-boot-fw-utils_2014.07.bb => u-boot-fw-utils_2015.01.bb} (58%)
> rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2014.07.bb => u-boot-mkimage_2015.01.bb} (45%)
> rename meta/recipes-bsp/u-boot/{u-boot_2014.07.bb => u-boot_2015.01.bb} (50%)
>
> diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch b/meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch
> new file mode 100644
> index 0000000..381b505
> --- /dev/null
> +++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch
> @@ -0,0 +1,36 @@
> +From ee2d75513452aa6d5306fd380104adc8a2f6d8f2 Mon Sep 17 00:00:00 2001
> +From: Masahiro Yamada <yamada.m@jp.panasonic.com>
> +Date: Wed, 3 Dec 2014 10:22:50 +0900
> +Subject: [PATCH] tools: env: fix build error
> +
> +Since CONFIG_SYS_ARCH, CONFIG_SYS_CPU, ... were moved to Kconfig,
> +tools/env/fw_printenv fails to build if CONFIG_ENV_VARS_UBOOT_CONFIG
> +is defined.
> +(I do not think this is the right way to fix the problem, but
> +for now I do not have enough time to take a close look.)
> +
> +Upstream-Status: Submitted [http://patchwork.ozlabs.org/patch/417192/]
> +
> +Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> +Reported-by: Denys Dmytriyenko <denys@ti.com>
> +---
> + tools/env/fw_env.c | 3 +++
> + 1 file changed, 3 insertions(+)
> +
> +diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
> +index 1173eea..698fe51 100644
> +--- a/tools/env/fw_env.c
> ++++ b/tools/env/fw_env.c
> +@@ -8,6 +8,9 @@
> + * SPDX-License-Identifier: GPL-2.0+
> + */
> +
> ++/* FIXME: Do not include this */
> ++#include <linux/kconfig.h>
> ++
> + #include <errno.h>
> + #include <env_flags.h>
> + #include <fcntl.h>
> +--
> +2.2.0
> +
> diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2014.07.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2015.01.bb
> similarity index 58%
> rename from meta/recipes-bsp/u-boot/u-boot-fw-utils_2014.07.bb
> rename to meta/recipes-bsp/u-boot/u-boot-fw-utils_2015.01.bb
> index 9a304c8..17453ca 100644
> --- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2014.07.bb
> +++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2015.01.bb
> @@ -1,21 +1,24 @@
> SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
> LICENSE = "GPLv2+"
> -LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
> +LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
> SECTION = "bootloader"
> DEPENDS = "mtd-utils"
>
> -# This revision corresponds to the tag "v2014.07"
> +# This revision corresponds to the tag "v2015.01"
> # We use the revision in order to avoid having to fetch it from the
> # repo during parse
> -SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959"
> +SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368"
>
> -PV = "v2014.07+git${SRCPV}"
> +PV = "v2015.01+git${SRCPV}"
>
> -SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
> +SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git \
> + file://0001-tools-env-fix-build-error.patch"
>
> S = "${WORKDIR}/git"
>
> INSANE_SKIP_${PN} = "already-stripped"
> +EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}"'
> +EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH}'
>
> inherit uboot-config
>
> @@ -33,14 +36,14 @@ do_install () {
> }
>
> do_install_class-cross () {
> - install -d ${D}${bindir_cross}
> - install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv
> - install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv
> + install -d ${D}${bindir_cross}
> + install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv
> + install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv
> }
>
> SYSROOT_PREPROCESS_FUNCS_class-cross = "uboot_fw_utils_cross"
> uboot_fw_utils_cross() {
> - sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross}
> + sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross}
> }
>
> PACKAGE_ARCH = "${MACHINE_ARCH}"
> diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2014.07.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb
> similarity index 45%
> rename from meta/recipes-bsp/u-boot/u-boot-mkimage_2014.07.bb
> rename to meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb
> index eabf680..1bfdf9d 100644
> --- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2014.07.bb
> +++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb
> @@ -1,28 +1,26 @@
> SUMMARY = "U-Boot bootloader image creation tool"
> LICENSE = "GPLv2+"
> -LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
> +LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
> SECTION = "bootloader"
>
> -# This revision corresponds to the tag "v2014.07"
> +DEPENDS = "openssl"
> +
> +# This revision corresponds to the tag "v2015.01"
> # We use the revision in order to avoid having to fetch it from the
> # repo during parse
> -SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959"
> +SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368"
>
> -PV = "v2014.07+git${SRCPV}"
> +PV = "v2015.01+git${SRCPV}"
>
> SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
>
> S = "${WORKDIR}/git"
>
> -EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTLD="${LD}" HOSTLDFLAGS="${LDFLAGS}" HOSTSTRIP=true'
> +EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC}" STRIP=true'
>
> do_compile () {
> - # Make sure the recompile is OK
> - rm -f ${B}/tools/.depend
> -
> - make HOSTCC="${BUILD_CC}" HOSTLD="${BUILD_LD}" HOSTLDFLAGS="${BUILD_LDFLAGS}" HOSTSTRIP=true dot-config=0 scripts_basic
> - sed 's/^tools-only: scripts_basic /tools-only: /' -i Makefile
> - oe_runmake tools-only
> + oe_runmake sandbox_defconfig
> + oe_runmake cross_tools NO_SDL=1
> }
>
> do_install () {
> diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
> index c695b73..4edab84 100644
> --- a/meta/recipes-bsp/u-boot/u-boot.inc
> +++ b/meta/recipes-bsp/u-boot/u-boot.inc
> @@ -4,7 +4,7 @@ SECTION = "bootloaders"
> PROVIDES = "virtual/bootloader"
>
> LICENSE = "GPLv2+"
> -LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
> +LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
>
> SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
>
> diff --git a/meta/recipes-bsp/u-boot/u-boot_2014.07.bb b/meta/recipes-bsp/u-boot/u-boot_2015.01.bb
> similarity index 50%
> rename from meta/recipes-bsp/u-boot/u-boot_2014.07.bb
> rename to meta/recipes-bsp/u-boot/u-boot_2015.01.bb
> index 44cc52e..6feac31 100644
> --- a/meta/recipes-bsp/u-boot/u-boot_2014.07.bb
> +++ b/meta/recipes-bsp/u-boot/u-boot_2015.01.bb
> @@ -2,8 +2,8 @@ require u-boot.inc
>
> DEPENDS += "dtc-native"
>
> -# This revision corresponds to the tag "v2014.07"
> +# This revision corresponds to the tag "v2015.01"
> # We use the revision in order to avoid having to fetch it from the repo during parse
> -SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959"
> +SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368"
>
> -PV = "v2014.07+git${SRCPV}"
> +PV = "v2015.01+git${SRCPV}"
> --
> 2.2.0
>
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core
^ permalink raw reply [flat|nested] 19+ messages in thread
* [PATCH v2] u-boot: update to version 2015.01
@ 2015-01-23 22:40 Denys Dmytriyenko
2015-01-26 17:13 ` Denys Dmytriyenko
2015-01-29 13:19 ` Burton, Ross
0 siblings, 2 replies; 19+ messages in thread
From: Denys Dmytriyenko @ 2015-01-23 22:40 UTC (permalink / raw)
To: openembedded-core; +Cc: Denys Dmytriyenko
From: Denys Dmytriyenko <denys@ti.com>
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
---
v2 - rebase on top of fw-utils combining patch from Otavio
.../0001-tools-env-fix-build-error.patch | 36 ++++++++++++++++++++++
...utils_2014.07.bb => u-boot-fw-utils_2015.01.bb} | 21 +++++++------
...kimage_2014.07.bb => u-boot-mkimage_2015.01.bb} | 20 ++++++------
meta/recipes-bsp/u-boot/u-boot.inc | 2 +-
.../{u-boot_2014.07.bb => u-boot_2015.01.bb} | 6 ++--
5 files changed, 61 insertions(+), 24 deletions(-)
create mode 100644 meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch
rename meta/recipes-bsp/u-boot/{u-boot-fw-utils_2014.07.bb => u-boot-fw-utils_2015.01.bb} (58%)
rename meta/recipes-bsp/u-boot/{u-boot-mkimage_2014.07.bb => u-boot-mkimage_2015.01.bb} (45%)
rename meta/recipes-bsp/u-boot/{u-boot_2014.07.bb => u-boot_2015.01.bb} (50%)
diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch b/meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch
new file mode 100644
index 0000000..381b505
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch
@@ -0,0 +1,36 @@
+From ee2d75513452aa6d5306fd380104adc8a2f6d8f2 Mon Sep 17 00:00:00 2001
+From: Masahiro Yamada <yamada.m@jp.panasonic.com>
+Date: Wed, 3 Dec 2014 10:22:50 +0900
+Subject: [PATCH] tools: env: fix build error
+
+Since CONFIG_SYS_ARCH, CONFIG_SYS_CPU, ... were moved to Kconfig,
+tools/env/fw_printenv fails to build if CONFIG_ENV_VARS_UBOOT_CONFIG
+is defined.
+(I do not think this is the right way to fix the problem, but
+for now I do not have enough time to take a close look.)
+
+Upstream-Status: Submitted [http://patchwork.ozlabs.org/patch/417192/]
+
+Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
+Reported-by: Denys Dmytriyenko <denys@ti.com>
+---
+ tools/env/fw_env.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c
+index 1173eea..698fe51 100644
+--- a/tools/env/fw_env.c
++++ b/tools/env/fw_env.c
+@@ -8,6 +8,9 @@
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
++/* FIXME: Do not include this */
++#include <linux/kconfig.h>
++
+ #include <errno.h>
+ #include <env_flags.h>
+ #include <fcntl.h>
+--
+2.2.0
+
diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2014.07.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2015.01.bb
similarity index 58%
rename from meta/recipes-bsp/u-boot/u-boot-fw-utils_2014.07.bb
rename to meta/recipes-bsp/u-boot/u-boot-fw-utils_2015.01.bb
index 9a304c8..17453ca 100644
--- a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2014.07.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2015.01.bb
@@ -1,21 +1,24 @@
SUMMARY = "U-Boot bootloader fw_printenv/setenv utilities"
LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
SECTION = "bootloader"
DEPENDS = "mtd-utils"
-# This revision corresponds to the tag "v2014.07"
+# This revision corresponds to the tag "v2015.01"
# We use the revision in order to avoid having to fetch it from the
# repo during parse
-SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959"
+SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368"
-PV = "v2014.07+git${SRCPV}"
+PV = "v2015.01+git${SRCPV}"
-SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
+SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git \
+ file://0001-tools-env-fix-build-error.patch"
S = "${WORKDIR}/git"
INSANE_SKIP_${PN} = "already-stripped"
+EXTRA_OEMAKE_class-target = 'CROSS_COMPILE=${TARGET_PREFIX} CC="${CC}"'
+EXTRA_OEMAKE_class-cross = 'ARCH=${TARGET_ARCH}'
inherit uboot-config
@@ -33,14 +36,14 @@ do_install () {
}
do_install_class-cross () {
- install -d ${D}${bindir_cross}
- install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv
- install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv
+ install -d ${D}${bindir_cross}
+ install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_printenv
+ install -m 755 ${S}/tools/env/fw_printenv ${D}${bindir_cross}/fw_setenv
}
SYSROOT_PREPROCESS_FUNCS_class-cross = "uboot_fw_utils_cross"
uboot_fw_utils_cross() {
- sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross}
+ sysroot_stage_dir ${D}${bindir_cross} ${SYSROOT_DESTDIR}${bindir_cross}
}
PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta/recipes-bsp/u-boot/u-boot-mkimage_2014.07.bb b/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb
similarity index 45%
rename from meta/recipes-bsp/u-boot/u-boot-mkimage_2014.07.bb
rename to meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb
index eabf680..1bfdf9d 100644
--- a/meta/recipes-bsp/u-boot/u-boot-mkimage_2014.07.bb
+++ b/meta/recipes-bsp/u-boot/u-boot-mkimage_2015.01.bb
@@ -1,28 +1,26 @@
SUMMARY = "U-Boot bootloader image creation tool"
LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
SECTION = "bootloader"
-# This revision corresponds to the tag "v2014.07"
+DEPENDS = "openssl"
+
+# This revision corresponds to the tag "v2015.01"
# We use the revision in order to avoid having to fetch it from the
# repo during parse
-SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959"
+SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368"
-PV = "v2014.07+git${SRCPV}"
+PV = "v2015.01+git${SRCPV}"
SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
S = "${WORKDIR}/git"
-EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTLD="${LD}" HOSTLDFLAGS="${LDFLAGS}" HOSTSTRIP=true'
+EXTRA_OEMAKE = 'CROSS_COMPILE="${TARGET_PREFIX}" CC="${CC}" STRIP=true'
do_compile () {
- # Make sure the recompile is OK
- rm -f ${B}/tools/.depend
-
- make HOSTCC="${BUILD_CC}" HOSTLD="${BUILD_LD}" HOSTLDFLAGS="${BUILD_LDFLAGS}" HOSTSTRIP=true dot-config=0 scripts_basic
- sed 's/^tools-only: scripts_basic /tools-only: /' -i Makefile
- oe_runmake tools-only
+ oe_runmake sandbox_defconfig
+ oe_runmake cross_tools NO_SDL=1
}
do_install () {
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc
index c695b73..4edab84 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -4,7 +4,7 @@ SECTION = "bootloaders"
PROVIDES = "virtual/bootloader"
LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=025bf9f768cbcb1a165dbe1a110babfb"
+LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919"
SRC_URI = "git://git.denx.de/u-boot.git;branch=master"
diff --git a/meta/recipes-bsp/u-boot/u-boot_2014.07.bb b/meta/recipes-bsp/u-boot/u-boot_2015.01.bb
similarity index 50%
rename from meta/recipes-bsp/u-boot/u-boot_2014.07.bb
rename to meta/recipes-bsp/u-boot/u-boot_2015.01.bb
index 44cc52e..6feac31 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2014.07.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2015.01.bb
@@ -2,8 +2,8 @@ require u-boot.inc
DEPENDS += "dtc-native"
-# This revision corresponds to the tag "v2014.07"
+# This revision corresponds to the tag "v2015.01"
# We use the revision in order to avoid having to fetch it from the repo during parse
-SRCREV = "524123a70761110c5cf3ccc5f52f6d4da071b959"
+SRCREV = "92fa7f53f1f3f03296f8ffb14bdf1baefab83368"
-PV = "v2014.07+git${SRCPV}"
+PV = "v2015.01+git${SRCPV}"
--
2.2.0
^ permalink raw reply related [flat|nested] 19+ messages in thread
end of thread, other threads:[~2015-02-10 17:13 UTC | newest]
Thread overview: 19+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-01-29 14:07 [PATCH v2] u-boot: update to version 2015.01 Denys Dmytriyenko
2015-01-29 19:33 ` Denys Dmytriyenko
2015-01-29 19:59 ` Burton, Ross
2015-01-29 20:06 ` Denys Dmytriyenko
2015-02-10 16:03 ` Denys Dmytriyenko
-- strict thread matches above, loose matches on Subject: below --
2015-02-10 16:02 Denys Dmytriyenko
2015-02-10 16:16 ` Burton, Ross
2015-02-10 16:17 ` Otavio Salvador
2015-02-10 16:29 ` Denys Dmytriyenko
2015-02-10 16:38 ` Burton, Ross
2015-02-10 16:48 ` Burton, Ross
2015-02-10 17:09 ` Denys Dmytriyenko
2015-02-10 17:12 ` Burton, Ross
2015-02-10 16:26 ` Denys Dmytriyenko
2015-01-23 22:40 Denys Dmytriyenko
2015-01-26 17:13 ` Denys Dmytriyenko
2015-01-26 17:15 ` Burton, Ross
2015-01-26 17:17 ` Otavio Salvador
2015-01-29 13:19 ` Burton, Ross
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.