[meta-fsl-arm][PATCH 1/4] imx-test: Rework recipe style

[meta-fsl-arm][PATCH 1/4] imx-test: Rework recipe style

[Otavio Salvador]

This rework the recipe to use an easier to read metadata style,
basically:

 * use 4 spaces for do_compile and do_install tasks
 * rework inclusion of extra paths in do_compile
 * include missing copyright notice from O.S. Systems
 * move platform setting after source URI definition

Change-Id: Ic902c04a0eb8c0230ae74ac835b6a202784ebb78
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-bsp/imx-test/imx-test.inc | 49 +++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/recipes-bsp/imx-test/imx-test.inc b/recipes-bsp/imx-test/imx-test.inc
index ab567a7..6832498 100644
--- a/recipes-bsp/imx-test/imx-test.inc
+++ b/recipes-bsp/imx-test/imx-test.inc
@@ -1,3 +1,5 @@
+# Copyright (C) 2012-2015 O.S. Systems Software LTDA.
+
 SUMMARY = "Test programs for IMX BSP"
 DESCRIPTION = "Unit tests for the IMX BSP"
 SECTION = "base"
@@ -13,12 +15,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=80
 
 PE = "1"
 
-PLATFORM_mx6 = "IMX6Q"
-PLATFORM_mx6sl = "IMX6SL"
-PLATFORM_mx6sx = "IMX6SX"
-PLATFORM_mx53 = "IMX53"
-PLATFORM_mx51 = "IMX51"
-
 SRC_URI = "${FSL_MIRROR}/imx-test-${PV}.tar.gz"
 
 inherit module-base
@@ -26,13 +22,11 @@ inherit module-base
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
-INCLUDE_DIR="-I${STAGING_INCDIR} \
-             -I${S}/include \
-             -I${STAGING_KERNEL_DIR}/include/uapi \
-             -I${STAGING_KERNEL_DIR}/include \
-             -I${STAGING_KERNEL_DIR}/arch/arm/include \
-             -I${STAGING_KERNEL_DIR}/drivers/mxc/security/rng/include \
-             -I${STAGING_KERNEL_DIR}/drivers/mxc/security/sahara2/include"
+PLATFORM_mx6 = "IMX6Q"
+PLATFORM_mx6sl = "IMX6SL"
+PLATFORM_mx6sx = "IMX6SX"
+PLATFORM_mx53 = "IMX53"
+PLATFORM_mx51 = "IMX51"
 
 # Required so the fixdep binary is generated
 addtask make_scripts after do_patch before do_compile
