remove openturbostation distro, add foonas

2 files changed, 24 insertions, 26 deletions

diff --git a/conf/distro/openturbostation.conf b/conf/distro/foonas.conf
index 0983f337d3..10ee7acf9d 100644
--- a/conf/distro/openturbostation.conf
+++ b/conf/distro/foonas.conf
@@ -1,9 +1,16 @@
 #
-# Open TurboStation distribution - based on openprotium
+# FooNAS distribution - a NAS-centric distribution
+# based on openprotium
 # 
-DISTRO_NAME = "openturbostation"
+
+DISTRO_NAME = "foonas"
+
+# 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.kynisk.com/foonas/${MACHINE}/cross/1.0-dev/packages"
+FEED_URIS += "foonas-kernel##http://ipkg.kynisk.com/foonas/{MACHINE}/cross/1.0-dev/kernel"
 
 #
 # Naming schemes
@@ -14,11 +21,8 @@ INHERIT += "debian"
 # Packaging and output format
 #
 INHERIT += "package_ipk"
-IMAGE_BASENAME = "openturbostation"
+IMAGE_BASENAME = "foonas"
 IMAGE_FSTYPES = "jffs2"
-FEED_URIS = "openturbostation-packages##http://ipkg.kynisk.com/opents/cross/1.0-dev/packages"
-FEED_URIS += "openturbostation-kernel##http://ipkg.kynisk.com/opents/cross/1.0-dev/kernel"
-# For protium on the turbostation
 
 #
 # binutils and compilers
@@ -33,38 +37,31 @@ 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"
 
 PREFERRED_VERSION_binutils = "2.16"
 PREFERRED_VERSION_binutils-cross = "2.16"
 
 PREFERRED_VERSION_gcc = "4.1.2"
-PREFERRED_VERSION_gcc-cross = "4.1.2"
-PREFERRED_VERSION_gcc-cross-initial = "4.1.2"
+PREFERRED_VERSION_gcc-cross = "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.3.2"
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
 
 # 
-# Target OS & FPU system
+# Target OS
 #
 USE_NLS ?= "no"
 TARGET_OS = "linux"
 HOTPLUG = "udev"
-PREFERRED_PROVIDER_virtual/libiconv = "glibc"
-PREFERRED_PROVIDER_virtual/libintl = "glibc"
-
-#
-# Bootstrap & Init
-#
-#PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
 require conf/distro/include/sane-srcdates.inc
-#
-#
-# Ensure consistency across all SlugOS builds for the provider of a
-# relational database - use the latest version of the SleepyCat
-# Berkeley database
-PREFERRED_PROVIDER_virtual/db = "db"
-PREFERRED_PROVIDER_virtual/db-native = "db-native"
 
 CMDLINE_DEBUG = "noirqdebug"
diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf
index b25061db21..7f7d24c1e9 100644
--- a/conf/machine/turbostation.conf
+++ b/conf/machine/turbostation.conf
@@ -17,10 +17,11 @@ OPENTURBOSTATION_KERNEL = ""
 
 # We want udev support in the image
 udevdir = "/dev"
-TURBOSTATION_SUPPORT ?= "diffutils cpio findutils uboot-utils udev"
+TURBOSTATION_SUPPORT ?= "cpio uboot-utils udev"
 BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm"
 
-ROOT_FLASH_SIZE = 12
-# Hardware stuff
+# Hardware stuff used in image generation
 ERASEBLOCK_SIZE = "0x20000"	
+JFFS2_ROOTFS_SIZE = "0xC80000"
+KERNEL_IMAGE_SIZE = "0x280000"
 require conf/machine/include/tune-ppc603e.conf