aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhang Nguyen <khang.nguyen.xw@renesas.com>2019-07-17 19:09:52 +0700
committerKhang Nguyen <khang.nguyen.xw@renesas.com>2019-09-24 08:16:29 +0700
commit025edeb911a8b78a7842bb6df6dde3fbdcd3c1f4 (patch)
treef7f5c59c57f654af0aadfe3c9772adbf9b5d2a40
parent4f88440f6e053c6f05f35d82a7e00e300d9916ab (diff)
rcar-gen3: Add COMPATIBLE_MACHINE
This adds COMPATIBLE_MACHINE to R-Car specific recipes to avoid error when run "bitbake world" for non-R-Car platforms. Signed-off-by: Duy Dang <duy.dang.yw@renesas.com> Signed-off-by: Khang Nguyen <khang.nguyen.xw@renesas.com> Signed-off-by: Takamitsu Honda <takamitsu.honda.pv@renesas.com> Change-Id: Ide29f6272d7c483eeda69a58f61710b2e8a42d6d
-rw-r--r--meta-rcar-gen3/include/rcar-gen3-modules-common.inc2
-rw-r--r--meta-rcar-gen3/recipes-graphics/drm/libdrm_2.4.85.bb1
-rw-r--r--meta-rcar-gen3/recipes-graphics/images/core-image-renesas-base.inc2
-rw-r--r--meta-rcar-gen3/recipes-graphics/packagegroups/packagegroup-graphic-renesas.bb2
-rw-r--r--meta-rcar-gen3/recipes-graphics/wayland/libegl.bb2
-rw-r--r--meta-rcar-gen3/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb2
-rw-r--r--meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bb2
-rw-r--r--meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-fw-module.bb1
-rw-r--r--meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-if-module.bb1
-rw-r--r--meta-rcar-gen3/recipes-multimedia/cms-module/cms-user-module.bb1
-rw-r--r--meta-rcar-gen3/recipes-multimedia/dvd-module/dvd-encryption-module.bb1
-rw-r--r--meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter_1.0.1.bb2
-rw-r--r--meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngr_lib.inc1
-rw-r--r--meta-rcar-gen3/recipes-multimedia/omx-module/libalacdla-l.bb2
-rw-r--r--meta-rcar-gen3/recipes-multimedia/omx-module/libflacdla-l.bb1
-rw-r--r--meta-rcar-gen3/recipes-multimedia/omx-module/omx-user-module.bb2
-rw-r--r--meta-rcar-gen3/recipes-multimedia/openavnu/openavnu_git.bb1
-rw-r--r--meta-rcar-gen3/recipes-multimedia/packagegroups/packagegroup-gstreamer1.0-plugins.bb2
-rw-r--r--meta-rcar-gen3/recipes-multimedia/packagegroups/packagegroup-multimedia-kernel.bb2
-rw-r--r--meta-rcar-gen3/recipes-multimedia/packagegroups/packagegroup-multimedia-libs.bb2
20 files changed, 32 insertions, 0 deletions
diff --git a/meta-rcar-gen3/include/rcar-gen3-modules-common.inc b/meta-rcar-gen3/include/rcar-gen3-modules-common.inc
index 7cd0845..9805862 100644
--- a/meta-rcar-gen3/include/rcar-gen3-modules-common.inc
+++ b/meta-rcar-gen3/include/rcar-gen3-modules-common.inc
@@ -7,3 +7,5 @@ export KERNELDIR = "${STAGING_KERNEL_DIR}"
export LDFLAGS = ""
export CP = "cp"
require include/rcar-gen3-path-common.inc
+
+COMPATIBLE_MACHINE = "(salvator-x|ulcb|ebisu)"
diff --git a/meta-rcar-gen3/recipes-graphics/drm/libdrm_2.4.85.bb b/meta-rcar-gen3/recipes-graphics/drm/libdrm_2.4.85.bb
index 4e3e8ef..b9955ed 100644
--- a/meta-rcar-gen3/recipes-graphics/drm/libdrm_2.4.85.bb
+++ b/meta-rcar-gen3/recipes-graphics/drm/libdrm_2.4.85.bb
@@ -9,6 +9,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71"
PROVIDES = "drm"
DEPENDS = "libpthread-stubs libpciaccess"
+COMPATIBLE_MACHINE = "(salvator-x|ebisu|ulcb)"
SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \
file://installtests.patch \
diff --git a/meta-rcar-gen3/recipes-graphics/images/core-image-renesas-base.inc b/meta-rcar-gen3/recipes-graphics/images/core-image-renesas-base.inc
index 67615b1..8a93b5f 100644
--- a/meta-rcar-gen3/recipes-graphics/images/core-image-renesas-base.inc
+++ b/meta-rcar-gen3/recipes-graphics/images/core-image-renesas-base.inc
@@ -1,5 +1,7 @@
require include/iccom-control.inc
+COMPATIBLE_MACHINE = "(salvator-x|ulcb|ebisu)"
+
# Basic packages
IMAGE_INSTALL_append = " \
bash \
diff --git a/meta-rcar-gen3/recipes-graphics/packagegroups/packagegroup-graphic-renesas.bb b/meta-rcar-gen3/recipes-graphics/packagegroups/packagegroup-graphic-renesas.bb
index cc37f8e..b5cff82 100644
--- a/meta-rcar-gen3/recipes-graphics/packagegroups/packagegroup-graphic-renesas.bb
+++ b/meta-rcar-gen3/recipes-graphics/packagegroups/packagegroup-graphic-renesas.bb
@@ -4,6 +4,8 @@ LICENSE = "CLOSED & MIT"
inherit packagegroup
require include/gles-control.inc
+COMPATIBLE_MACHINE = "(salvator-x|ulcb|ebisu)"
+
PACKAGES = " \
packagegroup-wayland-community \
packagegroup-graphics-renesas-proprietary \
diff --git a/meta-rcar-gen3/recipes-graphics/wayland/libegl.bb b/meta-rcar-gen3/recipes-graphics/wayland/libegl.bb
index 0bde4ae..06c56f7 100644
--- a/meta-rcar-gen3/recipes-graphics/wayland/libegl.bb
+++ b/meta-rcar-gen3/recipes-graphics/wayland/libegl.bb
@@ -1,6 +1,8 @@
SUMMARY = "Recipe for libegl"
LICENSE = "CLOSED"
+COMPATIBLE_MACHINE = "(salvator-x|ulcb|ebisu)"
+
DEPENDS = "gles-user-module \
${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'libgbm wayland-kms', '', d)} \
"
diff --git a/meta-rcar-gen3/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb b/meta-rcar-gen3/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb
index 7e8a954..bec021d 100644
--- a/meta-rcar-gen3/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb
+++ b/meta-rcar-gen3/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb
@@ -1,5 +1,7 @@
require xserver-xorg.inc
+COMPATIBLE_MACHINE = "(salvator-x|ebisu|ulcb)"
+
SRC_URI += "file://musl-arm-inb-outb.patch \
file://0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch \
file://0003-modesetting-Fix-16-bit-depth-bpp-mode.patch \
diff --git a/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bb b/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bb
index 6d0b9f6..eb2d33b 100644
--- a/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bb
+++ b/meta-rcar-gen3/recipes-kernel/kernel-module-uvcs/kernel-module-uvcs-drv.bb
@@ -16,6 +16,8 @@ require include/rcar-gen3-path-common.inc
inherit module
PR = "r0"
+COMPATIBLE_MACHINE = "(salvator-x|ulcb|ebisu)"
+
SRC_URI = "${@oe.utils.conditional('USE_VIDEO_OMX', '1', 'file://RCG3VUDRL4101ZDO.tar.bz2', '', d)}"
S = "${WORKDIR}/RCG3VUDRL4101ZDO"
diff --git a/meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-fw-module.bb b/meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-fw-module.bb
index b264cbb..737a2a0 100644
--- a/meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-fw-module.bb
+++ b/meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-fw-module.bb
@@ -4,6 +4,7 @@ LICENSE = "CLOSED"
inherit distro_features_check
REQUIRED_DISTRO_FEATURES = "adsp"
+COMPATIBLE_MACHINE = "(salvator-x|ulcb|ebisu)"
SRC_URI = "file://RCG3AHFWN0201ZDP.tar.gz"
diff --git a/meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-if-module.bb b/meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-if-module.bb
index 1689746..b814960 100644
--- a/meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-if-module.bb
+++ b/meta-rcar-gen3/recipes-multimedia/adsp-module/adsp-if-module.bb
@@ -11,6 +11,7 @@ SRC_URI = "file://RCG3AHIFL4101ZDP.tar.gz"
S = "${WORKDIR}/RCG3AHIFL4101ZDP"
+COMPATIBLE_MACHINE = "(salvator-x|ulcb|ebisu)"
PACKAGE_ARCH = "${MACHINE_ARCH}"
# Don't need to do_configure
diff --git a/meta-rcar-gen3/recipes-multimedia/cms-module/cms-user-module.bb b/meta-rcar-gen3/recipes-multimedia/cms-module/cms-user-module.bb
index 094d326..ff2b8d2 100644
--- a/meta-rcar-gen3/recipes-multimedia/cms-module/cms-user-module.bb
+++ b/meta-rcar-gen3/recipes-multimedia/cms-module/cms-user-module.bb
@@ -16,6 +16,7 @@ SRC_URI = " \
S = "${WORKDIR}/cms"
PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(salvator-x|ulcb|ebisu)"
do_configure[noexec] = "1"
do_compile[noexec] = "1"
diff --git a/meta-rcar-gen3/recipes-multimedia/dvd-module/dvd-encryption-module.bb b/meta-rcar-gen3/recipes-multimedia/dvd-module/dvd-encryption-module.bb
index 7fad401..5730124 100644
--- a/meta-rcar-gen3/recipes-multimedia/dvd-module/dvd-encryption-module.bb
+++ b/meta-rcar-gen3/recipes-multimedia/dvd-module/dvd-encryption-module.bb
@@ -7,6 +7,7 @@ inherit distro_features_check
REQUIRED_DISTRO_FEATURES = "dvd_encryption_library"
PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(salvator-x|ulcb|ebisu)"
SRC_URI = " \
file://Software.tar.gz \
diff --git a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter_1.0.1.bb b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter_1.0.1.bb
index f1f2b5e..59dadab 100644
--- a/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter_1.0.1.bb
+++ b/meta-rcar-gen3/recipes-multimedia/gstreamer/gstreamer1.0-plugin-vspfilter_1.0.1.bb
@@ -7,6 +7,8 @@ inherit autotools pkgconfig
PN = "gstreamer1.0-plugin-vspfilter"
+COMPATIBLE_MACHINE = "(salvator-x|ulcb|ebisu)"
+
EXTRA_AUTORECONF_append = " -I ${STAGING_DATADIR}/aclocal"
VSPFILTER_CONF_r8a7795 = "gstvspfilter-${MACHINE}_r8a7795.conf"
diff --git a/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngr_lib.inc b/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngr_lib.inc
index 5def237..8afa6a5 100644
--- a/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngr_lib.inc
+++ b/meta-rcar-gen3/recipes-multimedia/mmngr-module/mmngr_lib.inc
@@ -14,5 +14,6 @@ WS_virtclass-multilib-lib32 = "32"
# These modules are machine specific.
PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(salvator-x|ulcb|ebisu)"
inherit autotools
diff --git a/meta-rcar-gen3/recipes-multimedia/omx-module/libalacdla-l.bb b/meta-rcar-gen3/recipes-multimedia/omx-module/libalacdla-l.bb
index f31792b..0ed61b4 100644
--- a/meta-rcar-gen3/recipes-multimedia/omx-module/libalacdla-l.bb
+++ b/meta-rcar-gen3/recipes-multimedia/omx-module/libalacdla-l.bb
@@ -6,6 +6,8 @@ LIC_FILES_CHKSUM = " \
file://APPLE_LICENSE.txt;md5=b180a94f894d2a868d40ea43da2bbaba \
"
+COMPATIBLE_MACHINE = "(salvator-x|ulcb|ebisu)"
+
PACKAGE_ARCH = "${MACHINE_ARCH}"
DEPENDS = " \
diff --git a/meta-rcar-gen3/recipes-multimedia/omx-module/libflacdla-l.bb b/meta-rcar-gen3/recipes-multimedia/omx-module/libflacdla-l.bb
index 453195e..1d0d77a 100644
--- a/meta-rcar-gen3/recipes-multimedia/omx-module/libflacdla-l.bb
+++ b/meta-rcar-gen3/recipes-multimedia/omx-module/libflacdla-l.bb
@@ -4,6 +4,7 @@ LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYING.Xiph;md5=a2c4b71c0198682376d483eb5bcc9197"
PACKAGE_ARCH = "${MACHINE_ARCH}"
+COMPATIBLE_MACHINE = "(salvator-x|ulcb|ebisu)"
SRC_URI = "git://github.com/renesas-rcar/flac_decoder.git;branch=master"
SRCREV = "70c0a7ae7dc8cac2056adf5eb175e3c54f892c27"
diff --git a/meta-rcar-gen3/recipes-multimedia/omx-module/omx-user-module.bb b/meta-rcar-gen3/recipes-multimedia/omx-module/omx-user-module.bb
index ea51329..598be28 100644
--- a/meta-rcar-gen3/recipes-multimedia/omx-module/omx-user-module.bb
+++ b/meta-rcar-gen3/recipes-multimedia/omx-module/omx-user-module.bb
@@ -3,6 +3,8 @@ LICENSE = "CLOSED"
require include/omx-control.inc
require include/rcar-gen3-modules-common.inc
+COMPATIBLE_MACHINE = "(salvator-x|ulcb|ebisu)"
+
DEPENDS = " \
kernel-module-mmngr mmngr-user-module \
vspmif-user-module kernel-module-vspmif \
diff --git a/meta-rcar-gen3/recipes-multimedia/openavnu/openavnu_git.bb b/meta-rcar-gen3/recipes-multimedia/openavnu/openavnu_git.bb
index 486a5b6..5972d06 100644
--- a/meta-rcar-gen3/recipes-multimedia/openavnu/openavnu_git.bb
+++ b/meta-rcar-gen3/recipes-multimedia/openavnu/openavnu_git.bb
@@ -14,6 +14,7 @@ LIC_FILES_CHKSUM = " \
"
DEPENDS = "libpcap"
+COMPATIBLE_MACHINE = "(salvator-x|ulcb|ebisu)"
PV = "1.1+git${SRCPV}"
diff --git a/meta-rcar-gen3/recipes-multimedia/packagegroups/packagegroup-gstreamer1.0-plugins.bb b/meta-rcar-gen3/recipes-multimedia/packagegroups/packagegroup-gstreamer1.0-plugins.bb
index e689440..ae79153 100644
--- a/meta-rcar-gen3/recipes-multimedia/packagegroups/packagegroup-gstreamer1.0-plugins.bb
+++ b/meta-rcar-gen3/recipes-multimedia/packagegroups/packagegroup-gstreamer1.0-plugins.bb
@@ -3,6 +3,8 @@ LICENSE = "MIT"
require include/omx-control.inc
+COMPATIBLE_MACHINE = "(salvator-x|ulcb|ebisu)"
+
DEPENDS = "gstreamer1.0 gstreamer1.0-plugins-base gstreamer1.0-plugins-good"
DEPENDS += "gstreamer1.0-plugins-bad"
DEPENDS += "gstreamer1.0-plugins-ugly"
diff --git a/meta-rcar-gen3/recipes-multimedia/packagegroups/packagegroup-multimedia-kernel.bb b/meta-rcar-gen3/recipes-multimedia/packagegroups/packagegroup-multimedia-kernel.bb
index 7e8e7e4..b62e11e 100644
--- a/meta-rcar-gen3/recipes-multimedia/packagegroups/packagegroup-multimedia-kernel.bb
+++ b/meta-rcar-gen3/recipes-multimedia/packagegroups/packagegroup-multimedia-kernel.bb
@@ -3,6 +3,8 @@ LICENSE = "GPLv2 & MIT"
require include/omx-control.inc
+COMPATIBLE_MACHINE = "(salvator-x|ulcb|ebisu)"
+
DEPENDS = "kernel-module-mmngr kernel-module-mmngrbuf \
kernel-module-vspm kernel-module-vspmif \
kernel-module-vsp2driver \
diff --git a/meta-rcar-gen3/recipes-multimedia/packagegroups/packagegroup-multimedia-libs.bb b/meta-rcar-gen3/recipes-multimedia/packagegroups/packagegroup-multimedia-libs.bb
index 323f6ae..3c74e69 100644
--- a/meta-rcar-gen3/recipes-multimedia/packagegroups/packagegroup-multimedia-libs.bb
+++ b/meta-rcar-gen3/recipes-multimedia/packagegroups/packagegroup-multimedia-libs.bb
@@ -1,6 +1,8 @@
SUMMARY = "Multimedia user libraries modules package groups"
LICENSE = "MIT"
+COMPATIBLE_MACHINE = "(salvator-x|ulcb|ebisu)"
+
DEPENDS = "mmngr-user-module mmngrbuf-user-module \
vspmif-user-module libalacdla-l libflacdla-l \
"