propagate from branch 'org.openembedded.koen' (head bb1a38be37cbbff81441ed44aa2837140560b742)

            to branch 'org.openembedded.dev' (head 18c7455de8346644397b35e55e0862a9124bf444)

5 files changed, 11 insertions, 4 deletions

diff --git a/conf/distro/openslug-packages.conf b/conf/distro/openslug-packages.conf
index da81ad9edb..daff83460b 100644
--- a/conf/distro/openslug-packages.conf
+++ b/conf/distro/openslug-packages.conf
@@ -42,6 +42,7 @@ ${PKGDIR}/packages/glibc/*.bb \
 ${PKGDIR}/packages/gnu-config/*.bb \
 ${PKGDIR}/packages/gphoto2/*.bb \
 ${PKGDIR}/packages/grep/*.bb \
+${PKGDIR}/packages/groff/*.bb \
 ${PKGDIR}/packages/gtk-doc/*.bb \
 ${PKGDIR}/packages/gzip/*.bb \
 ${PKGDIR}/packages/hotplug-ng/*.bb \
@@ -98,10 +99,10 @@ ${PKGDIR}/packages/nis/*.bb \
 ${PKGDIR}/packages/nslu2-binary-only/*.bb \
 ${PKGDIR}/packages/ntp/*.bb \
 ${PKGDIR}/packages/obexftp/*.bb \
-${PKGDIR}/packages/openobex/*.bb \
-${PKGDIR}/packages/openobex-apps/*.bb \
 ${PKGDIR}/packages/openldap/*.bb \
 ${PKGDIR}/packages/openntpd/*.bb \
+${PKGDIR}/packages/openobex-apps/*.bb \
+${PKGDIR}/packages/openobex/*.bb \
 ${PKGDIR}/packages/openslug-init/*.bb \
 ${PKGDIR}/packages/openssh/*.bb \
 ${PKGDIR}/packages/openssl/*.bb \
diff --git a/conf/machine/poodle.conf b/conf/machine/poodle.conf
index ad0ebc96bc..4ff3fe7e56 100644
--- a/conf/machine/poodle.conf
+++ b/conf/machine/poodle.conf
@@ -12,6 +12,8 @@ EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad --faketime -n"
 
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.bin ${EXTRA_IMAGECMD}"
 
+EXTRA_BOOTSTRAP_DEPENDS += "zaurus-updater"
+
 include conf/machine/handheld-common.conf
 
 # yes, it has 64MB...
diff --git a/conf/machine/tosa.conf b/conf/machine/tosa.conf
index c3f440fae2..dfdabf482f 100644
--- a/conf/machine/tosa.conf
+++ b/conf/machine/tosa.conf
@@ -12,6 +12,8 @@ EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x4000 -n --faketime"
 
 IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
 
+EXTRA_BOOTSTRAP_DEPENDS += "zaurus-updater"
+
 GUI_MACHINE_CLASS = "bigscreen"
 GPE_EXTRA_DEPENDS += "gaim"
 ROOT_FLASH_SIZE = "32"
diff --git a/conf/machine/zaurus-clamshell-2.4.conf b/conf/machine/zaurus-clamshell-2.4.conf
index 705dcd1905..0934d84baa 100644
--- a/conf/machine/zaurus-clamshell-2.4.conf
+++ b/conf/machine/zaurus-clamshell-2.4.conf
@@ -9,11 +9,11 @@ PREFERRED_PROVIDERS_append_spitz = " virtual/kernel:openzaurus-pxa27x"
 PREFERRED_VERSION_orinoco-modules = "0.13e"
 
 BOOTSTRAP_EXTRA_DEPENDS  += "virtual/kernel hostap-modules orinoco-modules sharp-sdmmc-support \
-pcmcia-cs apmd wireless-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \
+pcmcia-cs apmd wireless-tools console-tools irda-utils lrzsz hostap-utils prism3-firmware prism3-support \
 wpa-supplicant-nossl ppp ppp-dialin openswan"
 
 BOOTSTRAP_EXTRA_RDEPENDS += "kernel hostap-modules-cs orinoco-modules-cs sharp-sdmmc-support \
-pcmcia-cs apmd apm wireless-tools irda-utils hostap-utils prism3-firmware prism3-support \
+pcmcia-cs apmd apm wireless-tools console-tools irda-utils hostap-utils prism3-firmware prism3-support \
 wpa-supplicant-nossl ppp ppp-dialin openswan"
 
 # Misc Modules
diff --git a/conf/machine/zaurus-clamshell.conf b/conf/machine/zaurus-clamshell.conf
index e0b8d31349..d03c9a7f6b 100644
--- a/conf/machine/zaurus-clamshell.conf
+++ b/conf/machine/zaurus-clamshell.conf
@@ -11,6 +11,8 @@ IMAGE_CMD_jffs2 = "mkfs.jffs2 --root=${IMAGE_ROOTFS} --faketime \
 		   cat ${STAGING_LIBDIR}/sharp-flash-header/header-c700.bin \
 		   ${T}/${IMAGE_NAME}.rootfs.jffs2 > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.img"
 
+EXTRA_BOOTSTRAP_DEPENDS += "zaurus-updater"
+
 GUI_MACHINE_CLASS = "bigscreen"
 GPE_EXTRA_DEPENDS += "gaim sylpheed"
 GPE_EXTRA_INSTALL += "gaim sylpheed"