Merge branch 'master' of git://git.openpandora.org/openpandora.oe

Conflicts:
	recipes/images/pandora-xfce-image.bb

diff --git a/recipes/images/pandora-xfce-image.bb b/recipes/images/pandora-xfce-image.bb
index f3b82a2..fa2d138 100755 (executable)
--- a/recipes/images/pandora-xfce-image.bb
+++ b/recipes/images/pandora-xfce-image.bb
@@ -37,3 +37,6 @@ ROOTFS_POSTPROCESS_COMMAND += "sed -i -e '/ttyS0/d' ${IMAGE_ROOTFS}/${sysconfdir
 ROOTFS_POSTPROCESS_COMMAND += "sed -i -e '$a S0:2345:once:/sbin/getty 115200 ttyS0' ${IMAGE_ROOTFS}/${sysconfdir}/inittab;"
 ROOTFS_POSTPROCESS_COMMAND += "sed -i -e '$a O2:2345:once:/sbin/getty 115200 ttyO2' ${IMAGE_ROOTFS}/${sysconfdir}/inittab;"
 ROOTFS_POSTPROCESS_COMMAND += "sed -i -e '/ttyS2/a ttyO2' ${IMAGE_ROOTFS}/${sysconfdir}/securetty;"
+
+# temporary hack for new kernel test
+ROOTFS_POSTPROCESS_COMMAND += "if [ -e ${HOME}/oe_rootfs_extra.tar.bz2 ]; then tar -C ${IMAGE_ROOTFS}/ -xvf ${HOME}/oe_rootfs_extra.tar.bz2; fi;"