merge of '302d6092c09d8a1b6e5ada2cf66d444d001796b5'

     and '5075b3f69144c8ca977abda48869d41f724d1334'

105 files changed, 773 insertions, 1134 deletions

diff --git a/classes/lsppchd-image.bbclass b/classes/lsppchd-image.bbclass
index bb150c7e15..cb13222d64 100644
--- a/classes/lsppchd-image.bbclass
+++ b/classes/lsppchd-image.bbclass
@@ -6,3 +6,5 @@ IMAGE_PREPROCESS_COMMAND_lsppchd += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAG
 lsppchd_pack_image() {
 :
 }
+
+IMAGE_POSTPROCESS_COMMAND += "lsppchd_pack_image; "
diff --git a/classes/lsppchg-image.bbclass b/classes/lsppchg-image.bbclass
index 9ad0801fe3..553414224d 100644
--- a/classes/lsppchg-image.bbclass
+++ b/classes/lsppchg-image.bbclass
@@ -6,3 +6,5 @@ IMAGE_PREPROCESS_COMMAND_lsppchg += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAG
 lsppchg_pack_image() {
 :
 }
+
+IMAGE_POSTPROCESS_COMMAND += "lsppchg_pack_image; "
diff --git a/classes/n2100-image.bbclass b/classes/n2100-image.bbclass
index 393efae7e1..bc6c12e1fb 100644
--- a/classes/n2100-image.bbclass
+++ b/classes/n2100-image.bbclass
@@ -28,3 +28,5 @@ n2100_pack_image() {
         rm -f $PADFILE
 	ls -l $OUTPUT
 }
+
+IMAGE_POSTPROCESS_COMMAND += "n2100_pack_image; "
diff --git a/classes/opie.bbclass b/classes/opie.bbclass
index 92cde5487b..915de890cf 100644
--- a/classes/opie.bbclass
+++ b/classes/opie.bbclass
@@ -19,10 +19,6 @@ OPIE_CVS_PV ?= "1.2.2+cvs${SRCDATE}"
 
 DEPENDS_prepend = "${@["libopie2 ", ""][(bb.data.getVar('PN', d, 1) == 'libopie2')]}"
 
-FILES_${PN}-dbg += " ${palmtopdir}/lib/.debug \
-                     ${palmtopdir}/bin/.debug \
-                     ${palmtopdir}/plugins/*/.debug "
-
 # to be consistent, put all targets into workdir
 # NOTE: leave one space at the end, other files are expecting that
 EXTRA_QMAKEVARS_POST += "DESTDIR=${S} "
diff --git a/classes/palmtop.bbclass b/classes/palmtop.bbclass
index b4bd21ab25..39b9bd2b60 100644
--- a/classes/palmtop.bbclass
+++ b/classes/palmtop.bbclass
@@ -17,4 +17,9 @@ EXTRA_QMAKEVARS_POST += '${@base_conditional("PALMTOP_USE_MULTITHREADED_QT", "ye
 EXTRA_QMAKEVARS_POST += "${@["LIBS+=-lqpe ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}"
 DEPENDS_prepend = "${@["virtual/libqpe1 uicmoc-native ", ""][(bb.data.getVar('PN', d, 1) == 'libqpe-opie')]}"
 
-FILES_${PN} = "${palmtopdir}"
+PACKAGES = "${PN}-dbg ${PN}-dev ${PN} ${PN}-doc ${PN}-locale"
+FILES_${PN} = " ${palmtopdir} "
+FILES_${PN}-dev += " ${palmtopdir}/lib/lib*.so "
+FILES_${PN}-dbg += " ${palmtopdir}/lib/.debug \
+                     ${palmtopdir}/bin/.debug \
+                     ${palmtopdir}/plugins/*/.debug "
diff --git a/classes/turbostation-image.bbclass b/classes/turbostation-image.bbclass
index e61ffc825b..5a0768c687 100644
--- a/classes/turbostation-image.bbclass
+++ b/classes/turbostation-image.bbclass
@@ -28,3 +28,5 @@ turbostation_pack_image() {
         rm -f $PADFILE
         ls -l $OUTPUT
 }
+
+IMAGE_POSTPROCESS_COMMAND += "turbostation_pack_image; "
diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf
index 7608e298ab..becad95786 100644
--- a/conf/distro/foonas.conf
+++ b/conf/distro/foonas.conf
@@ -1,64 +1,63 @@
 
