Patchwork [1/1] u-boot-fw-utils: reinstate target recipe for fw_printenv

login
register
mail settings
Submitter Anders Darander
Date Sept. 13, 2013, 7:21 p.m.
Message ID <a8748357e163efb38b354d4142293393c2a2cc9a.1379100075.git.anders@chargestorm.se>
Download mbox | patch
Permalink /patch/57995/
State Accepted
Commit 83cb07047658e2e2b2d721e1b01553d4df3d8636
Headers show

Comments

Anders Darander - Sept. 13, 2013, 7:21 p.m.
The latest upgrade changed u-boot-fw-utils to u-boot-fw-utils-cross, which
removed the on-target fw_printenv (and fw_setenv).

Re-create the updated version of the u-boot-fw-utils recipe.

U-Boot does try to strip the fw_printenv binary by default now. To avoid
this, without patching the Makefile, we add HOSTSTRIP=true to EXTRA_OEMAKE.

The new U-Boot do also require us to configure the build for a specific
machine, thus we change the package arch.§

Signed-off-by: Anders Darander <anders@chargestorm.se>
---
 meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb | 31 ++++++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb
Otavio Salvador - Sept. 13, 2013, 8:46 p.m.
On Fri, Sep 13, 2013 at 4:21 PM, Anders Darander <anders@chargestorm.se> wrote:
> The latest upgrade changed u-boot-fw-utils to u-boot-fw-utils-cross, which
> removed the on-target fw_printenv (and fw_setenv).
>
> Re-create the updated version of the u-boot-fw-utils recipe.
>
> U-Boot does try to strip the fw_printenv binary by default now. To avoid
> this, without patching the Makefile, we add HOSTSTRIP=true to EXTRA_OEMAKE.
>
> The new U-Boot do also require us to configure the build for a specific
> machine, thus we change the package arch.§
>
> Signed-off-by: Anders Darander <anders@chargestorm.se>

I think this is the best way to handle this for Dora; for 1.6 (I will
prepare the patches when updating to 2013.10) I think we ought to
squash this into u-boot build so it is done all in same build process.

Thanks for fixing a regression introduced by me.

Acked-by: Otavio Salvador <otavio@ossystems.com.br>
Saul Wold - Sept. 17, 2013, 11:47 p.m.
On 09/13/2013 12:21 PM, Anders Darander wrote:
> The latest upgrade changed u-boot-fw-utils to u-boot-fw-utils-cross, which
> removed the on-target fw_printenv (and fw_setenv).
>
> Re-create the updated version of the u-boot-fw-utils recipe.
>
> U-Boot does try to strip the fw_printenv binary by default now. To avoid
> this, without patching the Makefile, we add HOSTSTRIP=true to EXTRA_OEMAKE.
>
> The new U-Boot do also require us to configure the build for a specific
> machine, thus we change the package arch.§
>
> Signed-off-by: Anders Darander <anders@chargestorm.se>
> ---
>   meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb | 31 ++++++++++++++++++++++
>   1 file changed, 31 insertions(+)
>   create mode 100644 meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb
>
> diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb
> new file mode 100644
> index 0000000..f97df71
> --- /dev/null
> +++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb
> @@ -0,0 +1,31 @@
> +DESCRIPTION = "U-boot bootloader fw_printenv/setenv utils"
> +LICENSE = "GPLv2+"
> +LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
> +SECTION = "bootloader"
> +DEPENDS = "mtd-utils"
> +
> +# This revision corresponds to the tag "v2013.07"
> +# We use the revision in order to avoid having to fetch it from the
> +# repo during parse
> +SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c"
> +
> +PV = "v2013.07+git${SRCPV}"
> +
> +SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
> +
> +S = "${WORKDIR}/git"
> +
> +EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTSTRIP="true"'
> +
> +do_compile () {
> +  oe_runmake ${UBOOT_MACHINE}
> +  oe_runmake env
> +}
> +
> +do_install () {
> +  install -d ${D}${base_sbindir}
> +  install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv
> +  install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv
> +}
> +
> +PACKAGE_ARCH = "${MACHINE_ARCH}"
>

