31 files changed, 51 insertions, 115 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
diff --git a/packages/openturbostation-init/.mtn2git_empty b/packages/foonas-init/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/openturbostation-init/.mtn2git_empty
+++ b/packages/foonas-init/.mtn2git_empty
diff --git a/packages/openturbostation-init/files/.mtn2git_empty b/packages/foonas-init/files/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/openturbostation-init/files/.mtn2git_empty
+++ b/packages/foonas-init/files/.mtn2git_empty
diff --git a/packages/openturbostation-init/files/boot/.mtn2git_empty b/packages/foonas-init/files/boot/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/openturbostation-init/files/boot/.mtn2git_empty
+++ b/packages/foonas-init/files/boot/.mtn2git_empty
diff --git a/packages/openturbostation-init/files/boot/disk b/packages/foonas-init/files/boot/disk
index b4bbaf1f3c..b4bbaf1f3c 100644
--- a/packages/openturbostation-init/files/boot/disk
+++ b/packages/foonas-init/files/boot/disk
diff --git a/packages/openturbostation-init/files/boot/flash b/packages/foonas-init/files/boot/flash
index 40f64c9701..40f64c9701 100644
--- a/packages/openturbostation-init/files/boot/flash
+++ b/packages/foonas-init/files/boot/flash
diff --git a/packages/openturbostation-init/files/boot/network b/packages/foonas-init/files/boot/network
index 599250e744..599250e744 100644
--- a/packages/openturbostation-init/files/boot/network
+++ b/packages/foonas-init/files/boot/network
diff --git a/packages/openturbostation-init/files/boot/nfs b/packages/foonas-init/files/boot/nfs
index 7cfce66cbb..7cfce66cbb 100644
--- a/packages/openturbostation-init/files/boot/nfs
+++ b/packages/foonas-init/files/boot/nfs
diff --git a/packages/openturbostation-init/files/boot/udhcpc.script b/packages/foonas-init/files/boot/udhcpc.script
index 3f437e3143..3f437e3143 100644
--- a/packages/openturbostation-init/files/boot/udhcpc.script
+++ b/packages/foonas-init/files/boot/udhcpc.script
diff --git a/packages/openturbostation-init/files/conffiles b/packages/foonas-init/files/conffiles
index e1408a3227..e1408a3227 100644
--- a/packages/openturbostation-init/files/conffiles
+++ b/packages/foonas-init/files/conffiles
diff --git a/packages/openturbostation-init/files/functions b/packages/foonas-init/files/functions
index 2108288ab5..2108288ab5 100644
--- a/packages/openturbostation-init/files/functions
+++ b/packages/foonas-init/files/functions
diff --git a/packages/openturbostation-init/files/initscripts/.mtn2git_empty b/packages/foonas-init/files/initscripts/.mtn2git_empty
index e69de29bb2..e69de29bb2 100644
--- a/packages/openturbostation-init/files/initscripts/.mtn2git_empty
+++ b/packages/foonas-init/files/initscripts/.mtn2git_empty
diff --git a/packages/openturbostation-init/files/initscripts/fixfstab b/packages/foonas-init/files/initscripts/fixfstab
index 67116a12fd..67116a12fd 100644
--- a/packages/openturbostation-init/files/initscripts/fixfstab
+++ b/packages/foonas-init/files/initscripts/fixfstab
diff --git a/packages/openturbostation-init/files/initscripts/loadmodules.sh b/packages/foonas-init/files/initscripts/loadmodules.sh
index c5d44d1067..c5d44d1067 100644
--- a/packages/openturbostation-init/files/initscripts/loadmodules.sh
+++ b/packages/foonas-init/files/initscripts/loadmodules.sh
diff --git a/packages/openturbostation-init/files/initscripts/rmrecovery b/packages/foonas-init/files/initscripts/rmrecovery
index eec822b154..eec822b154 100644
--- a/packages/openturbostation-init/files/initscripts/rmrecovery
+++ b/packages/foonas-init/files/initscripts/rmrecovery
diff --git a/packages/openturbostation-init/files/initscripts/sysconfsetup b/packages/foonas-init/files/initscripts/sysconfsetup
index a4f9074d9c..a4f9074d9c 100644
--- a/packages/openturbostation-init/files/initscripts/sysconfsetup
+++ b/packages/foonas-init/files/initscripts/sysconfsetup
diff --git a/packages/openturbostation-init/files/initscripts/syslog.buffer b/packages/foonas-init/files/initscripts/syslog.buffer
index 9285c02946..9285c02946 100644
--- a/packages/openturbostation-init/files/initscripts/syslog.buffer
+++ b/packages/foonas-init/files/initscripts/syslog.buffer
diff --git a/packages/openturbostation-init/files/initscripts/syslog.file b/packages/foonas-init/files/initscripts/syslog.file
index 80ee5f0174..80ee5f0174 100644
--- a/packages/openturbostation-init/files/initscripts/syslog.file
+++ b/packages/foonas-init/files/initscripts/syslog.file
diff --git a/packages/openturbostation-init/files/initscripts/syslog.network b/packages/foonas-init/files/initscripts/syslog.network
index 3d7f4ab8e6..3d7f4ab8e6 100644
--- a/packages/openturbostation-init/files/initscripts/syslog.network
+++ b/packages/foonas-init/files/initscripts/syslog.network
diff --git a/packages/openturbostation-init/files/initscripts/umountinitrd.sh b/packages/foonas-init/files/initscripts/umountinitrd.sh
index b590ae68b5..b590ae68b5 100644
--- a/packages/openturbostation-init/files/initscripts/umountinitrd.sh
+++ b/packages/foonas-init/files/initscripts/umountinitrd.sh
diff --git a/packages/openturbostation-init/files/links.conf b/packages/foonas-init/files/links.conf
index fdd1f3ce23..fdd1f3ce23 100644
--- a/packages/openturbostation-init/files/links.conf
+++ b/packages/foonas-init/files/links.conf
diff --git a/packages/openturbostation-init/files/modulefunctions b/packages/foonas-init/files/modulefunctions
index 430e376ad8..430e376ad8 100644
--- a/packages/openturbostation-init/files/modulefunctions
+++ b/packages/foonas-init/files/modulefunctions
diff --git a/packages/openturbostation-init/files/reflash b/packages/foonas-init/files/reflash
index f2947822f6..f2947822f6 100644
--- a/packages/openturbostation-init/files/reflash
+++ b/packages/foonas-init/files/reflash
diff --git a/packages/openturbostation-init/files/sysconf b/packages/foonas-init/files/sysconf
index 8866c076b8..8866c076b8 100644
--- a/packages/openturbostation-init/files/sysconf
+++ b/packages/foonas-init/files/sysconf
diff --git a/packages/openturbostation-init/files/turnup b/packages/foonas-init/files/turnup
index 73befd26c9..73befd26c9 100644
--- a/packages/openturbostation-init/files/turnup
+++ b/packages/foonas-init/files/turnup
diff --git a/packages/openturbostation-init/openturbostation-init_0.10.bb b/packages/foonas-init/foonas-init_0.10.bb
index 91a690224d..80166793a5 100644
--- a/packages/openturbostation-init/openturbostation-init_0.10.bb
+++ b/packages/foonas-init/foonas-init_0.10.bb
@@ -1,10 +1,10 @@
-DESCRIPTION = "Turbostation initial boot and config"
+DESCRIPTION = "FooNAS initial boot and config"
 SECTION = "base"
 PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r71"