@@ -41,18 +35,29 @@ do_make_scripts[deptask] = "do_populate_sysroot"
 do_make_scripts[depends] += "virtual/kernel:do_install"
 
 do_compile() {
-        LDFLAGS="" make PLATFORM=${PLATFORM} LINUXPATH=${STAGING_KERNEL_DIR} \
-        KBUILD_OUTPUT=${STAGING_KERNEL_DIR} CROSS_COMPILE=${TARGET_PREFIX} V=1 \
-        INC="${INCLUDE_DIR}"
+    unset LDFLAGS
+    oe_runmake V=1 VERBOSE='' \
+               CROSS_COMPILE=${TARGET_PREFIX} \
+               INC="-I${STAGING_INCDIR} \
+                    -I${S}/include \
+                    -I${STAGING_KERNEL_DIR}/include/uapi \
+                    -I${STAGING_KERNEL_DIR}/include \
+                    -I${STAGING_KERNEL_DIR}/arch/arm/include \
+                    -I${STAGING_KERNEL_DIR}/drivers/mxc/security/rng/include \
+                    -I${STAGING_KERNEL_DIR}/drivers/mxc/security/sahara2/include" \
+               LINUXPATH=${STAGING_KERNEL_DIR} \
+               KBUILD_OUTPUT=${STAGING_KERNEL_DIR} \
+               PLATFORM=${PLATFORM}
 }
 
 do_install() {
-        install -d ${D}/unit_tests
-        install -m 755 test-utils.sh ${D}/unit_tests/test-utils.sh
-        install -m 755 ${S}/platform/${PLATFORM}/* ${D}/unit_tests/
-        if [ -e ${WORKDIR}/clocks.sh ]; then
-                install -m 755 ${WORKDIR}/clocks.sh ${D}/unit_tests/clocks.sh
-        fi
+    oe_runmake DESTDIR=${D}/unit_tests \
+               PLATFORM=${PLATFORM} \
+               install
+
+    if [ -e ${WORKDIR}/clocks.sh ]; then
+        install -m 755 ${WORKDIR}/clocks.sh ${D}/unit_tests/clocks.sh
+    fi
 }
 
 FILES_${PN} += "/unit_tests"
-- 
2.1.4

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

[Otavio Salvador]

This increases the number of tests available. The new files include,
when building for i.MX6Q are:

,----
| /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@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@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.
+
+Upstream-Status: Pending
+
+Signed-off-by: Otavio Salvador <otavio@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-fsl-arm][PATCH 3/4] imx-test: Fix build with the work-shared kernel source

[Otavio Salvador]

The Kernel sources has now been moved out of sstate control and to
make this easier to spot this has been moved to tmp/work-shared/
directory.

One good consequence of this change is that the built artifacts are
controlled by the Linux build system itself and its path is now
exported in STAGING_KERNEL_BUILDDIR variable.

This path adapts the build params to this new layout.

Change-Id: Ie27ef289aa3ae4c2593303ccbc450e0fd53b49cd
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-bsp/imx-test/imx-test.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/recipes-bsp/imx-test/imx-test.inc b/recipes-bsp/imx-test/imx-test.inc
index 6e41f61..cba72f5 100644
--- a/recipes-bsp/imx-test/imx-test.inc
+++ b/recipes-bsp/imx-test/imx-test.inc
@@ -41,13 +41,15 @@ do_compile() {
                CROSS_COMPILE=${TARGET_PREFIX} \
                INC="-I${STAGING_INCDIR} \
                     -I${S}/include \
+                    -I${STAGING_KERNEL_BUILDDIR}/include/uapi \
+                    -I${STAGING_KERNEL_BUILDDIR}/include \
                     -I${STAGING_KERNEL_DIR}/include/uapi \
                     -I${STAGING_KERNEL_DIR}/include \
                     -I${STAGING_KERNEL_DIR}/arch/arm/include \
                     -I${STAGING_KERNEL_DIR}/drivers/mxc/security/rng/include \
                     -I${STAGING_KERNEL_DIR}/drivers/mxc/security/sahara2/include" \
                LINUXPATH=${STAGING_KERNEL_DIR} \
-               KBUILD_OUTPUT=${STAGING_KERNEL_DIR} \
+               KBUILD_OUTPUT=${STAGING_KERNEL_BUILDDIR} \
                PLATFORM=${PLATFORM}
 }
 
-- 
2.1.4

[meta-fsl-arm][PATCH 4/4] qemu-fsl: Disable native and nativesdk builds

[Otavio Salvador]

The qemu-fsl is intended for use into the target. The native and
nativesdk flavours are not supported and should rely on the OE-Core
provided ones.

This disables the recipe parsing for native and nativesdk build,
fixing the following warning:

,----
| WARNING: Unable to get checksum for qemu-fsl-native SRC_URI entry
|     fix-libcap-header-issue-on-some-distro.patch: file could not
|     be found
`----

Change-Id: I8eaf8bc9caf972f5d180115f63862a163915e218
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-devtools/qemu/qemu-fsl_git.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/recipes-devtools/qemu/qemu-fsl_git.bb b/recipes-devtools/qemu/qemu-fsl_git.bb
index 20386e2..ca36c3d 100644
--- a/recipes-devtools/qemu/qemu-fsl_git.bb
+++ b/recipes-devtools/qemu/qemu-fsl_git.bb
@@ -48,3 +48,6 @@ do_install_append() {
 }
 
 FILES_${PN} += "/usr/share/qemu/"
+
+# FIXME: Avoid WARNING due missing patch for native/nativesdk
+BBCLASSEXTEND = ""
-- 
2.1.4

Re: [meta-fsl-arm][PATCH 4/4] qemu-fsl: Disable native and nativesdk builds

[zhenhua.luo]

ACK.  

Best Regards,
Zhenhua

> -----Original Message-----
> From: meta-freescale-bounces@yoctoproject.org [mailto:meta-freescale-
> bounces@yoctoproject.org] On Behalf Of Otavio Salvador
> Sent: Tuesday, January 20, 2015 7:36 PM
> To: meta-freescale Mailing List
> Cc: Otavio Salvador
> Subject: [meta-freescale] [meta-fsl-arm][PATCH 4/4] qemu-fsl: Disable native
> and nativesdk builds
> 
> The qemu-fsl is intended for use into the target. The native and nativesdk
> flavours are not supported and should rely on the OE-Core provided ones.
> 
> This disables the recipe parsing for native and nativesdk build, fixing the
> following warning:
> 
> ,----
> | WARNING: Unable to get checksum for qemu-fsl-native SRC_URI entry
> |     fix-libcap-header-issue-on-some-distro.patch: file could not
> |     be found
> `----
> 
> Change-Id: I8eaf8bc9caf972f5d180115f63862a163915e218
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>  recipes-devtools/qemu/qemu-fsl_git.bb | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/recipes-devtools/qemu/qemu-fsl_git.bb b/recipes-
> devtools/qemu/qemu-fsl_git.bb
> index 20386e2..ca36c3d 100644
> --- a/recipes-devtools/qemu/qemu-fsl_git.bb
> +++ b/recipes-devtools/qemu/qemu-fsl_git.bb
> @@ -48,3 +48,6 @@ do_install_append() {
>  }
> 
>  FILES_${PN} += "/usr/share/qemu/"
> +
> +# FIXME: Avoid WARNING due missing patch for native/nativesdk
> +BBCLASSEXTEND = ""
> --
> 2.1.4
> 
> --
> _______________________________________________
> meta-freescale mailing list
> meta-freescale@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/meta-freescale

Re: [PATCH 4/4] qemu-fsl: Disable native and nativesdk builds

[Javier Viguera]

Hi Otavio,

On 20/01/15 12:36, Otavio Salvador wrote:
> ,----
> | WARNING: Unable to get checksum for qemu-fsl-native SRC_URI entry
> |     fix-libcap-header-issue-on-some-distro.patch: file could not
> |     be found
> `----

Notice that this warning also happens in Dizzy, so this commit needs to 
be backported once pushed to master.

-
Regards,

Javier Viguera

[PATCH 1/4] imx-test: Rework recipe style

[Otavio Salvador]

This rework the recipe to use an easier to read metadata style,
basically:

 * use 4 spaces for do_compile and do_install tasks
 * rework inclusion of extra paths in do_compile
 * include missing copyright notice from O.S. Systems
 * move platform setting after source URI definition

Change-Id: Ic902c04a0eb8c0230ae74ac835b6a202784ebb78
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-bsp/imx-test/imx-test.inc | 49 +++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 22 deletions(-)

diff --git a/recipes-bsp/imx-test/imx-test.inc b/recipes-bsp/imx-test/imx-test.inc
index ab567a7..6832498 100644
--- a/recipes-bsp/imx-test/imx-test.inc
+++ b/recipes-bsp/imx-test/imx-test.inc
@@ -1,3 +1,5 @@
+# Copyright (C) 2012-2015 O.S. Systems Software LTDA.
+
 SUMMARY = "Test programs for IMX BSP"
 DESCRIPTION = "Unit tests for the IMX BSP"
 SECTION = "base"
@@ -13,12 +15,6 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=80
 
 PE = "1"
 
-PLATFORM_mx6 = "IMX6Q"
-PLATFORM_mx6sl = "IMX6SL"
-PLATFORM_mx6sx = "IMX6SX"
-PLATFORM_mx53 = "IMX53"
-PLATFORM_mx51 = "IMX51"
-
 SRC_URI = "${FSL_MIRROR}/imx-test-${PV}.tar.gz"
 
 inherit module-base
@@ -26,13 +22,11 @@ inherit module-base
 INHIBIT_PACKAGE_STRIP = "1"
 INHIBIT_PACKAGE_DEBUG_SPLIT = "1"
 
-INCLUDE_DIR="-I${STAGING_INCDIR} \
-             -I${S}/include \
-             -I${STAGING_KERNEL_DIR}/include/uapi \
-             -I${STAGING_KERNEL_DIR}/include \
-             -I${STAGING_KERNEL_DIR}/arch/arm/include \
-             -I${STAGING_KERNEL_DIR}/drivers/mxc/security/rng/include \
-             -I${STAGING_KERNEL_DIR}/drivers/mxc/security/sahara2/include"
+PLATFORM_mx6 = "IMX6Q"
+PLATFORM_mx6sl = "IMX6SL"
+PLATFORM_mx6sx = "IMX6SX"
+PLATFORM_mx53 = "IMX53"
+PLATFORM_mx51 = "IMX51"
 
 # Required so the fixdep binary is generated
 addtask make_scripts after do_patch before do_compile
@@ -41,18 +35,29 @@ do_make_scripts[deptask] = "do_populate_sysroot"
 do_make_scripts[depends] += "virtual/kernel:do_install"
 
 do_compile() {
-        LDFLAGS="" make PLATFORM=${PLATFORM} LINUXPATH=${STAGING_KERNEL_DIR} \
-        KBUILD_OUTPUT=${STAGING_KERNEL_DIR} CROSS_COMPILE=${TARGET_PREFIX} V=1 \
-        INC="${INCLUDE_DIR}"
+    unset LDFLAGS
+    oe_runmake V=1 VERBOSE='' \
+               CROSS_COMPILE=${TARGET_PREFIX} \
+               INC="-I${STAGING_INCDIR} \
+                    -I${S}/include \
+                    -I${STAGING_KERNEL_DIR}/include/uapi \
+                    -I${STAGING_KERNEL_DIR}/include \
+                    -I${STAGING_KERNEL_DIR}/arch/arm/include \
+                    -I${STAGING_KERNEL_DIR}/drivers/mxc/security/rng/include \
+                    -I${STAGING_KERNEL_DIR}/drivers/mxc/security/sahara2/include" \
+               LINUXPATH=${STAGING_KERNEL_DIR} \
+               KBUILD_OUTPUT=${STAGING_KERNEL_DIR} \
+               PLATFORM=${PLATFORM}
 }
 
 do_install() {
-        install -d ${D}/unit_tests
-        install -m 755 test-utils.sh ${D}/unit_tests/test-utils.sh
-        install -m 755 ${S}/platform/${PLATFORM}/* ${D}/unit_tests/
-        if [ -e ${WORKDIR}/clocks.sh ]; then
-                install -m 755 ${WORKDIR}/clocks.sh ${D}/unit_tests/clocks.sh
-        fi
+    oe_runmake DESTDIR=${D}/unit_tests \
+               PLATFORM=${PLATFORM} \
+               install
+
+    if [ -e ${WORKDIR}/clocks.sh ]; then
+        install -m 755 ${WORKDIR}/clocks.sh ${D}/unit_tests/clocks.sh
+    fi
 }
 
 FILES_${PN} += "/unit_tests"
-- 
2.1.4

[PATCH 4/4] qemu-fsl: Disable native and nativesdk builds

[Otavio Salvador]

The qemu-fsl is intended for use into the target. The native and
nativesdk flavours are not supported and should rely on the OE-Core
provided ones.

This disables the recipe parsing for native and nativesdk build,
fixing the following warning:

,----
| WARNING: Unable to get checksum for qemu-fsl-native SRC_URI entry
|     fix-libcap-header-issue-on-some-distro.patch: file could not
|     be found
`----

Change-Id: I8eaf8bc9caf972f5d180115f63862a163915e218
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 recipes-devtools/qemu/qemu-fsl_git.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/recipes-devtools/qemu/qemu-fsl_git.bb b/recipes-devtools/qemu/qemu-fsl_git.bb
index 20386e2..ca36c3d 100644
--- a/recipes-devtools/qemu/qemu-fsl_git.bb
+++ b/recipes-devtools/qemu/qemu-fsl_git.bb
@@ -48,3 +48,6 @@ do_install_append() {
 }
 
 FILES_${PN} += "/usr/share/qemu/"
+
+# FIXME: Avoid WARNING due missing patch for native/nativesdk
+BBCLASSEXTEND = ""
-- 
2.1.4