sdr-image: make package selection a bit smarter

diff --git a/packages/images/sdr-image.bb b/packages/images/sdr-image.bb
index fc30d69..07f6919 100644 (file)
--- a/packages/images/sdr-image.bb
+++ b/packages/images/sdr-image.bb
@@ -6,24 +6,32 @@
 # X demo
 # xorg.conf
 
+PR = "r2"
+
+# Also generate tar.bz2 images for use on e.g. SD or nfsroot
+IMAGE_FSTYPES += "tar.bz2"
+
 ANGSTROM_EXTRA_INSTALL ?= ""
 DISTRO_SSH_DAEMON ?= "dropbear"
 
+# Install "big" X if the target has a screen
+GUIPACKAGES = " \
+        xf86-input-evdev \
+        xf86-input-mouse \
+        xf86-video-dummy \
+        xf86-video-fbdev \
+        ${@base_contains("COMBINED_FEATURES", "usbhost", "xf86-video-sisusb", "",d)} \
+        xf86-video-vesa \
+"
+
 IMAGE_INSTALL = " task-base-extended \
        kernel-modules \
-       task-proper-tools \
        gnuradio gnuradio-usrp \
        gnuplot \
-       xf86-input-keyboard \
-       xf86-input-evdev \
-       xf86-input-mouse \
-       xf86-video-dummy \
-       xf86-video-fbdev \
-       xf86-video-sisusb \
-       xf86-video-vesa \
+       ${@base_contains("MACHINE_FEATURES", "screen", "${GUIPACKAGES}", "",d)} \
        python-core perl \
        uucp picocom \
-       pulseaudio pulseaudio-module-zeroconf-publish avahi-utils \
+       angstrom-zeroconf-audio avahi-utils \
 "
 
 inherit image