merge of '362d00084fcab0dc4cba423bee3c23d68532cb36'

     and '52dfcd4e8a176e28df32baa61ee5584aa8d4c9c6'

22 files changed, 160 insertions, 37 deletions

diff --git a/packages/images/bootstrap-image-bootchart.bb b/packages/images/bootstrap-image-bootchart.bb
new file mode 100644
index 0000000000..04b1aa299d
--- /dev/null
+++ b/packages/images/bootstrap-image-bootchart.bb
@@ -0,0 +1,10 @@
+export IMAGE_BASENAME = "bootstrap-image-bootchart"
+export IMAGE_LINGUAS = ""
+export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} bootchart acct"
+
+DEPENDS = "${MACHINE_TASK_PROVIDER} bootchart"
+RDEPENDS = "acct"
+
+inherit image_ipk
+
+LICENSE = MIT
diff --git a/packages/images/bootstrap-image.bb b/packages/images/bootstrap-image.bb
index 1791dd8f56..50c1a8f354 100644
--- a/packages/images/bootstrap-image.bb
+++ b/packages/images/bootstrap-image.bb
@@ -1,8 +1,8 @@
 export IMAGE_BASENAME = "bootstrap-image"
 export IMAGE_LINGUAS = ""
-export IPKG_INSTALL = "task-bootstrap"
+export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER}"
 
-DEPENDS = "task-bootstrap"
+DEPENDS = "${MACHINE_TASK_PROVIDER}"
 
 inherit image_ipk
 
diff --git a/packages/images/dvb-image.bb b/packages/images/dvb-image.bb
index fa964b4490..b1c714c79e 100644
--- a/packages/images/dvb-image.bb
+++ b/packages/images/dvb-image.bb
@@ -2,7 +2,7 @@ export IMAGE_BASENAME = "dvb-image"
 
 IMAGE_LINGUAS = ""
 
-DVB_PACKAGES = "task-bootstrap task-dvb"
+DVB_PACKAGES = "${MACHINE_TASK_PROVIDER} task-dvb"
 
 export IPKG_INSTALL = "${DVB_PACKAGES}"
 DEPENDS = "${DVB_PACKAGES}"
diff --git a/packages/images/e-image-core.bb b/packages/images/e-image-core.bb
index 9a1ed51a1a..f41f04ee23 100644
--- a/packages/images/e-image-core.bb
+++ b/packages/images/e-image-core.bb
@@ -5,7 +5,7 @@ PR = "r1"
 export IMAGE_BASENAME = "e-image-core"
 export IMAGE_LINGUAS = ""
 
-DEPENDS = "task-bootstrap \
+DEPENDS = "${MACHINE_TASK_PROVIDER} \
            xserver-kdrive \
            task-e-x11-core"
 
@@ -16,6 +16,6 @@ PREFERRED_PROVIDER_virtual/imlib2 = "imlib2-x11"
 PREFERRED_PROVIDER_virtual/libxine = "libxine-x11"
 PREFERRED_PROVIDER_libx11 = "libx11"
 
-export IPKG_INSTALL = "task-bootstrap task-e-x11-core xserver-kdrive-fbdev glibc-charmap-utf-8 glibc-localedata-i18n"
+export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} task-e-x11-core xserver-kdrive-fbdev glibc-charmap-utf-8 glibc-localedata-i18n"
 
 inherit image_ipk
diff --git a/packages/images/e-image.bb b/packages/images/e-image.bb
index 99f3858f66..86aff41230 100644
--- a/packages/images/e-image.bb
+++ b/packages/images/e-image.bb
@@ -1,4 +1,4 @@
-include e-image-core.bb
+require e-image-core.bb
 DESCRIPTION = "An X11-based distribution with the Enlightenment Window Manager and Tools"
 PR = "r5"
 
diff --git a/packages/images/gpe-image-blank-user.bb b/packages/images/gpe-image-blank-user.bb
index c8e24ae035..60e78ba414 100644
--- a/packages/images/gpe-image-blank-user.bb
+++ b/packages/images/gpe-image-blank-user.bb
@@ -1,4 +1,4 @@
-include gpe-image.bb
+require gpe-image.bb
 
 MAINTAINER = "Rob Taylor <rjt@cambridgebroadband.com"
 
diff --git a/packages/images/gpe-image.bb b/packages/images/gpe-image.bb
index 92bed0dd5c..75aa14a0f4 100644
--- a/packages/images/gpe-image.bb
+++ b/packages/images/gpe-image.bb
@@ -24,11 +24,11 @@ GPE_EXTRA_INSTALL += ${GPE_BIGFLASH_INSTALL}
 
 XSERVER ?= "xserver-kdrive-fbdev"
 