I think this might need a COMPATIBLE_MACHINE or some check for correct 
systems
> ERROR: Function failed: do_compile (log file is located at /srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-world/build/build/tmp/work/qemux86-pokymllib32-linux/lib32-u-boot-fw-utils/v2013.07+gitAUTOINC+62c175fbb8-r0/temp/log.do_compile.4727)
> ERROR: Logfile of failure stored in: /srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-world/build/build/tmp/work/qemux86-pokymllib32-linux/lib32-u-boot-fw-utils/v2013.07+gitAUTOINC+62c175fbb8-r0/temp/log.do_compile.4727
> Log data follows:
> | DEBUG: Executing shell function do_compile
> | NOTE: make -j 16 HOSTCC=i586-pokymllib32-linux-gcc  -m32 --sysroot=/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-world/build/build/tmp/sysroots/lib32-qemux86 HOSTSTRIP=true
> | System not configured - see README
> | make: *** [all] Error 1
> | ERROR: oe_runmake failed
> | WARNING: /srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-world/build/build/tmp/work/qemux86-pokymllib32-linux/lib32-u-boot-fw-utils/v2013.07+gitAUTOINC+62c175fbb8-r0/temp/run.do_compile.4727:1 exit 1 from
> |   exit 1
> | ERROR: Function failed: do_compile (log file is located at /srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-world/build/build/tmp/work/qemux86-pokymllib32-linux/lib32-u-boot-fw-utils/v2013.07+gitAUTOINC+62c175fbb8-r0/temp/log.do_compile.4727)
> NOTE: recipe lib32-u-boot-fw-utils-v2013.07+gitAUTOINC+62c175fbb8-r0: task do_compile: Failed

Sau!
Otavio Salvador - Sept. 18, 2013, 3:36 a.m.
On Tue, Sep 17, 2013 at 8:47 PM, Saul Wold <sgw@linux.intel.com> wrote:
> On 09/13/2013 12:21 PM, Anders Darander wrote:
>>
>> The latest upgrade changed u-boot-fw-utils to u-boot-fw-utils-cross, which
>> removed the on-target fw_printenv (and fw_setenv).
>>
>> Re-create the updated version of the u-boot-fw-utils recipe.
>>
>> U-Boot does try to strip the fw_printenv binary by default now. To avoid
>> this, without patching the Makefile, we add HOSTSTRIP=true to
>> EXTRA_OEMAKE.
>>
>> The new U-Boot do also require us to configure the build for a specific
>> machine, thus we change the package arch.§
>>
>> Signed-off-by: Anders Darander <anders@chargestorm.se>
>> ---
>>   meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb | 31
>> ++++++++++++++++++++++
>>   1 file changed, 31 insertions(+)
>>   create mode 100644 meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb
>>
>> diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb
>> b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb
>> new file mode 100644
>> index 0000000..f97df71
>> --- /dev/null
>> +++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb
>> @@ -0,0 +1,31 @@
>> +DESCRIPTION = "U-boot bootloader fw_printenv/setenv utils"
>> +LICENSE = "GPLv2+"
>> +LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
>> +SECTION = "bootloader"
>> +DEPENDS = "mtd-utils"
>> +
>> +# This revision corresponds to the tag "v2013.07"
>> +# We use the revision in order to avoid having to fetch it from the
>> +# repo during parse
>> +SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c"
>> +
>> +PV = "v2013.07+git${SRCPV}"
>> +
>> +SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
>> +
>> +S = "${WORKDIR}/git"
>> +
>> +EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTSTRIP="true"'
>> +
>> +do_compile () {
>> +  oe_runmake ${UBOOT_MACHINE}
>> +  oe_runmake env
>> +}
>> +
>> +do_install () {
>> +  install -d ${D}${base_sbindir}
>> +  install -m 755 ${S}/tools/env/fw_printenv
>> ${D}${base_sbindir}/fw_printenv
>> +  install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv
>> +}
>> +
>> +PACKAGE_ARCH = "${MACHINE_ARCH}"
>>
>
> I think this might need a COMPATIBLE_MACHINE or some check for correct
> systems
>>
>> ERROR: Function failed: do_compile (log file is located at
>> /srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-world/build/build/tmp/work/qemux86-pokymllib32-linux/lib32-u-boot-fw-utils/v2013.07+gitAUTOINC+62c175fbb8-r0/temp/log.do_compile.4727)
>> ERROR: Logfile of failure stored in:
>> /srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-world/build/build/tmp/work/qemux86-pokymllib32-linux/lib32-u-boot-fw-utils/v2013.07+gitAUTOINC+62c175fbb8-r0/temp/log.do_compile.4727
>> Log data follows:
>> | DEBUG: Executing shell function do_compile
>> | NOTE: make -j 16 HOSTCC=i586-pokymllib32-linux-gcc  -m32
>> --sysroot=/srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-world/build/build/tmp/sysroots/lib32-qemux86
>> HOSTSTRIP=true
>> | System not configured - see README
>> | make: *** [all] Error 1
>> | ERROR: oe_runmake failed
>> | WARNING:
>> /srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-world/build/build/tmp/work/qemux86-pokymllib32-linux/lib32-u-boot-fw-utils/v2013.07+gitAUTOINC+62c175fbb8-r0/temp/run.do_compile.4727:1
>> exit 1 from
>> |   exit 1
>> | ERROR: Function failed: do_compile (log file is located at
>> /srv/home/pokybuild/yocto-autobuilder-new/yocto-slave/nightly-world/build/build/tmp/work/qemux86-pokymllib32-linux/lib32-u-boot-fw-utils/v2013.07+gitAUTOINC+62c175fbb8-r0/temp/log.do_compile.4727)
>> NOTE: recipe lib32-u-boot-fw-utils-v2013.07+gitAUTOINC+62c175fbb8-r0: task
>> do_compile: Failed

