Patchwork u-boot-tools: fix cross-platform sdk builds, e.g. 64-bit to 32-bit

login
register
mail settings
Submitter Jacob Kjaergaard
Date March 4, 2013, 1:42 p.m.
Message ID <1362404544-4738-1-git-send-email-jabk@prevas.dk>
Download mbox | patch
Permalink /patch/224723/
State Accepted
Delegated to: Esben Haabendal
Headers show

Comments

Jacob Kjaergaard - March 4, 2013, 1:42 p.m.
From: <jabk@prevas.dk>

---
 recipes/u-boot/u-boot-tools.inc |   12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)
Esben Haabendal - March 4, 2013, 2:06 p.m.
Jacob Barsoe <jabk@prevas.dk> writes:

> From: <jabk@prevas.dk>
>
> ---
>  recipes/u-boot/u-boot-tools.inc |   12 +++++++++++-
>  1 file changed, 11 insertions(+), 1 deletion(-)
>
> diff --git a/recipes/u-boot/u-boot-tools.inc b/recipes/u-boot/u-boot-tools.inc
> index 07fcf97..057f8a5 100644
> --- a/recipes/u-boot/u-boot-tools.inc
> +++ b/recipes/u-boot/u-boot-tools.inc
> @@ -11,6 +11,16 @@ S = "${SRCDIR}/u-boot-${PV}"
>  MIRRORS =. """http://ftp.denx.de/pub/u-boot/ ftp://ftp.denx.de/pub/u-boot/
>  """
>  
> +DEPENDS:sdk = "native:u-boot-tools-bmp-logo"
> +
> +DO_COMPILE_FIX_SDK_BUILD = ""
> +DO_COMPILE_FIX_SDK_BUILD:sdk = "do_compile_fix_sdk_build" 
> +do_compile[prefuncs] += "${DO_COMPILE_FIX_SDK_BUILD}"
> +
> +do_compile_fix_sdk_build() {
> +    sed 's#$(obj)./bmp_logo $(LOGO_BMP) >$@#${BUILD_SYSROOT}/bin/bmp_logo $(LOGO_BMP) >$@#' -i ${S}/tools/Makefile
> +}
> +
>  PARALLEL_MAKE = ""
>  EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTSTRIP="${STRIP}" \
>      CROSS_COMPILE="${HOST_PREFIX}"'
> @@ -35,7 +45,7 @@ do_compile () {
>  }
>  
>  inherit auto-package-utils
> -U_BOOT_TOOLS = "mkimage envcrc gen_eth_addr img2srec img2brec.sh \
> +U_BOOT_TOOLS = "bmp_logo mkimage envcrc gen_eth_addr img2srec img2brec.sh \
>      jtagconsole netconsole setlocalversion"
>  
>  do_install () {

Wuhu, this one made it to patchwork.  Merged to master :-)

/Esben

Patch

diff --git a/recipes/u-boot/u-boot-tools.inc b/recipes/u-boot/u-boot-tools.inc
index 07fcf97..057f8a5 100644
--- a/recipes/u-boot/u-boot-tools.inc
+++ b/recipes/u-boot/u-boot-tools.inc
@@ -11,6 +11,16 @@  S = "${SRCDIR}/u-boot-${PV}"
 MIRRORS =. """http://ftp.denx.de/pub/u-boot/ ftp://ftp.denx.de/pub/u-boot/
 """
 
+DEPENDS:sdk = "native:u-boot-tools-bmp-logo"
+
+DO_COMPILE_FIX_SDK_BUILD = ""
+DO_COMPILE_FIX_SDK_BUILD:sdk = "do_compile_fix_sdk_build" 
+do_compile[prefuncs] += "${DO_COMPILE_FIX_SDK_BUILD}"
+
+do_compile_fix_sdk_build() {
+    sed 's#$(obj)./bmp_logo $(LOGO_BMP) >$@#${BUILD_SYSROOT}/bin/bmp_logo $(LOGO_BMP) >$@#' -i ${S}/tools/Makefile
+}
+
 PARALLEL_MAKE = ""
 EXTRA_OEMAKE = 'HOSTCC="${CC}" HOSTSTRIP="${STRIP}" \
     CROSS_COMPILE="${HOST_PREFIX}"'
@@ -35,7 +45,7 @@  do_compile () {
 }
 
 inherit auto-package-utils
-U_BOOT_TOOLS = "mkimage envcrc gen_eth_addr img2srec img2brec.sh \
+U_BOOT_TOOLS = "bmp_logo mkimage envcrc gen_eth_addr img2srec img2brec.sh \
     jtagconsole netconsole setlocalversion"
 
 do_install () {