merge of '302d6092c09d8a1b6e5ada2cf66d444d001796b5'

     and '5075b3f69144c8ca977abda48869d41f724d1334'

13 files changed, 68 insertions, 163 deletions

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 "
-FOONAS_SUPPORT_storcenter = "uboot-utils"
-
-IMAGE_POSTPROCESS_COMMAND += '${MACHINE}_pack_image;'
+require conf/distro/include/sane-srcdates.inc                                                         
+PREFERRED_VERSION_openlink = "svn"
+PREFERRED_VERSION_dtc = "20070216"
+PREFERRED_VERSION_dtc-native = "20070216"
 
-#
-# Naming schemes
-#
-INHERIT += "debian"
 
+# 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"
 #
-# Packaging and output format
+# 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}
 #
+#FOONAS_KERNEL_storcenter = "kernel-module-dummy \
+#                        kernel-module-af-packet "
 
-INHERIT += "package_ipk"
-IMAGE_BASENAME = "foonas"
-
-require conf/distro/include/sane-srcdates.inc
-require conf/distro/include/foonas.inc
diff --git a/conf/distro/include/foonas-glibc.inc b/conf/distro/include/foonas-glibc.inc
deleted file mode 100644
index 7ad71bf503..0000000000
--- a/conf/distro/include/foonas-glibc.inc
+++ /dev/null
@@ -1,23 +0,0 @@
-# glibc:
-PREFERRED_PROVIDER_virtual/libiconv ?= "glibc"
-PREFERRED_PROVIDER_virtual/libintl ?= "glibc"
-PREFERRED_PROVIDER_virtual/libc ?= "glibc"
-
-TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
-
-#mess with compiler flags to use -Os instead of -O2
-#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
-# perl has some problems, see http://bugs.openembedded.org/show_bug.cgi?id=1616
-
-FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
-FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1"
-
-BUILD_OPTIMIZATION = "-Os"
-BUILD_OPTIMIZATION_pn-perl = "-O1"
-
-CXXFLAGS += "-fvisibility-inlines-hidden"
-
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.18"
-GLIBC_ADDONS ?= "ports,nptl,libidn"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
diff --git a/conf/distro/include/foonas-uclibc.inc b/conf/distro/include/foonas-uclibc.inc
deleted file mode 100644
index 8315341b7e..0000000000
--- a/conf/distro/include/foonas-uclibc.inc
+++ /dev/null
@@ -1,22 +0,0 @@
-# uclibc:
-#fix some iconv issues, needs to be adjusted when doing uclibc builds
-PREFERRED_PROVIDER_virtual/libc = "uclibc"
-PREFERRED_PROVIDER_virtual/libiconv ?= "libiconv"
-PREFERRED_PROVIDER_virtual/libintl ?= "gettext"
-
-USE_NLS ?= "no"
-
-TARGET_OS = "linux${@['-uclibc','-uclibcgnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb']]}"
-
-#mess with compiler flags to use -Os instead of -O2
-#Please see http://free-electrons.com/doc/embedded_linux_optimizations/img47.html for some more info
-FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -Os"
-BUILD_OPTIMIZATION = "-Os"
-CXXFLAGS += "-fvisibility-inlines-hidden"
-
-SRCDATE_uclibc ?= "20070320"
-PREFERRED_VERSION_uclibc ?= "0.9.28+svn${SRCDATE_uclibc}"
-PREFERRED_VERSION_uclibc-initial ?= "0.9.28+svn${SRCDATE_uclibc}"
-
-PREFERRED_VERSION_linux-libc-headers    = "2.6.18"
-#PREFERRED_VERSION_linux-libc-headers_powerpc = "2.6.15.99"
\ No newline at end of file
diff --git a/conf/distro/include/foonas.inc b/conf/distro/include/foonas.inc
deleted file mode 100644
index ad020b8501..0000000000
--- a/conf/distro/include/foonas.inc
+++ /dev/null
@@ -1,54 +0,0 @@
-#
-# binutils and compilers
-#
-# Can be "glibc" and "uclibc"
-FOONAS_MODE ?= "glibc"
-
-#DEPLOY_DIR = "${TMPDIR}/deploy/${FOONAS_MODE}"
-require conf/distro/include/foonas-${FOONAS_MODE}.inc
-
-INHERIT += "package_ipk debian sanity devshell"
-
-#Generate locales on the buildsystem instead of on the target. Speeds up first boot, set to "1" to enable
-PREFERRED_PROVIDER_qemu-native = "qemu-native"
-ENABLE_BINARY_LOCALE_GENERATION ?= "0"
-
-PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/arm-linux-libc-for-gcc = "glibc-intermediate"
-PREFERRED_PROVIDER_virtual/powerpc-foonas-linux-libc-for-gcc = "glibc-intermediate"
-
-# not used yet
-#PREFERRED_PROVIDER_virtual/armeb-linux-libc-for-gcc = "glibc-intermediate"
-#PREFERRED_PROVIDER_virtual/armeb-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
-#PREFERRED_PROVIDER_virtual/mipsel-foonas-linux-libc-for-gcc = "glibc-intermediate"
-
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc-initial:gcc-cross-initial"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}gcc:gcc-cross"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}g++:gcc-cross"
-#conflict between this and the last below.
-#PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc"
-# Select 2.6 versions of the depmod support
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
-PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}libc-for-gcc:glibc-intermediate"
-
-PREFERRED_PROVIDER_virtual/libx11 = "libx11"
-
-PREFERRED_PROVIDER_virtual/db = "db"
-PREFERRED_PROVIDER_virtual/db-native = "db-native"
-
-PREFERRED_VERSION_binutils = "2.17.50.0.12"
-PREFERRED_VERSION_binutils-cross = "2.17.50.0.12"
-
-PREFERRED_VERSION_gcc = "4.1.1"
-PREFERRED_VERSION_gcc-cross = "4.1.1"
-PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.1"
-PREFERRED_VERSION_gcc-cross-initial = "4.1.1"
-
-PREFERRED_VERSION_glibc = "2.5"
-PREFERRED_VERSION_glibc-intermediate = "2.5"
-PREFERRED_VERSION_glibc-initial = "2.5"
-
-PREFERRED_VERSION_openlink = "svn"
-PREFERRED_VERSION_dtc = "20070216"
-PREFERRED_VERSION_dtc-native = "20070216"
diff --git a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
index fa1edcc64c..ea5d6b1153 100644
--- a/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
+++ b/conf/distro/include/preferred-opie-versions-1.2.3-pre.inc
@@ -3,7 +3,7 @@
 QTE_VERSION ?= "2.3.10"
 PALMTOP_USE_MULTITHREADED_QT ?= "yes"
 
