merge of 'a5ee0a152a133bdeb1576bb7a08fa9f1336e969d'

     and 'a6bf1374bee35f1cd9cae388f5137b3d0647f2af'

11 files changed, 61 insertions, 9 deletions

diff --git a/packages/angstrom/angstrom-zeroconf-audio.bb b/packages/angstrom/angstrom-zeroconf-audio.bb
new file mode 100644
index 0000000000..9cbbba4053
--- /dev/null
+++ b/packages/angstrom/angstrom-zeroconf-audio.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Meta package to enable zeroconf audio with pulseaudio"
+DEPENDS = "avahi pulseaudio"
+RDEPENDS = "pulseaudio-module-zeroconf-publish avahi-daemon"
+
+do_compile() {
+	:
+}
+
+PACKAGE_ARCH = "all"
+ALLOW_EMPTY_${PN} = "1"
+
+pkg_postinst_${PN} () {
+#!/bin/sh
+if [ "x$D" != "x" ]; then
+        exit 1
+fi
+
+mkdir -p /etc/pulse || true
+# Remove existing entries
+if [ -e /etc/pulse/session ] ; then
+	sed -i -e /load-module\ module-native-protocol-tcp/d -e /load-module\ module-zeroconf-publish/d /etc/pulse/session
+fi
+# Enable network and zeroconf plugins, allow localhost and usbnet access (where available)
+echo "load-module module-native-protocol-tcp auth-ip-acl=127.0.0.1;192.168.0.0/16" >> /etc/pulse/session
+echo "load-module module-zeroconf-publish" >> /etc/pulse/session
+}
diff --git a/packages/images/base-image.bb b/packages/images/base-image.bb
index 9afa682d2c..295e0ed449 100644
--- a/packages/images/base-image.bb
+++ b/packages/images/base-image.bb
@@ -16,6 +16,8 @@
 # Although it is only fully tested with the Angstrom distro, this
 # image is intended to be distro-agnostic.
 
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
 DISTRO_SSH_DAEMON ?= "dropbear"
 
 DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral"
diff --git a/packages/images/console-image.bb b/packages/images/console-image.bb
index 1684716187..76cb8f034e 100644
--- a/packages/images/console-image.bb
+++ b/packages/images/console-image.bb
@@ -1,5 +1,7 @@
 #Angstrom bootstrap image
 
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
 ANGSTROM_EXTRA_INSTALL ?= ""
 
 DEPENDS = "task-base-extended \
diff --git a/packages/images/minimal-image.bb b/packages/images/minimal-image.bb
index 4b3a4cd835..f00c858312 100644
--- a/packages/images/minimal-image.bb
+++ b/packages/images/minimal-image.bb
@@ -4,6 +4,8 @@
 ANGSTROM_EXTRA_INSTALL ?= ""
 DISTRO_SSH_DAEMON ?= "dropbear"
 
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
 IMAGE_INSTALL = "task-boot \
             util-linux-mount util-linux-umount \
             ${DISTRO_SSH_DAEMON} \
diff --git a/packages/images/sdr-image.bb b/packages/images/sdr-image.bb
index fc30d69130..28a62113ee 100644
--- a/packages/images/sdr-image.bb
+++ b/packages/images/sdr-image.bb
@@ -6,24 +6,34 @@
 # X demo
 # xorg.conf
 
+PR = "r2"
+
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
+# 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
diff --git a/packages/images/x11-gpe-image.bb b/packages/images/x11-gpe-image.bb
index ffd401b6a8..86f4cd838c 100644
--- a/packages/images/x11-gpe-image.bb
+++ b/packages/images/x11-gpe-image.bb
@@ -20,6 +20,8 @@ IMAGE_INSTALL = "\
     ${ANGSTROM_EXTRA_INSTALL}"
 
 
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
 #zap root password for release images
 ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
 
diff --git a/packages/images/x11-gpe-java-image.bb b/packages/images/x11-gpe-java-image.bb
index 5a7ec5ec16..72b04ec2bc 100644
--- a/packages/images/x11-gpe-java-image.bb
+++ b/packages/images/x11-gpe-java-image.bb
@@ -21,6 +21,7 @@ IMAGE_INSTALL = "\
     angstrom-gpe-task-pim \
     ${ANGSTROM_EXTRA_INSTALL}"
 
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 
 #zap root password for release images
 ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
diff --git a/packages/images/x11-image.bb b/packages/images/x11-image.bb
index e430590a7f..90d8fa3ffa 100644
--- a/packages/images/x11-image.bb
+++ b/packages/images/x11-image.bb
@@ -16,6 +16,8 @@ IMAGE_INSTALL = "\
     angstrom-gpe-task-settings \
     ${ANGSTROM_EXTRA_INSTALL}"
 
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
 #zap root password for release images
 ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
 
diff --git a/packages/images/x11-office-image.bb b/packages/images/x11-office-image.bb
index f6a8d0af1d..47a8fae71f 100644
--- a/packages/images/x11-office-image.bb
+++ b/packages/images/x11-office-image.bb
@@ -24,6 +24,8 @@ IMAGE_INSTALL = "\
     gphoto2 \
     ${ANGSTROM_EXTRA_INSTALL}"
 
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
 #zap root password for release images
 ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
 
diff --git a/packages/images/x11-pimlico-image.bb b/packages/images/x11-pimlico-image.bb
index c7acedfa0d..3c93bfbd1b 100644
--- a/packages/images/x11-pimlico-image.bb
+++ b/packages/images/x11-pimlico-image.bb
@@ -19,6 +19,7 @@ IMAGE_INSTALL = "\
     angstrom-ohand-task-pim \
     ${ANGSTROM_EXTRA_INSTALL}"
 
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 
 #zap root password for release images
 ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
diff --git a/packages/images/x11-sato-image.bb b/packages/images/x11-sato-image.bb
index 1204f22496..980bebbea7 100644
--- a/packages/images/x11-sato-image.bb
+++ b/packages/images/x11-sato-image.bb
@@ -1,6 +1,8 @@
 DISTRO_SSH_DAEMON ?= "dropbear"
 DISTRO_PACKAGE_MANAGER ?= "ipkg ipkg-collateral"
 
+IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
+
 IMAGE_INSTALL = "\
 	task-base-extended \
 	${DISTRO_SSH_DAEMON} \