I sent a fix for this.

Please give it a try in autobuilder.
Anders Darander - Sept. 18, 2013, 4:51 a.m.
On 18 September 2013 01:47, Saul Wold <sgw@linux.intel.com> wrote:

> On 09/13/2013 12:21 PM, Anders Darander wrote:
>
>> The latest upgrade changed u-boot-fw-utils to u-boot-fw-utils-cross, which
>> removed the on-target fw_printenv (and fw_setenv).
>>
>> Re-create the updated version of the u-boot-fw-utils recipe.
>>
>> U-Boot does try to strip the fw_printenv binary by default now. To avoid
>> this, without patching the Makefile, we add HOSTSTRIP=true to
>> EXTRA_OEMAKE.
>>
>> The new U-Boot do also require us to configure the build for a specific
>> machine, thus we change the package arch.§
>>
>> Signed-off-by: Anders Darander <anders@chargestorm.se>
>> ---
>>   meta/recipes-bsp/u-boot/u-**boot-fw-utils_2013.07.bb<http://u-boot-fw-utils_2013.07.bb>| 31 ++++++++++++++++++++++
>>   1 file changed, 31 insertions(+)
>>   create mode 100644 meta/recipes-bsp/u-boot/u-**boot-fw-utils_2013.07.bb<http://u-boot-fw-utils_2013.07.bb>
>>
>> diff --git a/meta/recipes-bsp/u-boot/u-**boot-fw-utils_2013.07.bb<http://u-boot-fw-utils_2013.07.bb>b/meta/recipes-bsp/u-boot/
>> u-**boot-fw-utils_2013.07.bb <http://u-boot-fw-utils_2013.07.bb>
>> new file mode 100644
>> index 0000000..f97df71
>> --- /dev/null
>> +++ b/meta/recipes-bsp/u-boot/u-**boot-fw-utils_2013.07.bb<http://u-boot-fw-utils_2013.07.bb>
>> @@ -0,0 +1,31 @@
>> +DESCRIPTION = "U-boot bootloader fw_printenv/setenv utils"
>> +LICENSE = "GPLv2+"
>> +LIC_FILES_CHKSUM = "file://COPYING;md5=**1707d6db1d42237583f50183a5651e*
>> *cb"
>> +SECTION = "bootloader"
>> +DEPENDS = "mtd-utils"
>> +
>> +# This revision corresponds to the tag "v2013.07"
>> +# We use the revision in order to avoid having to fetch it from the
>> +# repo during parse
>> +SRCREV = "**62c175fbb8a0f9a926c88294ea9f7e**88eb898f6c"
>> +
>> +PV = "v2013.07+git${SRCPV}"
>> +
>> +SRC_URI = "git://git.denx.de/u-boot.git;**branch=master;protocol=git<http://git.denx.de/u-boot.git;branch=master;protocol=git>
>> "
>> +
>> +S = "${WORKDIR}/git"
>> +
>> +EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTSTRIP="true"'
>> +
>> +do_compile () {
>> +  oe_runmake ${UBOOT_MACHINE}
>> +  oe_runmake env
>> +}
>> +
>> +do_install () {
>> +  install -d ${D}${base_sbindir}
>> +  install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_**
>> printenv
>> +  install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv
>> +}
>> +
>> +PACKAGE_ARCH = "${MACHINE_ARCH}"
>>
>>
> I think this might need a COMPATIBLE_MACHINE or some check for correct
> systems
>

Ah, you're correct.

I was looking too much on the old recipe and my working machine... As we're
currently making the package machine specific, we definitely need this
test. v2 on its way...

Cheers,
Anders
Anders Darander - Sept. 18, 2013, 5:06 a.m.
I just noted that Otavio already sent a fix for this.

Please, review and apply his fix.

Cheers,
Anders


On 18 September 2013 06:51, Anders Darander <anders.darander@gmail.com>wrote:

