[AGL] Workaround to upstream meta-renesas build issue

When building meta-renesas with enabling multimedia binary packages
provided by Renesas, there are some build issue.

This should be removed once upstream is fixed.

Change-Id: Ia83cc3fa0b02ebfc660e1e2dd50f1a5c8e1fddc9
Signed-off-by: Tadao Tanikawa <tanikawa.tadao@jp.panasonic.com>

13 files changed, 56 insertions, 38 deletions

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 )}'
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 () {
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}
 }
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..12b3f86 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
@@ -336,22 +336,22 @@ 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
+#		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
@@ -377,7 +377,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