-#
-# FooNAS distribution - a NAS-centric distribution
-# based on openprotium
-# 
-
+#@--------------------------------------------------------------------
+#@TYPE: Distribution
+#@NAME: foonas <http://www.foonas.org>
+#@DESCRIPTION: A nas-centric distribution
+#@MAINTAINER: Øyvind Repvik <repvik@foonas.org>
+#@--------------------------------------------------------------------
+
+FOONAS_MODE ?= "glibc"
+ANGSTROM_MODE = ${FOONAS_MODE}
+require conf/distro/angstrom-2007.1.conf
+
+DISTRO = "foonas"
 DISTRO_NAME = "foonas"
+DISTRO_VERSION = "1.0-dev"
+DISTRO_REVISION = "1"
+DISTRO_TYPE = "debug"
 
-# This is only changed for a release
-DISTRO_VERSION = ".dev-snapshot-${SRCDATE}"
-DISTRO_TYPE = "alpha"
-# These should be merged once the bogofeed change has been committed.
-FEED_URIS = "foonas-packages##http://ipkg.foonas.org/${MACHINE}/cross-${FOONAS_MODE}/1.0-dev/packages"
-FEED_URIS += "foonas-kernel##http://ipkg.foonas.org/${MACHINE}/cross-${FOONAS_MODE}/1.0-dev/kernel"
+DISTRO_FEATURES = "uboot redboot"
+DISTRO_FEATURES_n2100 += "raid"
+DISTRO_FEATURES_storcenter += "raid"
+DISTRO_FEATURES_lsppchd += "raid"
+DISTRO_FEATURES_lsppchg += "raid"
 
+ENABLE_BINARY_LOCALE_GENERATION = "0"
 HOTPLUG = "udev"
 
-# Various defines for Thecus N2100
-FOONAS_KERNEL_n2100 = "kernel-module-ext2 kernel-module-usb-storage"
-FOONAS_SUPPORT_n2100 += "fis"
-BOOTSTRAP_EXTRA_RDEPENDS_n2100 = "udev mdadm"
+# No room for debug apps on an NSLU2.
+DEBUG_APPS = ""
+
+FEED_URIS = "foonas##http://ipkg.foonas.org/${MACHINE}/cross-${FOONAS_MODE}/1.0-dev/"
 
 IMAGE_PREPROCESS_COMMAND += "sed -i -es,^id:5:initdefault:,id:3:initdefault:, ${IMAGE_ROOTFS}/etc/inittab;"
 IMAGE_PREPROCESS_COMMAND += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_ROOTFS}/etc/passwd;"
 IMAGE_PREPROCESS_COMMAND += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;"
+IMAGE_PREPROCESS_COMMAND += "rm -f ${IMAGE_ROOTFS}/boot/*"
+IMAGE_PREPROCESS_COMMAND += "rm -f ${IMAGE_ROOTFS}/usr/lib/ipkg/lists/*"
+IMAGE_POSTPROCESS_COMMAND += "${MACHINE}_pack_image;"
+IMAGE_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}"
 
-FOONAS_DEVICE_TABLE = "${@bb.which(bb.data.getVar('BBPATH', d, 1), 'files/device_table-slugos.txt')}"
-
-# Various defines for QNAP Turbostation
-FOONAS_KERNEL_turbostation = "kernel-module-ext3 kernel-module-minix \
-				kernel-module-usb-storage"
-FOONAS_SUPPORT_turbostation += "uboot-utils"
-BOOTSTRAP_EXTRA_RDEPENDS_turbostation = "udev mdadm"
-
-# Various defines for Linkstations
-FOONAS_KERNEL_lsppchg = "kernel-module-dm-mod kernel-module-raid1 \
-				 kernel-module-raid0 kernel-module-raid456 \
-				kernel-module-multipath"
-FOONAS_KERNEL_lsppchd = "${FOONAS_KERNEL_lsppchg}"
-FOONAS_SUPPORT_lsppchd = "uboot-utils dtc"
-FOONAS_SUPPORT_lsppchg = ${FOONAS_SUPPORT_lsppchd}
-IMAGE_FSTYPES_lsppchd = "tar.gz"
-IMAGE_FSTYPES_lsppchg = ${IMAGE_FSTYPES_lsppchd}
-
-FOONAS_KERNEL_storcenter = "kernel-module-dummy \
-                        kernel-module-af-packet "