From d83970c8286484ef3ddcdd309c92a7f38045e659 Mon Sep 17 00:00:00 2001 From: Jonathan Maw Date: Tue, 29 Sep 2015 16:24:47 +0000 Subject: Configure linux-renesas to build uinput The uinput module is useful for automated testing as it allows user-space programmes to create and use virtual input devices. An alternative way of doing this might be to add configuration using the way recommended by http://www.yoctoproject.org/docs/1.7.2/kernel-dev/kernel-dev.html#changing-the-configuration, but I was unable to get that working. Signed-off-by: Jonathan Maw --- meta-rcar-gen2/recipes-kernel/linux/linux.inc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'meta-rcar-gen2') diff --git a/meta-rcar-gen2/recipes-kernel/linux/linux.inc b/meta-rcar-gen2/recipes-kernel/linux/linux.inc index 560bf98..886c2a9 100644 --- a/meta-rcar-gen2/recipes-kernel/linux/linux.inc +++ b/meta-rcar-gen2/recipes-kernel/linux/linux.inc @@ -118,6 +118,9 @@ do_configure_prepend() { kernel_configure_variable QUOTA y kernel_configure_variable BT y + # add uinput for automated testing + kernel_configure_variable INPUT_MISC y + kernel_configure_variable INPUT_UINPUT y # Keep this the last line # Remove all modified configs and add the rest to .config -- cgit 1.2.3-korg From f1f0152b1b0c34ee677e3fa6bc6ae8f60820fbc1 Mon Sep 17 00:00:00 2001 From: Stephen Lawrence Date: Mon, 12 Oct 2015 16:34:27 +0100 Subject: multimedia: add RPROVIDES for multimedia kernel modules Add the multimedia acceleration kernel modules to the RPROVIDES variable of the appropriate recipes. This fixes build errors of the following form at do_roofs time when RPM packaging is used: error: Can't install @MACHINE: no package provides Thank you to Tadao Tanikawa for his work on this within AGL [1] [1] https://gerrit.automotivelinux.org/gerrit/#/c/4061/1 --- meta-rcar-gen2/recipes-kernel/fdpm-module/fdpm-kernel-module.bb | 4 +++- meta-rcar-gen2/recipes-kernel/mmngr-module/mmngr-kernel-module.bb | 4 +++- meta-rcar-gen2/recipes-kernel/mmngr-module/mmngrbuf-kernel-module.bb | 4 +++- meta-rcar-gen2/recipes-kernel/s3ctl-module/s3ctl-kernel-module.bb | 4 +++- meta-rcar-gen2/recipes-kernel/uvcs-module/uvcs-kernel-module.bb | 4 +++- meta-rcar-gen2/recipes-kernel/vspm-module/vspm-kernel-module.bb | 4 +++- 6 files changed, 18 insertions(+), 6 deletions(-) (limited to 'meta-rcar-gen2') diff --git a/meta-rcar-gen2/recipes-kernel/fdpm-module/fdpm-kernel-module.bb b/meta-rcar-gen2/recipes-kernel/fdpm-module/fdpm-kernel-module.bb index 328c833..2739166 100644 --- a/meta-rcar-gen2/recipes-kernel/fdpm-module/fdpm-kernel-module.bb +++ b/meta-rcar-gen2/recipes-kernel/fdpm-module/fdpm-kernel-module.bb @@ -74,9 +74,11 @@ FILES_${PN}-dev = " \ /usr/src/kernel/include/fdpm.symvers \ " -RPROVIDES_${PN} += "fdpm-kernel-module" +RPROVIDES_${PN} += "fdpm-kernel-module kernel-module-fdpm" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +ALLOW_EMPTY_kernel-module-fdpm = "1" + do_configure[noexec] = "1" python do_package_ipk_prepend () { diff --git a/meta-rcar-gen2/recipes-kernel/mmngr-module/mmngr-kernel-module.bb b/meta-rcar-gen2/recipes-kernel/mmngr-module/mmngr-kernel-module.bb index 32c6abd..96b3de7 100644 --- a/meta-rcar-gen2/recipes-kernel/mmngr-module/mmngr-kernel-module.bb +++ b/meta-rcar-gen2/recipes-kernel/mmngr-module/mmngr-kernel-module.bb @@ -73,9 +73,11 @@ FILES_${PN}-dev = " \ /usr/src/kernel/include/*.h \ " -RPROVIDES_${PN} += "mmngr-kernel-module" +RPROVIDES_${PN} += "mmngr-kernel-module kernel-module-mmngr" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +ALLOW_EMPTY_kernel-module-mmngr = "1" + do_configure[noexec] = "1" python do_package_ipk_prepend () { diff --git a/meta-rcar-gen2/recipes-kernel/mmngr-module/mmngrbuf-kernel-module.bb b/meta-rcar-gen2/recipes-kernel/mmngr-module/mmngrbuf-kernel-module.bb index ac91e0c..bda21ed 100644 --- a/meta-rcar-gen2/recipes-kernel/mmngr-module/mmngrbuf-kernel-module.bb +++ b/meta-rcar-gen2/recipes-kernel/mmngr-module/mmngrbuf-kernel-module.bb @@ -53,9 +53,11 @@ FILES_${PN}-dev = " \ /usr/src/kernel/include/*.h \ " -RPROVIDES_${PN} += "mmngrbuf-kernel-module" +RPROVIDES_${PN} += "mmngrbuf-kernel-module kernel-module-mmngrbuf" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +ALLOW_EMPTY_kernel-module-mmngrbuf = "1" + do_configure[noexec] = "1" python do_package_ipk_prepend () { diff --git a/meta-rcar-gen2/recipes-kernel/s3ctl-module/s3ctl-kernel-module.bb b/meta-rcar-gen2/recipes-kernel/s3ctl-module/s3ctl-kernel-module.bb index 211dd78..141be11 100644 --- a/meta-rcar-gen2/recipes-kernel/s3ctl-module/s3ctl-kernel-module.bb +++ b/meta-rcar-gen2/recipes-kernel/s3ctl-module/s3ctl-kernel-module.bb @@ -54,9 +54,11 @@ FILES_${PN}-dev = " \ /usr/src/kernel/include/s3ctl.symvers \ " -RPROVIDES_${PN} += "s3ctl-kernel-module" +RPROVIDES_${PN} += "s3ctl-kernel-module kernel-module-s3ctl" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +ALLOW_EMPTY_kernel-module-s3ctl = "1" + do_configure[noexec] = "1" python do_package_ipk_prepend () { diff --git a/meta-rcar-gen2/recipes-kernel/uvcs-module/uvcs-kernel-module.bb b/meta-rcar-gen2/recipes-kernel/uvcs-module/uvcs-kernel-module.bb index 17b0637..5212494 100644 --- a/meta-rcar-gen2/recipes-kernel/uvcs-module/uvcs-kernel-module.bb +++ b/meta-rcar-gen2/recipes-kernel/uvcs-module/uvcs-kernel-module.bb @@ -62,9 +62,11 @@ FILES_${PN}-dev = " \ /usr/src/kernel/include/uvcs.symvers \ " -RPROVIDES_${PN} += "uvcs-kernel-module" +RPROVIDES_${PN} += "uvcs-kernel-module kernel-module-uvcs-cmn" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +ALLOW_EMPTY_kernel-module-uvcs-cmn = "1" + python do_package_ipk_prepend () { d.setVar('ALLOW_EMPTY', '1') } diff --git a/meta-rcar-gen2/recipes-kernel/vspm-module/vspm-kernel-module.bb b/meta-rcar-gen2/recipes-kernel/vspm-module/vspm-kernel-module.bb index 1e88e6f..48c75d2 100644 --- a/meta-rcar-gen2/recipes-kernel/vspm-module/vspm-kernel-module.bb +++ b/meta-rcar-gen2/recipes-kernel/vspm-module/vspm-kernel-module.bb @@ -69,9 +69,11 @@ FILES_${PN}-dev = " \ /usr/src/kernel/include/vspm.symvers \ " -RPROVIDES_${PN} += "vspm-kernel-module" +RPROVIDES_${PN} += "vspm-kernel-module kernel-module-vspm" INHIBIT_PACKAGE_DEBUG_SPLIT = "1" +ALLOW_EMPTY_kernel-module-vspm = "1" + do_configure[noexec] = "1" python do_package_ipk_prepend () { -- cgit 1.2.3-korg From 261feee63064cce1c3ca2c2a397269757dfb7ced Mon Sep 17 00:00:00 2001 From: Stephen Lawrence Date: Mon, 12 Oct 2015 17:20:51 +0100 Subject: r-car m2: set PREFERRED_VERSION_gstreamer1.0-omx* to 1.0.% when h/w acceleration enabled The R-Car M2 multimedia acceleration provides acceleration support for GStreamer 1.2.3 and OMX 1.0, so set the preferred version to 1.0.% when acceleration is enabled. Required for meta-ivi which supports both Gst 1.2.3/OMX 1.0 and 1.4.x/1.2 but defaults to 1.4.x/1.2. Thank you to Tadao Tanikawa and his work on this within AGL: https://gerrit.automotivelinux.org/gerrit/#/c/4061/1 --- meta-rcar-gen2/conf/machine/include/r8a7791.inc | 1 + 1 file changed, 1 insertion(+) (limited to 'meta-rcar-gen2') diff --git a/meta-rcar-gen2/conf/machine/include/r8a7791.inc b/meta-rcar-gen2/conf/machine/include/r8a7791.inc index 4f91462..f77c74a 100644 --- a/meta-rcar-gen2/conf/machine/include/r8a7791.inc +++ b/meta-rcar-gen2/conf/machine/include/r8a7791.inc @@ -14,6 +14,7 @@ EXTRA_IMAGEDEPENDS += "u-boot" # multimedia acceleration uses Gst version 1.2.x, otherwise meta-ivi currently uses 1.4.x PREFERRED_VERSION_gstreamer1.0 = "${@base_conditional("USE_MULTIMEDIA", "1", "1.2.%", "1.4.%", d )}" +PREFERRED_VERSION_gstreamer1.0-omx = "${@base_conditional("USE_MULTIMEDIA", "1", "1.0.%", "1.2.%", d )}" PREFERRED_VERSION_gstreamer1.0-plugins-bad = '${@base_conditional("USE_MULTIMEDIA", "1", "1.2.%", "1.4.%", d )}' PREFERRED_VERSION_gstreamer1.0-plugins-base = '${@base_conditional("USE_MULTIMEDIA", "1", "1.2.%", "1.4.%", d )}' PREFERRED_VERSION_gstreamer1.0-plugins-good = '${@base_conditional("USE_MULTIMEDIA", "1", "1.2.%", "1.4.%", d )}' -- cgit 1.2.3-korg From 77ec9acc47d63a4abcf06f88ab8d3cab3d20754e Mon Sep 17 00:00:00 2001 From: Stephen Lawrence Date: Mon, 12 Oct 2015 17:31:46 +0100 Subject: multimedia: gstreamer1.0-* fix configure for out of tree build on git recipes Integrate upstream Poky meta fix 6ede9224f82a [1] to the Poky Gst .bb recipes into the R-Car .bbappends.This fixes a do_config build error when building with multimedia acceleration enabled. Thank you to Tadao Tanikawa and his work on this within AGL: https://gerrit.automotivelinux.org/gerrit/#/c/4061/1 [1] http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/meta/recipes-multimedia/gstreamer?h=dizzy&id=6ede9224f82a37dc1cfb48837c40d28996892652 --- .../recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bbappend | 7 ++++--- .../gstreamer/gstreamer1.0-plugins-bad_1.2.3.bbappend | 7 ++++--- .../gstreamer/gstreamer1.0-plugins-base_1.2.3.bbappend | 7 ++++--- .../gstreamer/gstreamer1.0-plugins-good_1.2.3.bbappend | 7 ++++--- .../gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bbappend | 7 ++++--- 5 files changed, 20 insertions(+), 15 deletions(-) (limited to 'meta-rcar-gen2') diff --git a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bbappend b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bbappend index 8a7128e..95706e5 100644 --- a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bbappend +++ b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-omx_1.0.0.bbappend @@ -7,9 +7,10 @@ LIC_FILES_CHKSUM_remove_rcar-gen2 = " file://omx/gstomx.h;beginline=1;endline=21 LIC_FILES_CHKSUM_append_rcar-gen2 = " file://omx/gstomx.h;beginline=1;endline=22;md5=17e5f2943dace9e5cde4a8587a31e8f9" S = "${WORKDIR}/git" -do_configure() { - ./autogen.sh --noconfigure - oe_runconf +do_configure_prepend() { + cd ${S} + ./autogen.sh --noconfigure + cd ${B} } DEPENDS_append_rcar-gen2 = " omx-user-module mmngrbuf-user-module" diff --git a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bbappend b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bbappend index ac9e52e..a881d76 100644 --- a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bbappend +++ b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-bad_1.2.3.bbappend @@ -9,9 +9,10 @@ LIC_FILES_CHKSUM_remove_rcar-gen2 = "\ S = "${WORKDIR}/git" -do_configure() { - ./autogen.sh --noconfigure - oe_runconf +do_configure_prepend() { + cd ${S} + ./autogen.sh --noconfigure + cd ${B} } # for wayland diff --git a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bbappend b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bbappend index eee4b59..18d4b64 100644 --- a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bbappend +++ b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-base_1.2.3.bbappend @@ -7,9 +7,10 @@ LIC_FILES_CHKSUM_remove_rcar-gen2 = "\ S = "${WORKDIR}/git" -do_configure() { - ./autogen.sh --noconfigure - oe_runconf +do_configure_prepend() { + cd ${S} + ./autogen.sh --noconfigure + cd ${B} } # For Common diff --git a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bbappend b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bbappend index 573f71a..5030a5c 100644 --- a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bbappend +++ b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-good_1.2.3.bbappend @@ -6,7 +6,8 @@ LIC_FILES_CHKSUM_remove_rcar-gen2 = "\ S = "${WORKDIR}/git" -do_configure() { - ./autogen.sh --noconfigure - oe_runconf +do_configure_prepend() { + cd ${S} + ./autogen.sh --noconfigure + cd ${B} } diff --git a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bbappend b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bbappend index 6d43b52..73bbb5c 100644 --- a/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bbappend +++ b/meta-rcar-gen2/recipes-multimedia/gstreamer/gstreamer1.0-plugins-ugly_1.2.3.bbappend @@ -6,7 +6,8 @@ PACKAGECONFIG ??= " \ a52dec lame mad mpeg2dec \ " -do_configure() { - ./autogen.sh --noconfigure - oe_runconf +do_configure_prepend() { + cd ${S} + ./autogen.sh --noconfigure + cd ${B} } -- cgit 1.2.3-korg From 6452a6452460278b5f392fd56b4543340cd7cd8b Mon Sep 17 00:00:00 2001 From: Stephen Lawrence Date: Mon, 12 Oct 2015 18:12:49 +0100 Subject: multimedia: Remove unnecessary do_install_append from omx-user-module Remove do_install_append that did processing for Porter/Silk that is no longer required with the current deliverables. --- .../omx-module/omx-user-module.bb | 28 +--------------------- 1 file changed, 1 insertion(+), 27 deletions(-) (limited to 'meta-rcar-gen2') diff --git a/meta-rcar-gen2/recipes-multimedia/omx-module/omx-user-module.bb b/meta-rcar-gen2/recipes-multimedia/omx-module/omx-user-module.bb index f4f0c8b..c8623cf 100644 --- a/meta-rcar-gen2/recipes-multimedia/omx-module/omx-user-module.bb +++ b/meta-rcar-gen2/recipes-multimedia/omx-module/omx-user-module.bb @@ -332,32 +332,6 @@ do_install() { fi } -do_install_append() { - if [ "X${MACHINE}" = "Xsilk" -o "X${MACHINE}" = "Xporter" ] ; then - cd ${S}/OMXR/lib/ - - ln -sf libomxr_core.so.0.0.0 libomxr_core.so.2.0.0 - ln -sf libomxr_core.so.0.0.0 libomxr_core.so.0 - ln -sf libomxr_mc_cmn.so.0.0.0 libomxr_mc_cmn.so.2.0.0 - ln -sf libomxr_mc_h264d.so.0.0.0 libomxr_mc_h264d.so.2.0.0 - ln -sf libomxr_mc_h264d.so.0.0.0 libomxr_mc_h264d.so.0 - ln -sf libomxr_mc_h264e.so.0.0.0 libomxr_mc_h264e.so.2.0.0 - ln -sf libomxr_mc_h264e.so.0.0.0 libomxr_mc_h264e.so.0 - ln -sf libomxr_mc_vecmn.so.0.0.0 libomxr_mc_vecmn.so.2.0.0 - ln -sf libomxr_mc_vcmn.so.0.0.0 libomxr_mc_vcmn.so.2.0.0 - ln -sf libomxr_mc_vdcmn.so.0.0.0 libomxr_mc_vdcmn.so.2.0.0 - ln -sf libuvcs_dec.so.0.0.0 libuvcs_dec.so.1.0.0 - ln -sf libuvcs_enc.so.0.0.0 libuvcs_enc.so.1.0.0 - ln -sf libvcp3_avcd.so.0.0.0 libvcp3_avcd.so.1.0.0 - ln -sf libvcp3_avce.so.0.0.0 libvcp3_avce.so.1.0.0 - ln -sf libvcp3_mcvd.so.0.0.0 libvcp3_mcvd.so.1.0.0 - ln -sf libvcp3_mcve.so.0.0.0 libvcp3_mcve.so.1.0.0 - - # Copy all the symbolic link and lib to destination - cp -Prf ${S}/OMXR/lib/* ${D}/usr/local/lib - fi -} - SYSROOT_PREPROCESS_FUNCS += "do_populate_share_lib" do_populate_share_lib () { @@ -377,7 +351,7 @@ do_clean_sharedfiles() { rm -f ${LIBSHARED}/libRSACPDLA_L.so* rm -f ${LIBSHARED}/libRSACPDAL_L.so* rm -f ${STAGING_INCDIR}/RSACPD_ADL.h - + rm -f ${LIBSHARED}/libMP3DLA_L.so* rm -f ${STAGING_INCDIR}/mp3d_Lib.h -- cgit 1.2.3-korg From c7ca33aa5566636429f6b0ba9c959e2259acbc3e Mon Sep 17 00:00:00 2001 From: Stephen Lawrence Date: Wed, 14 Oct 2015 15:24:11 +0100 Subject: r-car e2 (alt/silk): mesa: Temporary workaround to upstream Mesa build issue This commit generalises an earlier workaround for the Alt board to all R-Car E2 based boards. Temporarily disable Cortex A7 optimisation to avoid upstream build issue between YP 1.7 gcc toolchain and Mesa 10.1,x releases. The build goes away and never returns. Graphics acceleration makes no use of Mesa so there should be no performance impact. This should be removed once upstream is fixed. --- meta-rcar-gen2/recipes-graphics/mesa/mesa_10.%.bbappend | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'meta-rcar-gen2') diff --git a/meta-rcar-gen2/recipes-graphics/mesa/mesa_10.%.bbappend b/meta-rcar-gen2/recipes-graphics/mesa/mesa_10.%.bbappend index c5b6a2d..cd08da8 100644 --- a/meta-rcar-gen2/recipes-graphics/mesa/mesa_10.%.bbappend +++ b/meta-rcar-gen2/recipes-graphics/mesa/mesa_10.%.bbappend @@ -12,6 +12,6 @@ def map_libs(d): MESATARGET := "${@map_libs(d)}" include mesa-${MESATARGET}.inc -# Temporarily disable Cortex A7 optimisation to avoid upstream build issue -# between YP 1.7 gcc toolchain and Mesa 10.1,x releases. -TARGET_CC_ARCH_remove_alt = "-mtune=cortex-a7" +# For R-Car E2 temporarily disable Cortex A7 optimisation to avoid upstream +# build issue between YP 1.7 gcc toolchain and Mesa 10.1.x releases. +TARGET_CC_ARCH_remove_r8a7794 = "-mtune=cortex-a7" -- cgit 1.2.3-korg