X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=meta-agl%2Fconf%2Fdistro%2Fpoky-agl.conf;h=2f80f3f332cee5449fa0e1ca368839a9ac5f98d5;hb=1a70860b4438d4e0259ef3b40c9f890d9695e059;hp=8500784c8c9eab926740ba44de8593bd67bb7522;hpb=6da592d11f2d3530ec84f1e5c42036eadb184605;p=AGL%2Fmeta-agl.git

diff --git a/meta-agl/conf/distro/poky-agl.conf b/meta-agl/conf/distro/poky-agl.conf
index 8500784c8..2f80f3f33 100644
--- a/meta-agl/conf/distro/poky-agl.conf
+++ b/meta-agl/conf/distro/poky-agl.conf
@@ -18,8 +18,13 @@ PREFERRED_PROVIDER_udev-utils ?= "systemd"
 VIRTUAL-RUNTIME_init_manager = "systemd"
 VIRTUAL-RUNTIME_initscripts = ""
 
+# Backport from poky:319a69f1d757a577b50a2ca9c8fbf845eba8e274
+export systemd_system_unitdir = "${nonarch_base_libdir}/systemd/system"
+export nonarch_libdir = "${exec_prefix}/lib"
+export systemd_user_unitdir = "${nonarch_libdir}/systemd/user"
+
 # 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 +51,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}"