-DEPENDS = "task-bootstrap task-gpe"
+DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpe"
 RDEPENDS = "${IPKG_INSTALL}"
 
 export IPKG_INSTALL = "\
-    task-bootstrap \
+    ${MACHINE_TASK_PROVIDER} \
     gpe-task-base \
     gpe-task-pim \
     gpe-task-settings \
diff --git a/packages/images/maemo-image.bb b/packages/images/maemo-image.bb
index 2adc88b958..19157b6a5f 100644
--- a/packages/images/maemo-image.bb
+++ b/packages/images/maemo-image.bb
@@ -15,11 +15,11 @@ MAEMO_EXTRA_INSTALL = "osso-af-services osso-af-base-apps scap dosfstools"
 
 XSERVER ?= "xserver-kdrive-omap"
 
-DEPENDS = "task-bootstrap \
+DEPENDS = "${MACHINE_TASK_PROVIDER} \
 	   meta-maemo \
 	   ${MAEMO_EXTRA_DEPENDS}"
 
-export IPKG_INSTALL = "task-bootstrap maemo-task-base maemo-task-theme \
+export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} maemo-task-base maemo-task-theme \
 	               maemo-task-apps ${MAEMO_EXTRA_INSTALL} \
 		       ${XSERVER}"
 
diff --git a/packages/images/mythfront-image.bb b/packages/images/mythfront-image.bb
index 7836258940..31992e4bc8 100644
--- a/packages/images/mythfront-image.bb
+++ b/packages/images/mythfront-image.bb
@@ -4,7 +4,7 @@ IMAGE_ROOTFS_SIZE_ext2 = "85000"
 IMAGE_ROOTFS_SIZE_ext2.gz = "85000"
 IMAGE_LINGUAS = ""
 
-MYTHFRONT_PACKAGES = "task-bootstrap task-mythfront"
+MYTHFRONT_PACKAGES = "${MACHINE_TASK_PROVIDER} task-mythfront"
 
 export IPKG_INSTALL = "${MYTHFRONT_PACKAGES}"
 DEPENDS = "${MYTHFRONT_PACKAGES}"
diff --git a/packages/images/nylon-image-base.bb b/packages/images/nylon-image-base.bb
index a4f6d17dd8..4e7711e6c7 100644
--- a/packages/images/nylon-image-base.bb
+++ b/packages/images/nylon-image-base.bb
@@ -1,3 +1,6 @@
+inherit image_ipk nylon-image
+LICENSE = MIT
+
 export IMAGE_BASENAME = "nylon-base"
  
 NYLON_BASE = "base-files base-passwd bash busybox \
@@ -7,8 +10,8 @@ NYLON_BASE = "base-files base-passwd bash busybox \
 	openssh sysvinit \
 	timezones tinylogin"
 
-DEPENDS = "virtual/kernel"
-RDEPENDS = "kernel modutils-depmod modutils-modinfo \
+DEPENDS += "virtual/kernel less nano"
+RDEPENDS = "kernel modutils-depmod modutils-modinfo less nano \
 	${NYLON_BASE} ${BOOTSTRAP_EXTRA_RDEPENDS}"
 
 export IPKG_INSTALL = "${RDEPENDS}" 
@@ -19,4 +22,3 @@ IMAGE_LINGUAS = ""
 ROOTFS_POSTPROCESS_COMMAND = "rm -f ${IMAGE_ROOTFS}/tmp/zImage*"
 
 inherit image_ipk nylon-image
