summaryrefslogtreecommitdiffstats
path: root/meta-agl/conf
diff options
context:
space:
mode:
Diffstat (limited to 'meta-agl/conf')
-rw-r--r--meta-agl/conf/bblayers.conf.sample1
-rw-r--r--meta-agl/conf/conf-notes.txt1
-rw-r--r--meta-agl/conf/distro/poky-agl.conf5
3 files changed, 6 insertions, 1 deletions
diff --git a/meta-agl/conf/bblayers.conf.sample b/meta-agl/conf/bblayers.conf.sample
index ed6fe367c..e5e54431c 100644
--- a/meta-agl/conf/bblayers.conf.sample
+++ b/meta-agl/conf/bblayers.conf.sample
@@ -13,6 +13,7 @@ BBLAYERS ?= " \
##OEROOT##/../meta-agl/meta-agl \
##OEROOT##/../meta-agl/meta-agl-bsp \
##OEROOT##/../meta-openembedded/meta-oe \
+ ##OEROOT##/../meta-openembedded/meta-multimedia \
"
BBLAYERS_NON_REMOVABLE ?= " \
##OEROOT##/meta \
diff --git a/meta-agl/conf/conf-notes.txt b/meta-agl/conf/conf-notes.txt
index b4f71a11a..f91379f98 100644
--- a/meta-agl/conf/conf-notes.txt
+++ b/meta-agl/conf/conf-notes.txt
@@ -1,5 +1,6 @@
Common targets are:
agl-image-ivi
+ agl-image-ivi-crosssdk
agl-image-minimal
agl-image-weston
diff --git a/meta-agl/conf/distro/poky-agl.conf b/meta-agl/conf/distro/poky-agl.conf
index 8500784c8..58abfcd6a 100644
--- a/meta-agl/conf/distro/poky-agl.conf
+++ b/meta-agl/conf/distro/poky-agl.conf
@@ -19,7 +19,7 @@ VIRTUAL-RUNTIME_init_manager = "systemd"
VIRTUAL-RUNTIME_initscripts = ""
# Override these in poky based distros
-AGL_DEFAULT_DISTRO_FEATURES = "systemd opengl wayland pam"
+AGL_DEFAULT_DISTRO_FEATURES = "systemd opengl wayland pam bluetooth bluez5"
AGL_DEFAULT_EXTRA_RDEPENDS = "packagegroup-core-boot"
AGL_DEFAULT_EXTRA_RRECOMMENDS = "kernel-module-af-packet"
@@ -46,6 +46,9 @@ PREFERRED_VERSION_gstreamer1.0-plugins-ugly ?= "1.4.%"
PREFERRED_VERSION_gstreamer1.0-libav ?= "1.4.%"
PREFERRED_VERSION_gstreamer1.0-omx ?= "1.2.%"
+# Prefer the GStreamer-enabled version of GUPnP-DLNA
+PREFERRED_VERSION_gupnp-dlna ?= "0.9.4%"
+
SDK_NAME = "${DISTRO}-${TCLIBC}-${SDK_ARCH}-${IMAGE_BASENAME}-${TUNE_PKGARCH}"
SDKPATH = "/opt/${DISTRO}/${SDK_VERSION}"