>
>
>
> On 18 September 2013 01:47, Saul Wold <sgw@linux.intel.com> wrote:
>
>> On 09/13/2013 12:21 PM, Anders Darander wrote:
>>
>>> The latest upgrade changed u-boot-fw-utils to u-boot-fw-utils-cross,
>>> which
>>> removed the on-target fw_printenv (and fw_setenv).
>>>
>>> Re-create the updated version of the u-boot-fw-utils recipe.
>>>
>>> U-Boot does try to strip the fw_printenv binary by default now. To avoid
>>> this, without patching the Makefile, we add HOSTSTRIP=true to
>>> EXTRA_OEMAKE.
>>>
>>> The new U-Boot do also require us to configure the build for a specific
>>> machine, thus we change the package arch.§
>>>
>>> Signed-off-by: Anders Darander <anders@chargestorm.se>
>>> ---
>>>   meta/recipes-bsp/u-boot/u-**boot-fw-utils_2013.07.bb<http://u-boot-fw-utils_2013.07.bb>| 31 ++++++++++++++++++++++
>>>   1 file changed, 31 insertions(+)
>>>   create mode 100644 meta/recipes-bsp/u-boot/u-**
>>> boot-fw-utils_2013.07.bb <http://u-boot-fw-utils_2013.07.bb>
>>>
>>> diff --git a/meta/recipes-bsp/u-boot/u-**boot-fw-utils_2013.07.bb<http://u-boot-fw-utils_2013.07.bb>b/meta/recipes-bsp/u-boot/
>>> u-**boot-fw-utils_2013.07.bb <http://u-boot-fw-utils_2013.07.bb>
>>> new file mode 100644
>>> index 0000000..f97df71
>>> --- /dev/null
>>> +++ b/meta/recipes-bsp/u-boot/u-**boot-fw-utils_2013.07.bb<http://u-boot-fw-utils_2013.07.bb>
>>> @@ -0,0 +1,31 @@
>>> +DESCRIPTION = "U-boot bootloader fw_printenv/setenv utils"
>>> +LICENSE = "GPLv2+"
>>> +LIC_FILES_CHKSUM = "file://COPYING;md5=**1707d6db1d42237583f50183a5651e
>>> **cb"
>>> +SECTION = "bootloader"
>>> +DEPENDS = "mtd-utils"
>>> +
>>> +# This revision corresponds to the tag "v2013.07"
>>> +# We use the revision in order to avoid having to fetch it from the
>>> +# repo during parse
>>> +SRCREV = "**62c175fbb8a0f9a926c88294ea9f7e**88eb898f6c"
>>> +
>>> +PV = "v2013.07+git${SRCPV}"
>>> +
>>> +SRC_URI = "git://git.denx.de/u-boot.git;**branch=master;protocol=git<http://git.denx.de/u-boot.git;branch=master;protocol=git>
>>> "
>>> +
>>> +S = "${WORKDIR}/git"
>>> +
>>> +EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTSTRIP="true"'
>>> +
>>> +do_compile () {
>>> +  oe_runmake ${UBOOT_MACHINE}
>>> +  oe_runmake env
>>> +}
>>> +
>>> +do_install () {
>>> +  install -d ${D}${base_sbindir}
>>> +  install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_**
>>> printenv
>>> +  install -m 755 ${S}/tools/env/fw_printenv
>>> ${D}${base_sbindir}/fw_setenv
>>> +}
>>> +
>>> +PACKAGE_ARCH = "${MACHINE_ARCH}"
>>>
>>>
>> I think this might need a COMPATIBLE_MACHINE or some check for correct
>> systems
>>
>
> Ah, you're correct.
>
> I was looking too much on the old recipe and my working machine... As
> we're currently making the package machine specific, we definitely need
> this test. v2 on its way...
>
> Cheers,
> Anders
>
>

Patch

diff --git a/meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb
new file mode 100644
index 0000000..f97df71
--- /dev/null
+++ b/meta/recipes-bsp/u-boot/u-boot-fw-utils_2013.07.bb
@@ -0,0 +1,31 @@ 
+DESCRIPTION = "U-boot bootloader fw_printenv/setenv utils"
+LICENSE = "GPLv2+"
+LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
+SECTION = "bootloader"
+DEPENDS = "mtd-utils"
+
+# This revision corresponds to the tag "v2013.07"
+# We use the revision in order to avoid having to fetch it from the
+# repo during parse
+SRCREV = "62c175fbb8a0f9a926c88294ea9f7e88eb898f6c"
+
+PV = "v2013.07+git${SRCPV}"
+
+SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
+
+S = "${WORKDIR}/git"
+
+EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTSTRIP="true"'
+
+do_compile () {
+  oe_runmake ${UBOOT_MACHINE}
+  oe_runmake env
+}
+
+do_install () {
+  install -d ${D}${base_sbindir}
+  install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_printenv
+  install -m 755 ${S}/tools/env/fw_printenv ${D}${base_sbindir}/fw_setenv
+}
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"