-LICENSE = MIT
diff --git a/packages/images/nylon-image-extended.bb b/packages/images/nylon-image-extended.bb
new file mode 100644
index 0000000000..09ec4897f6
--- /dev/null
+++ b/packages/images/nylon-image-extended.bb
@@ -0,0 +1,85 @@
+LICENSE = MIT
+require nylon-image-base.bb
+require ../meta/nylon-feed.inc
+
+export IMAGE_BASENAME = "nylon-extended"
+ 
+NYLON_EXTENDED_DEPENDS = "${NYLON_FEED}"
+
+NYLON_EXTENDED_RDEPENDS = "\
+    hostap-modules-cs \
+    hostap-modules-pci \
+    modutils-depmod \
+    modutils-initscripts \
+    modutils-modinfo \
+    ntpdate \
+    ntp-bin \
+    ntp-tickadj \
+    openssh-scp \
+    openssh-ssh \
+    openssh-sshd \
+    perl-misc \
+    perl-module-autoloader \
+    perl-module-base \
+    perl-module-bytes \
+    perl-module-carp \
+    perl-module-config \
+    perl-module-constant \
+    perl-module-data-dumper \
+    perl-module-encode \
+    perl-module-encode-alias \
+    perl-module-encode-config \
+    perl-module-encode-encoding \
+    perl-module-encode-unicode \
+    perl-module-errno \
+    perl-module-exporter \
+    perl-module-exporter-heavy \
+    perl-module-fields \
+    perl-module-getopt-long \
+    perl-module-integer \
+    perl-module-io \
+    perl-module-io-handle \
+    perl-module-io-socket \
+    perl-module-io-socket-inet \
+    perl-module-io-socket-unix \
+    perl-module-locale \
+    perl-module-overload \
+    perl-module-posix \
+    perl-module-selectsaver \
+    perl-module-socket \
+    perl-module-strict \
+    perl-module-symbol \
+    perl-module-sys-hostname \
+    perl-module-vars \
+    perl-module-warnings \
+    perl-module-warnings-register \
+    perl-module-xsloader \
+"
+
+KERNEL_MODULES = " \
+    kernel-module-aes \
+    kernel-module-bridge \
+    kernel-module-ds \
+    kernel-module-fat \
+    kernel-module-mii \
+    kernel-module-pcmcia-core \
+    kernel-module-scsi-mod \
+    kernel-module-sd-mod \
+    kernel-module-usb-storage \
+    kernel-module-usb-ohci \
+    kernel-module-usbnet \
+    kernel-module-usbserial \
+    kernel-module-vfat \
+    kernel-module-yenta-socket \
+"
+
+
+DEPENDS += "${NYLON_EXTENDED_DEPENDS}"
+
+RDEPENDS += "${NYLON_EXTENDED_DEPENDS} ${KERNEL_MODULES} ${NYLON_EXTENDED_RDEPENDS}"
+
+RDEPENDS_append_mtx-1 = "\
+    kernel-module-au1x00-bi \
+    kernel-module-network-fd \
+    kernel-module-usbdcore"
+    kernel-module-usbdprocfs \
diff --git a/packages/images/nylon-image-extra.bb b/packages/images/nylon-image-extra.bb
index be20ddde78..e825b15e69 100644
--- a/packages/images/nylon-image-extra.bb
+++ b/packages/images/nylon-image-extra.bb
@@ -1,4 +1,6 @@
-include nylon-image-standard.bb
+LICENSE = MIT
+
+require nylon-image-standard.bb
 
 export IMAGE_BASENAME = "nylon-extra"
  
@@ -7,5 +9,3 @@ RDEPENDS = "\
     netperf \
     nylon-statistics \
     openvpn"
-
-LICENSE = MIT
diff --git a/packages/images/nylon-image-standard.bb b/packages/images/nylon-image-standard.bb
index 8d10e9a30f..c3c98ceca4 100644
--- a/packages/images/nylon-image-standard.bb
+++ b/packages/images/nylon-image-standard.bb
@@ -1,4 +1,5 @@
-include nylon-image-base.bb
+LICENSE = MIT
+require nylon-image-base.bb
 
 export IMAGE_BASENAME = "nylon-standard"
  
@@ -26,4 +27,3 @@ DEPENDS += "hostap-modules ntp \
 	
 RDEPENDS += "hostap-modules-pci ntpdate \
 	${NYLON_STANDARD}"
-LICENSE = MIT
diff --git a/packages/images/opie-image.bb b/packages/images/opie-image.bb
index c786f67e0b..b7c68ec505 100644
--- a/packages/images/opie-image.bb
+++ b/packages/images/opie-image.bb
@@ -6,12 +6,12 @@ FEED_URIS_append_familiar   = " opie##http://familiar.handhelds.org/releases/${D
 LICENSE = "MIT"
 PR = "r21"
 
-DEPENDS = "task-bootstrap task-opie"
+DEPENDS = "${MACHINE_TASK_PROVIDER} task-opie"
 RDEPENDS = "${INSTALL_PACKAGES}"
 
 extra_stuff := '${@base_conditional("ROOT_FLASH_SIZE", "24", "", "task-opie-extra-games task-opie-extra-apps task-opie-extra-styles",d)}'
 
