diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2018-03-29 18:47:10 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@automotivelinux.org> | 2018-03-29 18:47:10 +0000 |
| commit | 6ee7bd778686215048a2df9ea10645d17b232002 (patch) | |
| tree | 1e016775c2094d7e0b0dc7780f4284736dc84249 /meta-agl-bsp/conf/include | |
| parent | e88453e5c5c14dabc4ec316a4253919caff2a4bf (diff) | |
| parent | 5c51374181e9134c1553a989314b54a8be1f4b12 (diff) | |
Merge "Merge branch 'sandbox/ronan/rocko_kf'"
Diffstat (limited to 'meta-agl-bsp/conf/include')
| -rw-r--r-- | meta-agl-bsp/conf/include/agl_h3ulcb.inc | 4 | ||||
| -rw-r--r-- | meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc | 5 | ||||
| -rw-r--r-- | meta-agl-bsp/conf/include/agl_m3ulcb.inc | 2 |
3 files changed, 2 insertions, 9 deletions
diff --git a/meta-agl-bsp/conf/include/agl_h3ulcb.inc b/meta-agl-bsp/conf/include/agl_h3ulcb.inc index 818d508b1..cb4edb46d 100644 --- a/meta-agl-bsp/conf/include/agl_h3ulcb.inc +++ b/meta-agl-bsp/conf/include/agl_h3ulcb.inc @@ -21,13 +21,9 @@ PREFERRED_RPROVIDER_libgbm-dev = "libgbm" PREFERRED_RPROVIDER_libomxil = "omx-user-module" -# Mask the gstreamer recipe for MMP -BBMASK = "meta-renesas/meta-rcar-gen3/recipes-multimedia/gstreamer" - # Add for gstreamer plugins ugly LICENSE_FLAGS_WHITELIST = "commercial" - MACHINE_FEATURES_append = " multimedia" DISTRO_FEATURES_append = " use_eva_pkg" diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc index 726d233b6..c0ebb5f65 100644 --- a/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc +++ b/meta-agl-bsp/conf/include/agl_m3ulcb-nogfx.inc @@ -1,11 +1,10 @@ SOC_FAMILY = "r8a7796" # Mask graphic Pkgs -BBMASK = "gles-user-module|kernel-module-gles|wayland-kms|libgbm" +BBMASK += "gles-user-module|kernel-module-gles|wayland-kms|libgbm" # Mask MMP recipes -BBMASK .= "|kernel-module-uvcs-drv|omx-user-module" +BBMASK += "kernel-module-uvcs-drv|omx-user-module" -BBMASK .= "|meta-renesas-rcar-gen3/meta-rcar-gen3/recipes-forward-port/" DISTRO_FEATURES_append = " sota" OSTREE_KERNEL = "Image" diff --git a/meta-agl-bsp/conf/include/agl_m3ulcb.inc b/meta-agl-bsp/conf/include/agl_m3ulcb.inc index 14abd2cd5..46c6f1f28 100644 --- a/meta-agl-bsp/conf/include/agl_m3ulcb.inc +++ b/meta-agl-bsp/conf/include/agl_m3ulcb.inc @@ -21,8 +21,6 @@ PREFERRED_RPROVIDER_libgbm-dev = "libgbm" PREFERRED_RPROVIDER_libomxil = "omx-user-module" -# Mask the gstreamer recipe for MMP -BBMASK = "meta-renesas/meta-rcar-gen3/recipes-multimedia/gstreamer" # Add for gstreamer plugins ugly LICENSE_FLAGS_WHITELIST = "commercial" |