propagate from branch 'org.openembedded.dev' (head acccc4840b95c279164a3eeacf893200164bdc65)

            to branch 'org.openembedded.dev.avr32' (head 4a915ee0a28076c53049330f3f2e58c7b85ef7a8)

7 files changed, 35 insertions, 45 deletions

diff --git a/packages/images/console-mipv6-image.bb b/packages/images/console-mipv6-image.bb
new file mode 100644
index 0000000000..3c9995cf2e
--- /dev/null
+++ b/packages/images/console-mipv6-image.bb
@@ -0,0 +1,7 @@
+# This image is for testing the ipv6 mobility extensions
+
+require console-image.bb
+IMAGE_INSTALL += " task-mipl "
+
+export IMAGE_BASENAME = "console-mobile-ipv6-image"
+
diff --git a/packages/images/devimage-image.bb b/packages/images/devimage-image.bb
index 6a3e60c5e3..cecd98d644 100644
--- a/packages/images/devimage-image.bb
+++ b/packages/images/devimage-image.bb
@@ -3,12 +3,8 @@
 # only shell and dropbear are loaded by default.
 # Allows to login via serial and real console or SSH
 
-DEVIMAGE_EXTRA_RDEPENDS ?= ""
-IMAGE_INSTALL = "devimage busybox dropbear udev \
-            module-init-tools pcmciautils \
-	    wireless-tools wpa-supplicant \
-	    irda-utils acx-firmware \
-	    ${DEVIMAGE_EXTRA_RDEPENDS}"
+DEPENDS = "task-devimage"
+IMAGE_INSTALL = "task-devimage"
 
 export IMAGE_BASENAME = "devimage"
 IMAGE_LINGUAS = ""
diff --git a/packages/images/essential-image.bb b/packages/images/essential-image.bb
deleted file mode 100644
index 8b566af6ec..0000000000
--- a/packages/images/essential-image.bb
+++ /dev/null
@@ -1,15 +0,0 @@
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: MIT (see COPYING.MIT)
-#
-# Filename: essential-image.bb
-# Date: 23-Apr-06
-
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-
-DEPENDS = "task-essential-to-boot"
-IMAGE_LINGUAS = ""
-IMAGE_INSTALL = "task-essential-to-boot"
-
-inherit image
-
diff --git a/packages/images/essential-machine-image.bb b/packages/images/essential-machine-image.bb
deleted file mode 100644
index b74dec5e35..0000000000
--- a/packages/images/essential-machine-image.bb
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright Matthias Hentges <devel@hentges.net> (c) 2006
-# License: MIT (see COPYING.MIT)
-#
-# Filename: essential-machine-image.bb
-# Date: 24-Apr-06
-
-DESCRIPTION = "<description>"
-HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
-
-DEPENDS = "task-essential-to-boot task-essential-parts"
-
-MACHINE_TASKS_akita = "task-essential-to-boot \
-		       task-essential-pcmcia task-essential-userspace \
-		       task-essential-usbhost task-essential-usbclient \
-		       task-essential-sound task-essential-irda \
-		       task-essential-sd"
-
-IMAGE_LINGUAS = ""
-IMAGE_INSTALL = "${MACHINE_TASKS}"
-export IMAGE_BASENAME = "essential-image"
-
-inherit image
\ No newline at end of file
diff --git a/packages/images/initramfs-bootmenu-image.bb b/packages/images/initramfs-bootmenu-image.bb
new file mode 100644
index 0000000000..a495363661
--- /dev/null
+++ b/packages/images/initramfs-bootmenu-image.bb
@@ -0,0 +1,11 @@
+# Sample initramfs image
+
+IMAGE_INSTALL = "busybox-static initramfs-module-bootmenu"
+IMAGE_LINGUAS = ""
+
+# Remove any kernel-image that the kernel-module-* packages may have pulled in.
+PACKAGE_REMOVE = "kernel-image-* update-modules module-init-tools-depmod uclibc update-rc.d"
+ROOTFS_POSTPROCESS_COMMAND += "ipkg-cl ${IPKG_ARGS} -force-depends \
+                                remove ${PACKAGE_REMOVE};"
+
+inherit image
diff --git a/packages/images/nslu2-minimal-image.bb b/packages/images/nslu2-minimal-image.bb
new file mode 100644
index 0000000000..5a601b2995
--- /dev/null
+++ b/packages/images/nslu2-minimal-image.bb
@@ -0,0 +1,14 @@
+# Note that this package is intended to create an *identical*
+# kernel and rootfs as the normal minimal-image.bb
+
+# The only reason for the existence of this .bb file is to
+# create the 8MB and 16MB flashable NSLU2 firmware images.
+
+# Please do not add anything other than the following two
+# lines to this file, and please do not do anything in
+# the nslu2-image.bb class which might affect the kernel
+# or rootfs.
+
+require minimal-image.bb
+
+inherit nslu2-image
diff --git a/packages/images/slugos-image.bb b/packages/images/slugos-image.bb
index 9f6a2aaa4f..fb1b372735 100644
--- a/packages/images/slugos-image.bb
+++ b/packages/images/slugos-image.bb
@@ -32,4 +32,4 @@ SLUGOS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device
 IMAGE_PREPROCESS_COMMAND += "rm ${IMAGE_ROOTFS}/boot/zImage*;"
 IMAGE_PREPROCESS_COMMAND += "install -c -m 644 ${SLUGOS_DEVICE_TABLE} ${IMAGE_ROOTFS}/etc/device_table;"
 
-inherit image nslu2-image dsmg600-image nas100d-image
+inherit image nslu2-image