-OPIE_SRCDATE ?= "20070308"
+OPIE_SRCDATE ?= "20070328"
 OPIE_VERSION ?= "1.2.2+cvs${OPIE_SRCDATE}"
 OPIE_CVS_PV ?= "1.2.2+cvs${OPIE_SRCDATE}"
 
diff --git a/conf/distro/include/sane-srcdates.inc b/conf/distro/include/sane-srcdates.inc
index 7b888b9d5f..eef4c4d06f 100644
--- a/conf/distro/include/sane-srcdates.inc
+++ b/conf/distro/include/sane-srcdates.inc
@@ -36,7 +36,7 @@ SRCDATE_matchbox-themes-extra ?= "20060612"
 SRCDATE_matchbox-wm ?= "20060612"
 SRCDATE_libmatchbox ?= "20060612"
 SRCDATE_libfakekey ?= "20051101"
-SRCDATE_psplash ?= "20061207"
+SRCDATE_psplash ?= "20070330"
 SRCDATE_web ?= "20060613"
 SRCDATE_zaurusd ?= "20060628"
 
diff --git a/conf/distro/openzaurus-3.5.5.conf b/conf/distro/openzaurus-3.5.5.conf
index b5dba1ffed..42ae98fab1 100644
--- a/conf/distro/openzaurus-3.5.5.conf
+++ b/conf/distro/openzaurus-3.5.5.conf
@@ -140,6 +140,8 @@ PREFERRED_VERSION_wpa-supplicant = "0.5.7"
 PREFERRED_VERSION_hostap-utils ?= "0.4.7"
 PREFERRED_VERSION_hostap-modules ?= "0.4.7"
 
+PREFERRED_VERSION_gtk-engines ?= "2.6.5"
+
 #
 # We do not use qte-mt to keep compatibility with older OZ
 #
diff --git a/conf/machine/include/linkstationppc.conf b/conf/machine/include/lsppc.conf
index 620a6931eb..ad94a0f029 100644
--- a/conf/machine/include/linkstationppc.conf
+++ b/conf/machine/include/lsppc.conf
@@ -5,13 +5,13 @@
 
 TARGET_ARCH = "powerpc"
 PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
-MACHINE_FEATURES = "kernel26 usbhost ext2"
+MACHINE_FEATURES = "kernel26 usbhost ext2 pci uboot"
 TARGET_FPU = "hard"
