diff --git a/meta-digi-arm/conf/machine/include/digi-defaults.inc b/meta-digi-arm/conf/machine/include/digi-defaults.inc index 0c632dba6..958118875 100644 --- a/meta-digi-arm/conf/machine/include/digi-defaults.inc +++ b/meta-digi-arm/conf/machine/include/digi-defaults.inc @@ -9,8 +9,5 @@ PREFERRED_PROVIDER_virtual/libgles2_mx5 = "${@base_contains('DISTRO_FEATURES', ' # Digi BSP default settings IMAGE_CLASSES += "image_types_digi" -# Digi BSP default versions -PREFERRED_VERSION_udev = "175" - # Do not enable console on VT (see sysvinit-inittab recipe) USE_VT = "0" diff --git a/meta-digi-del/conf/distro/del.conf b/meta-digi-del/conf/distro/del.conf index c69997d51..214187719 100644 --- a/meta-digi-del/conf/distro/del.conf +++ b/meta-digi-del/conf/distro/del.conf @@ -21,6 +21,9 @@ DISTRO_FEATURES += "${DISTRO_FEATURES_LIBC}" DISTRO_FEATURES += "largefile" DISTRO_FEATURES += "opengl" +# Disable pulseaudio (not needed in del-image-minimal) +DISTRO_FEATURES_BACKFILL_CONSIDERED = "pulseaudio" + PREFERRED_PROVIDER_jpeg = "jpeg" PREFERRED_VERSION_linux-yocto ?= "3.4%" diff --git a/meta-digi-del/recipes-multimedia/gst-plugins-good/gst-plugins-good_0.10.31.bbappend b/meta-digi-del/recipes-multimedia/gst-plugins-good/gst-plugins-good_0.10.31.bbappend index cfffc12f5..00826e5e6 100644 --- a/meta-digi-del/recipes-multimedia/gst-plugins-good/gst-plugins-good_0.10.31.bbappend +++ b/meta-digi-del/recipes-multimedia/gst-plugins-good/gst-plugins-good_0.10.31.bbappend @@ -1,7 +1,9 @@ +PACKAGECONFIG = "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG[x11] = ",--disable-gconf --disable-x --disable-xshm --disable-xvideo," + DEPENDS_no_X := "${@oe_filter_out('gconf', '${DEPENDS}', d)}" DEPENDS_del := "${@base_contains('DISTRO_FEATURES', 'x11', '${DEPENDS}', '${DEPENDS_no_X}', d)}" -EXTRA_OECONF_no_X := "--disable-gconf --disable-x --disable-xshm --disable-xvideo" EXTRA_OECONF_del += "\ --disable-aalibtest \ --disable-audiofx \ @@ -28,5 +30,4 @@ EXTRA_OECONF_del += "\ --disable-speex \ --disable-sunaudio \ --disable-valgrind \ - ${@base_contains('DISTRO_FEATURES', 'x11', '', '${EXTRA_OECONF_no_X}', d)} \ "