+PR = "r0"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \
@@ -110,14 +110,10 @@ do_install() {
 	set +ex
 }
 
-# If the package is installed on an NSLU2 $D will be empty, in that
-# case it is normal to run 'start' and 'stop', but because the conf
-# files installed don't actually start or stop anything this is
-# unnecessary, so the package postfoo handling is simplified here.
-#NB: do not use '08' (etc) for the first argument after start/stop,
+# NB: do not use '08' (etc) for the first argument after start/stop,
 # the value is interpreted as an octal number if there is a leading
 # zero.
-pkg_postinst_openturbostation-init() {
+pkg_postinst_foonas-init() {
 	opt=
 	test -n "$D" && opt="-r $D"
 	update-rc.d $opt hwclock.sh		start  8 S . start 45 0 6 .
@@ -131,7 +127,7 @@ pkg_postinst_openturbostation-init() {
 	update-rc.d $opt rmrecovery             start 99 1 2 3 4 5 .
 }
 
-pkg_postrm_openturbostation-init() {
+pkg_postrm_foonas-init() {
 	opt=
 	test -n "$D" && opt="-r $D"
 	for s in ${INITSCRIPTS}
diff --git a/packages/images/openturbostation-image.bb b/packages/images/foonas-image.bb
index 512a15441a..f5a258b3d9 100644
--- a/packages/images/openturbostation-image.bb
+++ b/packages/images/foonas-image.bb
@@ -1,16 +1,11 @@
-DESCRIPTION = "Turbostation image"
-HOMEPAGE = "http://www.kynisk.com/opents"
-LICENSE = "MIT"
+DESCRIPTION = "Foonas image"
+LICENSE = "GPL"
 PR = "r0"
 
 DEPENDS = "${MACHINE_TASK_PROVIDER}"
 EXTRA_IMAGECMD_jffs2 = "--big-endian --eraseblock=${ERASEBLOCK_SIZE} -D ${SLUGOS_DEVICE_TABLE}"
 IMAGE_LINGUAS = ""
 
-# Setting USE_DEVFS prevents *any* entries being created initially
-# in /dev
-#USE_DEVFS = "1"
-
 # This is passed to the image command to build the correct /dev
 # directory (because only the image program can make actual
 # dev entries!)
@@ -29,55 +24,25 @@ IMAGE_PREPROCESS_COMMAND += "sed -i -es,^root::0,root:BTMzOOAQfESg6:0, ${IMAGE_R
 IMAGE_PREPROCESS_COMMAND += "sed -i -es,^VERBOSE=no,VERBOSE=very, ${IMAGE_ROOTFS}/etc/default/rcS;"
 
 # Always just make a new flash image.
-PACK_IMAGE = 'turbostation_pack_image;'
+PACK_IMAGE = '${MACHINE}_pack_image;'
 IMAGE_POSTPROCESS_COMMAND += "${PACK_IMAGE}"
 PACK_IMAGE_DEPENDS = ""
 #EXTRA_IMAGEDEPENDS += "${PACK_IMAGE_DEPENDS}"
 
-# This hack removes '${MACHINE}' from the end of the arch.conf for ipk,
-# preventing _mach.ipk (with no byte sex) taking precedence over everything
-# else.
-# but we want 'storcenter' in there so kernel modules work correctly.
-#
-#ROOTFS_POSTPROCESS_COMMAND += "sed -i '$d' '${IMAGE_ROOTFS}/etc/ipkg/arch.conf';"
-
 # These depends define native utilities - they do not get put in the flash and
 # are not required to build the image.
 IMAGE_TOOLS = ""
 #EXTRA_IMAGEDEPENDS += "${IMAGE_TOOLS}"
-OPENTURBOSTATION_KERNEL = ""
 
-# CONFIG:
-# SLUGOS_EXTRA_RDEPENDS: set in conf, things to add to the image
-# SLUGOS_SUPPORT:        set to here, see below, added to the image.
-# SLUGOS_KERNEL:         set here, kernel modules added to the image
-#
-# Do not override the last two unless you really know what you
-# are doing - there is more information below.
-
-# 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 slugos builds.
-#
-# udev is the default way of handling devices, there is no guarantee
-# that the static device table is completely correct (it is just
-# known to be sufficient for boot.)
-# we'ere still on 2.6.12 devfs....
-#OPENPROTIUM_SUPPORT ?= "diffutils cpio findutils udev"
-#
-OPENTURBOSTATION_SUPPORT ?= "diffutils cpio findutils uboot-utils udev"
-
-# kernel-module-af-packet must be in the image for DHCP to work
-# kernel-module-netconsole is here because it is small and is
-# highly useful on minimal systems (which really don't have anywhere
-# other than the network to output error messages!)
+FOONAS_SUPPORT += "diffutils cpio findutils uboot-utils udev"
 
 # this gets /lib/modules made....
+FOONAS_KERNEL = "kernel-module-ext3 kernel-module-minix \
+			kernel-module-usb-storage"
 
 RDEPENDS = " \
 	base-files base-passwd netbase \
-        busybox initscripts-openturbostation openturbostation-init \
+        busybox initscripts foonas-init \
         update-modules sysvinit tinylogin \
 	module-init-tools-depmod modutils-initscripts \
         ipkg-collateral ipkg ipkg-link \
@@ -88,15 +53,16 @@ RDEPENDS = " \
 	mdadm \
 	hdparm \
 	mtd-utils \
-	xfsprogs \
 	udev \
-	${OPENTURBOSTATION_SUPPORT} \
-	${OPENTURBOSTATION_KERNEL} "
+	${FOONAS_SUPPORT} \
+	${FOONAS_KERNEL} "
 
 PACKAGE_INSTALL = "${RDEPENDS}"
 
 inherit image
 
+# At this point you have to make a ${MACHINE}_pack_image for your machine.
+
 turbostation_pack_image() {
 	# find latest kernel
 	KERNEL=`ls -tr ${DEPLOY_DIR_IMAGE}/uImage* | tail -1`
diff --git a/packages/images/openprotium-image.bb b/packages/images/openprotium-image.bb
index 472000f4f0..25d38cf1c3 100644
--- a/packages/images/openprotium-image.bb
+++ b/packages/images/openprotium-image.bb
@@ -83,7 +83,7 @@ RDEPENDS = " \
 	kernel base-files base-passwd netbase \
         busybox initscripts-openprotium openprotium-init \
         update-modules sysvinit tinylogin \
-	module-init-tools modutils-initscripts \
+	module-init-tools-depmod modutils-initscripts \
         ipkg-collateral ipkg ipkg-link \
 	libgcc1 \
 	portmap \
@@ -92,11 +92,6 @@ RDEPENDS = " \
 	mdadm \
 	hdparm \
 	mtd-utils \
-	sccd \
-	util-linux-mount \
-	util-linux-umount \
-	util-linux-swaponoff \
-	util-linux-losetup \
 	${OPENPROTIUM_SUPPORT} \
 	${OPENPROTIUM_KERNEL} "
 #	${SLUGOS_EXTRA_RDEPENDS}"
diff --git a/packages/linux/linux-turbostation_2.6.20.1.bb b/packages/linux/linux-turbostation_2.6.20.1.bb
index a82833ac24..a74bf1475a 100644
--- a/packages/linux/linux-turbostation_2.6.20.1.bb
+++ b/packages/linux/linux-turbostation_2.6.20.1.bb
@@ -4,29 +4,10 @@ LICENSE = "GPL"
 DEPENDS = "uboot-utils"
 PR = "r6"
 
-# notes on iom def kernel:
-#
-# can probably remove :
-# BLK_DEV_RAM ?
-# MD_RAID5
-# QUOTA
-# QFMT_V2
-# DNOTIFY?
-# MSDOS_FS, VFAT_FS, NTFS_FS?
-#
-# USB_GADGET? - USB_GADGET_NET2280, USB_ETH, USB_ETH_RNDIS
-#
-#
-# should add:
-#   EXT3_FS
-#   PACKET_MMAP ?
-#   i2c_chardev?
-# usb audio:
-#   USB_EMI62?
-#   USB_EMI26?
-
 COMPATIBLE_MACHINE = "turbostation"
 
+RDEPENDS_kernel-module-zd1211rw += "zd1211-firmware"
+
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
 	file://001_r1000.diff;patch=1 \
 	file://linux-2.6.16_arch_ppc_platforms_sandpoint.h;patch=1 \
diff --git a/packages/meta/openturbostation-packages.bb b/packages/meta/foonas-packages.bb
index 21c492fb0c..822b7afb2d 100644
--- a/packages/meta/openturbostation-packages.bb
+++ b/packages/meta/foonas-packages.bb
@@ -1,14 +1,14 @@
-DESCRIPTION = "Packages that are compatible with Openturbostation"
+DESCRIPTION = "Packages that are compatible with FooNAS"
 LICENSE = "MIT"
 PR = "r1"
 CONFLICTS = "db3"
-PROVIDES += "${OPENTURBOSTATION_IMAGENAME}-packages"
+PROVIDES += "${FOONAS_IMAGENAME}-packages"
 
 EXCLUDE_FROM_WORLD = "1"
 INHIBIT_DEFAULT_DEPS = "1"
 ALLOW_EMPTY = "1"
 
-OPENTURBOSTATION_PACKAGES = "\
+FOONAS_PACKAGES = "\
 	alsa-lib \
 	alsa-utils \
 	apache2 \
@@ -127,18 +127,18 @@ OPENTURBOSTATION_PACKAGES = "\
 	vlan \
 	watchdog \
 	wget \
+	wireless-tools \
 	zip \
 	zlib \
 	"
 
-OPENTURBOSTATION_EXTRA_PACKAGES ?= ""
+FOONAS_EXTRA_PACKAGES ?= ""
 
 # The package-index at the end causes regeneration of the Packages.gz and
 # other control files.
-# openprotium-native \
 DEPENDS = "\
-	openturbostation-image \
-	${OPENTURBOSTATION_PACKAGES} \
-	${OPENTURBOSTATION_EXTRA_PACKAGES} \
+	foonas-image \
+	${FOONAS_PACKAGES} \
+	${FOONAS_EXTRA_PACKAGES} \
 	package-index \
 	"