-INSTALL_PACKAGES = "task-bootstrap task-opie-base task-opie-base-applets \
+INSTALL_PACKAGES = "${MACHINE_TASK_PROVIDER} task-opie-base task-opie-base-applets \
 		    task-opie-base-inputmethods task-opie-base-apps \
 		    task-opie-base-settings task-opie-base-decorations \
 		    task-opie-base-styles task-opie-base-pim \
diff --git a/packages/images/opie-kdepim-image.bb b/packages/images/opie-kdepim-image.bb
index 113608736a..7fdc22126b 100644
--- a/packages/images/opie-kdepim-image.bb
+++ b/packages/images/opie-kdepim-image.bb
@@ -1,4 +1,4 @@
-include opie-image.bb
+require opie-image.bb
 
 DEPENDS += "kdepimpi"
 PR = "r1"
diff --git a/packages/images/sdl-image.bb b/packages/images/sdl-image.bb
index 0f3254b56e..79c8094f34 100644
--- a/packages/images/sdl-image.bb
+++ b/packages/images/sdl-image.bb
@@ -2,8 +2,8 @@ LICENSE = MIT
 
 export IMAGE_BASENAME = "sdl-image"
 
-DEPENDS = "task-bootstrap task-sdl"
+DEPENDS = "${MACHINE_TASK_PROVIDER} task-sdl"
 
-export IPKG_INSTALL = "task-bootstrap sdl-base"
+export IPKG_INSTALL = "${MACHINE_TASK_PROVIDER} sdl-base"
 
 inherit image_ipk
diff --git a/packages/images/sectest-gpe-image.bb b/packages/images/sectest-gpe-image.bb
index be7f28fb91..1ddd022d08 100644
--- a/packages/images/sectest-gpe-image.bb
+++ b/packages/images/sectest-gpe-image.bb
@@ -21,11 +21,11 @@ GPE_EXTRA_INSTALL += "${GPE_EXTRA_INSTALL_${GUI_MACHINE_CLASS}}"
 
 XSERVER ?= "xserver-kdrive-fbdev"
 
-DEPENDS = "task-bootstrap task-gpe"
+DEPENDS = "${MACHINE_TASK_PROVIDER} task-gpe"
 RDEPENDS = "${IPKG_INSTALL}"
 
 export IPKG_INSTALL = "\
-    task-bootstrap \
+    ${MACHINE_TASK_PROVIDER} \
     gpe-task-base \
     gpe-task-pim \
     gpe-task-settings \
diff --git a/packages/images/twin-image.bb b/packages/images/twin-image.bb
index 7015f7020c..f609dfd07e 100644
--- a/packages/images/twin-image.bb
+++ b/packages/images/twin-image.bb
@@ -1,13 +1,13 @@
 export IMAGE_BASENAME="twin-image"
 
-DEPENDS = 'task-bootstrap \
+DEPENDS = '${MACHINE_TASK_PROVIDER} \
           twin \
 	  orpheus \
 	  nano \
 	  vim \
 	  mutt'
 
-export IPKG_INSTALL = 'task-bootstrap \
+export IPKG_INSTALL = '${MACHINE_TASK_PROVIDER} \
 		       twin \
 		       orpheus \
 		       nano \
diff --git a/packages/images/uml-image.bb b/packages/images/uml-image.bb
index 6ebbf04537..5b6981488e 100644
--- a/packages/images/uml-image.bb
+++ b/packages/images/uml-image.bb
@@ -6,7 +6,7 @@ export IMAGE_BASENAME = "uml-image"
 OPIE_LIBS = "qte qpf-bitstream-vera libqpe-opie libopie2"
 OPIE_BASE = "opie-qcop opie-quicklauncher opie-taskbar"
 
-DEPENDS = "task-bootstrap"
+DEPENDS = "${MACHINE_TASK_PROVIDER}"
 export IPKG_INSTALL = "${DEPENDS}"
 
 inherit image_ipk
diff --git a/packages/images/unslung-image.bb b/packages/images/unslung-image.bb
index e57960ecdb..a704f00479 100644
--- a/packages/images/unslung-image.bb
+++ b/packages/images/unslung-image.bb
@@ -1,5 +1,5 @@
 LICENSE = MIT
-PR = "r17"
+PR = "r20"
 
 IMAGE_BASENAME = "unslung"
 
