[meta-freescale] [PATCH 2/4] imx-test: Fix linking failures of test utilities

Tue Jan 20 07:24:19 PST 2015

On Tue, Jan 20, 2015 at 9:33 AM, Otavio Salvador
<otavio at ossystems.com.br> wrote:
> This increases the number of tests available. The new files include,
> when building for i.MX6Q are:

This commit log is bad.

It does not increase the number of "test available". I would accept it
increase the number of built test, but you did not included any test
source, so you are not making a test available.

And, I´m not sure I understand "The new files include," Would it be

"The new files included when PLATFORM=IMX6Q are:"

or

"The list of included files when PLATFORM=IMX6Q is:

And It makes me think if you have tested this for imx53. Are the
patches being built on master-next? I would like to test it on both
ims and mx5

>
> ,----
> | /unit_tests/hciattach-ar3k.bin
> | /unit_tests/config_dec
> | /unit_tests/akiyo.mp4
> | /unit_tests/config_net
> | /unit_tests/mxc_vpu_test.out
> | /unit_tests/config_encdec
> | /unit_tests/autorun-vpu.sh
> | /unit_tests/memtool
> | /unit_tests/config_enc
> `----
>
> Change-Id: I58882adc22990d9ec53dc9ead034e85acd64375e
> Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
> ---
>  recipes-bsp/imx-test/imx-test.inc                  |  3 +-
>  ...ix-build-in-OpenEmbedded-Core-environment.patch | 69 ++++++++++++++++++++++
>  recipes-bsp/imx-test/imx-test_3.10.31-1.1.0.bb     |  5 +-
>  3 files changed, 74 insertions(+), 3 deletions(-)
>  create mode 100644 recipes-bsp/imx-test/imx-test/Fix-build-in-OpenEmbedded-Core-environment.patch
>
> diff --git a/recipes-bsp/imx-test/imx-test.inc b/recipes-bsp/imx-test/imx-test.inc
> index 6832498..6e41f61 100644
> --- a/recipes-bsp/imx-test/imx-test.inc
> +++ b/recipes-bsp/imx-test/imx-test.inc
> @@ -35,7 +35,8 @@ do_make_scripts[deptask] = "do_populate_sysroot"
>  do_make_scripts[depends] += "virtual/kernel:do_install"
>
>  do_compile() {
> -    unset LDFLAGS
> +    CFLAGS="${TOOLCHAIN_OPTIONS}"
> +    LDFLAGS="${TOOLCHAIN_OPTIONS} -L${STAGING_LIBDIR}"
>      oe_runmake V=1 VERBOSE='' \
>                 CROSS_COMPILE=${TARGET_PREFIX} \
>                 INC="-I${STAGING_INCDIR} \
> diff --git a/recipes-bsp/imx-test/imx-test/Fix-build-in-OpenEmbedded-Core-environment.patch b/recipes-bsp/imx-test/imx-test/Fix-build-in-OpenEmbedded-Core-environment.patch
> new file mode 100644
> index 0000000..70c7970
> --- /dev/null
> +++ b/recipes-bsp/imx-test/imx-test/Fix-build-in-OpenEmbedded-Core-environment.patch
> @@ -0,0 +1,69 @@
> +From fd826140db0f2a867ef588cccf2e5322cc77126a Mon Sep 17 00:00:00 2001
> +From: Otavio Salvador <otavio at ossystems.com.br>
> +Date: Mon, 19 Jan 2015 16:56:29 -0200
> +Subject: [PATCH] Fix build in OpenEmbedded-Core environment
> +Organization: O.S. Systems Software LTDA.
> +
> +Some of the unit-tests were not being build due differences on how the
> +build system behaves when running inside of the OE-Core. This fixes
> +those minor issues and increases a lot the number of tests available.

This commit log is better!

> +
> +Upstream-Status: Pending
> +
> +Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
> +
> +diff --git a/test/ar3k_bt/Makefile b/test/ar3k_bt/Makefile
> +index 92e2901..75d3e78 100755
> +--- a/test/ar3k_bt/Makefile
> ++++ b/test/ar3k_bt/Makefile
> +@@ -21,7 +21,7 @@ all: $(OBJS)
> + CFLAGS +=  -lbluetooth
> +
> + $(OBJDIR)/hciattach-ar3k.bin :
> +-      $(CC)  ${INC} -Wall -lbluetooth -g hciattach_ath3k.c  hciattach.c  hciattach_qualcomm.c  hciattach_st.c  hciattach_tialt.c  hciattach_ti.c -o hciattach-ar3k.bin
> ++      $(CC)  ${INC} -Wall -lbluetooth -g hciattach_ath3k.c  hciattach.c  hciattach_qualcomm.c  hciattach_st.c  hciattach_tialt.c  hciattach_ti.c -o $(OBJDIR)/hciattach-ar3k.bin
> +
> + clean:
> +       rm -f *.o hciattach-ar3k.bin
> +diff --git a/test/make.rules b/test/make.rules
> +index 8982f36..7ff8b38 100755
> +--- a/test/make.rules
> ++++ b/test/make.rules
> +@@ -33,7 +33,7 @@ $(OBJDIR)/%.out : $(SRCDIR)/%.c
> + $(OBJDIR)/%.out : $(SRCDIR)/%.s
> +       @mkdir -p `dirname $@`
> +       @echo "     Building $@"
> +-      $(VERBOSE)$(CC) -g $(INC) $(CFLAGS) -DASSEMBLER $< -o $@
> ++      $(VERBOSE)$(CC) -g $(INC) $(CFLAGS)-DASSEMBLER $< -o $@
> +
> + $(OBJDIR)/%.out : $(SRCDIR)/%.S
> +       @mkdir -p `dirname $@`
> +diff --git a/test/memtool/Makefile b/test/memtool/Makefile
> +index 7a72803..c3083a0 100644
> +--- a/test/memtool/Makefile
> ++++ b/test/memtool/Makefile
> +@@ -20,7 +20,7 @@ CFLAGS+= -Os
> + all : $(TARGET)
> +
> + $(TARGET):$(OBJ)
> +-      $(LINK) -o $(TARGET) $(OBJ) -Os
> ++      $(LINK) -o $(TARGET) $(OBJ) $(LDFLAGS) -Os
> +       $(STRIP) $(TARGET)
> +
> + .PHONY: clean
> +diff --git a/test/mxc_vpu_test/Makefile b/test/mxc_vpu_test/Makefile
> +index 6ab989c..985b311 100644
> +--- a/test/mxc_vpu_test/Makefile
> ++++ b/test/mxc_vpu_test/Makefile
> +@@ -23,7 +23,7 @@ endif
> + all: $(TARGET)
> +
> + $(TARGET): $(OBJ)
> +-      $(LINK) -o $(TARGET) $(OBJ) ${LIBS} -lvpu -lipu -lrt -lpthread
> ++      $(LINK) -o $(TARGET) $(OBJ) ${LIBS} $(LDFLAGS) -lvpu -lipu -lrt -lpthread
> +       mkdir -p $(OBJDIR)
> +       mv $(TARGET) $(OBJDIR)
> +       cp autorun-vpu.sh $(OBJDIR)
> +--
> +2.1.4
> +
> diff --git a/recipes-bsp/imx-test/imx-test_3.10.31-1.1.0.bb b/recipes-bsp/imx-test/imx-test_3.10.31-1.1.0.bb
> index 2d29eb7..b5b5024 100644
> --- a/recipes-bsp/imx-test/imx-test_3.10.31-1.1.0.bb
> +++ b/recipes-bsp/imx-test/imx-test_3.10.31-1.1.0.bb
> @@ -3,8 +3,9 @@
>  include imx-test.inc
>
>  # FIXME: Drop 'beta' suffix for GA release
> -SRC_URI = "${FSL_MIRROR}/${PN}-${PV}-beta.tar.gz"
> -S="${WORKDIR}/${PN}-${PV}-beta"
> +SRC_URI = "${FSL_MIRROR}/${PN}-${PV}-beta.tar.gz \
> +           file://Fix-build-in-OpenEmbedded-Core-environment.patch"
> +S = "${WORKDIR}/${PN}-${PV}-beta"
>
>  SRC_URI_append_mx5 = " file://revert_epdc_hdr_change.patch \
>                         file://clocks.sh"
> --
> 2.1.4
>
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale at yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale