4 files changed, 64 insertions, 24 deletions
diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf
index d21e5cfe6f..7608e298ab 100644
--- a/conf/distro/foonas.conf
+++ b/conf/distro/foonas.conf
@@ -10,10 +10,9 @@ DISTRO_NAME = "foonas"
 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/1.0-dev/packages"
-FEED_URIS += "foonas-kernel##http://ipkg.foonas.org/${MACHINE}/cross/1.0-dev/kernel"
+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"
 
-TARGET_OS = "linux"
 HOTPLUG = "udev"
 
 # Various defines for Thecus N2100
@@ -24,8 +23,8 @@ BOOTSTRAP_EXTRA_RDEPENDS_n2100 = "udev mdadm"
 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;"
-FOONAS_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 \
@@ -43,6 +42,10 @@ 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;'
 
 #
diff --git a/conf/distro/include/foonas-glibc.inc b/conf/distro/include/foonas-glibc.inc
new file mode 100644
index 0000000000..7ad71bf503
--- /dev/null
+++ b/conf/distro/include/foonas-glibc.inc
@@ -0,0 +1,23 @@
+# 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
new file mode 100644
index 0000000000..8315341b7e
--- /dev/null
+++ b/conf/distro/include/foonas-uclibc.inc
@@ -0,0 +1,22 @@
+# 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
index 189b932716..b904e15d5a 100644
--- a/conf/distro/include/foonas.inc
+++ b/conf/distro/include/foonas.inc
@@ -1,6 +1,17 @@
 #
 # 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"
@@ -12,20 +23,6 @@ PREFERRED_PROVIDER_virtual/powerpc-foonas-linux-libc-for-gcc = "glibc-intermedia
 #PREFERRED_PROVIDER_virtual/armeb-foonas-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
 #PREFERRED_PROVIDER_virtual/mipsel-foonas-linux-libc-for-gcc = "glibc-intermediate"
 
-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_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"
@@ -36,8 +33,6 @@ 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/libiconv = "glibc"
-PREFERRED_PROVIDER_virtual/libintl = "glibc"
 
 PREFERRED_PROVIDER_virtual/db = "db"
 PREFERRED_PROVIDER_virtual/db-native = "db-native"
@@ -53,8 +48,5 @@ 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"
-GLIBC_EXTRA_OECONF = "--with-tls"
-
-PREFERRED_VERSION_linux-libc-headers ?= "2.6.18"
-GLIBC_ADDONS ?= "ports,nptl,libidn"
 
+PREFERRED_VERSION_openlink = "svn"