@@ -34,10 +34,15 @@ unslung_clean_image () {
 
 	# Remove the kernel image
 	rm -rf ${IMAGE_ROOTFS}/boot
+	rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/alternatives/zImage
 	# And remove the post and pre scripts for the kernel; saves flash space
 	rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/kernel.postinst
 	rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/kernel.postrm
 
+	# Remove all the postinst scripts; don't need them.  But keep the
+	# postrm scripts just in case we need to remove something.
+	rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/*.postinst
+
 	# Remove info from the local feed used to build the image
 	rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/lists/*
 	rm -f ${IMAGE_ROOTFS}/${sysconfdir}/version
@@ -67,19 +72,40 @@ unslung_clean_image () {
 	${STRIP} ${IMAGE_ROOTFS}/lib/libgcc_s.so.1
 	chmod ugo+x ${IMAGE_ROOTFS}/lib/libgcc_s.so.1
 
-	# We need cpio and find, but we don't need any of the other stuff in the
-	# packages (users can install the full package with ipkg after unsling).
-	# (make sure that if the package is not included (i.e. using slingbox
-	# instead) that the files are not deleted; they might be part of slingbox)
+	# We need cpio and find, but we don't need any of the other stuff in
+	# the packages (users can install the full package with ipkg after
+	# unsling).  Remove the extra files and executables, and clean up
+	# the entries from the ipkg database manually.
 
 	#-- these are for cpio:
 	rm -f ${IMAGE_ROOTFS}/usr/bin/mt
 	rm -rf ${IMAGE_ROOTFS}/usr/libexec
+	rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/cpio.*
+	rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/alternatives/rmt
+	sed -i -e '/^Package: cpio/,/^$/d' ${IMAGE_ROOTFS}${libdir}/ipkg/status
 
 	#-- and these for find:
 	rm -f ${IMAGE_ROOTFS}/usr/bin/locate
 	rm -f ${IMAGE_ROOTFS}/usr/bin/updatedb
 	rm -f ${IMAGE_ROOTFS}/usr/bin/xargs
+	rm -f ${IMAGE_ROOTFS}${libdir}/ipkg/info/findutils.*
+	sed -i -e '/^Package: findutils/,/^$/d' ${IMAGE_ROOTFS}${libdir}/ipkg/status
+
+	# FIXME: change made 24 Jul 2006 by the OE folks changes the "strip"
+	# behavior to create an extra file named .debug/<filename> containing
+	# the stripped symbols.  These files are supposed to be packaged
+	# separately by the standard bb routines, but for some reason this
+	# does not alway occur.  This extremely ugly step is to remove the
+	# debug cruft from the rootfs if any are left in the obvious locations.
+	# Once someone figures out why and what the right way is to fix this,
+	# this code should be removed.
+
+	rm -rf ${IMAGE_ROOTFS}/bin/.debug
+	rm -rf ${IMAGE_ROOTFS}/sbin/.debug
+	rm -rf ${IMAGE_ROOTFS}/lib/.debug
+	rm -rf ${IMAGE_ROOTFS}/usr/bin/.debug
+	rm -rf ${IMAGE_ROOTFS}/usr/sbin/.debug
+	rm -rf ${IMAGE_ROOTFS}/usr/lib/.debug
 }
 
 python () {
diff --git a/packages/images/xfce-image.bb b/packages/images/xfce-image.bb
index 5605a6b2ee..f861b9e6dd 100644
--- a/packages/images/xfce-image.bb
+++ b/packages/images/xfce-image.bb
@@ -5,7 +5,7 @@ IMAGE_LINGUAS = ""
 X_DEPENDS = "virtual/xserver"
 X_RDEPENDS = "xserver-kdrive-fbdev"
 
-XFCE_DEPENDS = "task-bootstrap task-xfce-base"
+XFCE_DEPENDS = "${MACHINE_TASK_PROVIDER} task-xfce-base"
 XFCE_RDEPENDS = "${XFCE_DEPENDS}"
 
 export IPKG_INSTALL = "${X_RDEPENDS} ${XFCE_RDEPENDS}"
diff --git a/packages/images/xterminal-image.bb b/packages/images/xterminal-image.bb
index 2b98ec98fc..d6cc7b1640 100644
--- a/packages/images/xterminal-image.bb
+++ b/packages/images/xterminal-image.bb
@@ -2,7 +2,7 @@ export IMAGE_BASENAME = "xterminal-image"
 
 IMAGE_LINGUAS = ""
 
-XTERMINAL_PACKAGES = "task-bootstrap task-xterminal"
+XTERMINAL_PACKAGES = "${MACHINE_TASK_PROVIDER} task-xterminal"
 
 export IPKG_INSTALL = "${XTERMINAL_PACKAGES}"
 DEPENDS = "${XTERMINAL_PACKAGES}"