+MACHINE_TASK_PROVIDER = "task-base"
 
 USE_DEVFS = "0"
 
 BOOTSTRAP_EXTRA_RDEPENDS = "udev module-init-tools kernel-modules"
-FEED_URIS = "openlink##http://ipkg.linkstationwiki.net/2007.1/powerpc/"
 PREFERRED_PROVIDER_virtual/kernel = "linux-linkstationppc"
 
 #don't try to access tty1
@@ -20,7 +20,7 @@ USE_VT = "0"
 HOTPLUG = "udev"
 udevdir = "/dev"
 
-IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
+IMAGE_FSTYPES = "tar.gz"
 
 #tune for the MPC5200B cpu
 require conf/machine/include/tune-ppc603e.conf
diff --git a/conf/machine/lsppchd.conf b/conf/machine/lsppchd.conf
index 51d0186dbe..bf59929b02 100644
--- a/conf/machine/lsppchd.conf
+++ b/conf/machine/lsppchd.conf
@@ -1,8 +1,6 @@
 #@TYPE: Machine
 #@NAME: HD Linkstation
 #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HD
-
 UBOOT_MACHINE = "linkstation_HDLAN"
 IMAGE_FSTYPES = "tar.gz"
-
-require conf/machine/include/linkstationppc.conf
+require conf/machine/include/lsppc.conf
\ No newline at end of file
diff --git a/conf/machine/lsppchg.conf b/conf/machine/lsppchg.conf
index 516a3aaa98..6040010176 100644
--- a/conf/machine/lsppchg.conf
+++ b/conf/machine/lsppchg.conf
@@ -1,8 +1,6 @@
 #@TYPE: Machine
 #@NAME: HG Linkstation
 #@DESCRIPTION: Machine configuration for the Buffalo Linkstation HG
-
 UBOOT_MACHINE = "linkstation_HGLAN"
 IMAGE_FSTYPES = "tar.gz"
-
-require conf/machine/include/linkstationppc.conf
+require conf/machine/include/lsppc.conf
\ No newline at end of file
diff --git a/conf/machine/n2100.conf b/conf/machine/n2100.conf
index c84bf352da..2acfe812b0 100644
--- a/conf/machine/n2100.conf
+++ b/conf/machine/n2100.conf
@@ -3,11 +3,13 @@ TARGET_OS = "linux"
 TARGET_FPU = "soft"
 PACKAGE_EXTRA_ARCHS = "armv4 armv4t armv5e armv5te"
 
+INHERIT += "n2100-image"
+
 SERIAL_CONSOLE="115200 console"
 USE_VT="0"
 
 MODUTILS=26
-MACHINE_FEATURES= "kernel26 usbhost pci ext2"
+MACHINE_FEATURES= "kernel26 usbhost pci ext2 redboot"
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux = "2.6.20"
 MACHINE_TASK_PROVIDER = "task-base"
diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf
index bb7c8f1bef..ea59349c07 100644
--- a/conf/machine/storcenter.conf
+++ b/conf/machine/storcenter.conf
@@ -2,14 +2,15 @@ TARGET_ARCH = "powerpc"
 TARGET_OS = "linux"
 TARGET_FPU = "hard"
 PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
-MACHINE_TASK_PROVIDER = "task-base"
+
+INHERIT += "storcenter-image"
 
 # terminal specs - console, but no other ports
 SERIAL_CONSOLE="115200 console"
 USE_VT="0"
 
 MODUTILS=26
-MACHINE_FEATURES= "kernel26 usbhost pci ext2"
+MACHINE_FEATURES= "kernel26 usbhost pci ext2 uboot"
 PREFERRED_PROVIDER_virtual/kernel = "linux-storcenter"
 MACHINE_TASK_PROVIDER = "task-base"
 
diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf
index ffa44207cd..2c1a9d70b5 100644
--- a/conf/machine/turbostation.conf
+++ b/conf/machine/turbostation.conf
@@ -2,14 +2,18 @@ TARGET_ARCH = "powerpc"
 TARGET_OS = "linux"
 TARGET_FPU = "hard"
 PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
-MACHINE_TASK_PROVIDER = "task-base"
+
+INHERIT += "turbostation-image"
 
 # terminal specs - console, but no other ports
 SERIAL_CONSOLE="115200 console"
 USE_VT="0"
 
 MODUTILS=26
-MACHINE_FEATURES= "kernel26 usbhost pci ext2"
+MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot"
+UBOOT_MACHINE = "qnap_config"
+PREFERRED_VERSION_u-boot = "1.2.0"
+
 PREFERRED_PROVIDER_virtual/kernel = "linux-turbostation"
 MACHINE_TASK_PROVIDER = "task-base"