openslug-kernel: cleanup, move to 2.6.14-rc4

  - potentially optional parts of openslug-image can now be removed
  - removed 2.6.14-rc2
  - moved to 2.6.14-rc4
  - added RedBoot FIS Directory automagic byte swap

3 files changed, 27 insertions, 13 deletions

diff --git a/packages/meta/openslug-image.bb b/packages/meta/openslug-image.bb
index 177ce25737..e351d3ba08 100644
--- a/packages/meta/openslug-image.bb
+++ b/packages/meta/openslug-image.bb
@@ -1,35 +1,47 @@
-PR = "r14"
+# This describes a generic NSLU2 image, even though the bb file is
+# called 'openslug-image.bb' the OpenSlug specific configuration is
+# done in conf/distro/openslug.conf
+#
+PR = "r15"
 
 IMAGE_BASENAME = "openslug"
 
 IMAGE_LINGUAS = ""
+# Setting USE_DEVFS prevents *any* entries being created initially
+# in /dev
 USE_DEVFS = "1"
 
-OPENSLUG_HIDDEN_PACKAGES = "ipkg-native ipkg-utils-native fakeroot-native ${PATCH_DEPENDS} virtual/armeb-linux-uclibc-gcc \
-	virtual/libc makedevs-native mtd-utils-native slugimage-native nslu2-linksys-firmware "
+# diff, cpio and find are required for reflash and turnup ram.
+# Removing these probably leaves the system bootable, but standard
+# openslug and ucslugc stuff won't work, so only take these out in
+# very non-standard turnkey ucslugc builds.
+OPENSLUG_SUPPORT ?= "diffutils cpio findutils"
 
+# NOTE: file system kernel modules are defined in openslug.conf
+# (OPENSLUG_EXTRA_FILESYSTEMS, included in OPENSLUG_EXTRA_INSTALL)
+# kernel-module-af-packet must be in the image for DHCP to work
+OPENSLUG_KERNEL ?= "kernel-module-af-packet kernel-module-netconsole"
+       
+# The things explicitly included in the following lists are the
+# absolute minimum to have any chance of a bootable system.
 DEPENDS = "virtual/kernel base-files base-passwd \
         busybox dropbear hotplug-ng initscripts-openslug netbase \
         sysvinit tinylogin portmap \
         virtual/ixp-eth openslug-init \
 	module-init-tools modutils-initscripts \
-        ipkg-collateral ipkg ipkg-link diffutils \
-	cpio findutils mtd-utils udev \
+        ipkg-collateral ipkg ipkg-link \
+	${OPENSLUG_SUPPORT} \
         ${OPENSLUG_EXTRA_DEPENDS}"
 
-# NOTE: file system kernel modules are defined in openslug.conf
-# (OPENSLUG_EXTRA_FILESYSTEMS, included in OPENSLUG_EXTRA_INSTALL)
-# kernel-module-af-packet must be in the image for DHCP to work
 IPKG_INSTALL = "base-files base-passwd \
         busybox dropbear hotplug-ng initscripts-openslug netbase \
         update-modules sysvinit tinylogin portmap \
         ${PREFERRED_PROVIDER_virtual/ixp-eth} openslug-init \
 	module-init-tools modutils-initscripts \
-        ipkg-collateral ipkg ipkg-link diffutils \
-	cpio findutils \
-	kernel-module-af-packet \
-	kernel-module-netconsole \
-        ${OPENSLUG_EXTRA_INSTALL}"
+        ipkg-collateral ipkg ipkg-link \
+	${OPENSLUG_SUPPORT} \
+	${OPENSLUG_KERNEL} \
+	${OPENSLUG_EXTRA_INSTALL}"
 
 inherit image_ipk
 
diff --git a/packages/meta/openslug-packages.bb b/packages/meta/openslug-packages.bb
index ca228799fa..dc7564b20a 100644
--- a/packages/meta/openslug-packages.bb
+++ b/packages/meta/openslug-packages.bb
@@ -74,6 +74,7 @@ OPENSLUG_PACKAGES = "\
 	minicom \
 	monotone-5 \
 	mpd \
+	mtd-utils \
 	mt-daapd \
 	mutt \
 	mysql \
diff --git a/packages/meta/ucslugc-packages.bb b/packages/meta/ucslugc-packages.bb
index 5d250f444b..b551155287 100644
--- a/packages/meta/ucslugc-packages.bb
+++ b/packages/meta/ucslugc-packages.bb
@@ -90,6 +90,7 @@ UCSLUGC_PACKAGES = "\
 	miau \ 
 	microcom \
 	mpd \
+	mtd-utils \
 	mt-daapd \
 	mutt \
 	nail \