[oe-commits] org.oe.dev sdr-image: make package selection a bit smarter

[koen commit]

sdr-image: make package selection a bit smarter

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: e075242ca6639299999171e46a4bf1f13683246e
ViewMTN: http://monotone.openembedded.org/revision/info/e075242ca6639299999171e46a4bf1f13683246e
Files:
1
packages/images/sdr-image.bb
Diffs:

#
# mt diff -r40b5381294d20aca3bc25ca9bd4a41d9d13d4472 -re075242ca6639299999171e46a4bf1f13683246e
#
#
#
# patch "packages/images/sdr-image.bb"
#  from [db27bb62624a5de1caa94815b9c06c7895d9f094]
#    to [46448ba96db5cc98bd62b77608e973a0f0937648]
#
============================================================
--- packages/images/sdr-image.bb	db27bb62624a5de1caa94815b9c06c7895d9f094
+++ packages/images/sdr-image.bb	46448ba96db5cc98bd62b77608e973a0f0937648
@@ -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