merge of '87f4964e99b725f1fc7dfcdb6feb62a3b3b0cd12'

     and '9080aeaf22159dec40b83350bca564db5767774f'

7 files changed, 100 insertions, 12 deletions

diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index d6766bedbc..122bd44b34 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -8,7 +8,7 @@
 
 #DISTRO_VERSION = "2007.3"
 DISTRO_VERSION = "test-${DATE}"
-DISTRO_REVISION = "35"
+DISTRO_REVISION = "36"
 
 require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
@@ -35,6 +35,7 @@ FEED_ARCH ?= "${TARGET_ARCH}"
 
 FEED_ARCH_ep93xx 	= "armv4t"
 FEED_ARCH_h6300		= "armv4t"
+FEED_ARCH_fic-gta01     = "armv4t"
 
 #armv5t machines
 
@@ -259,3 +260,6 @@ DISTRO_EXTRA_RDEPENDS += "\
     ${DEBUG_APPS} \
     "
 
+DISTRO_EXTRA_RRECOMMENDS += " \
+    kernel-module-vfat \
+    "
diff --git a/conf/distro/foonas.conf b/conf/distro/foonas.conf
new file mode 100644
index 0000000000..6d5385c338
--- /dev/null
+++ b/conf/distro/foonas.conf
@@ -0,0 +1,67 @@
+#
+# FooNAS distribution - a NAS-centric distribution
+# based on openprotium
+# 
+
+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.foonas.org/${MACHINE}/cross/1.0-dev/packages"
+FEED_URIS += "foonas-kernel##http://ipkg.foonas.org/{MACHINE}/cross/1.0-dev/kernel"
+
+#
+# Naming schemes
+#
+INHERIT += "debian"
+
+#
+# Packaging and output format
+#
+INHERIT += "package_ipk"
+IMAGE_BASENAME = "foonas"
+IMAGE_FSTYPES = "jffs2"
+
+#
+# binutils and compilers
+#
+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/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.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
+#
+USE_NLS ?= "no"
+TARGET_OS = "linux"
+HOTPLUG = "udev"
+require conf/distro/include/sane-srcdates.inc
+
+CMDLINE_DEBUG = "noirqdebug"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index a89d193225..3edaa342cb 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -144,3 +144,8 @@ PREFERRED_VERSION_ipkg-native ?= "0.99.154"
 
 #FIXME: HACK: REMOVE THIS
 IGNORE_STRIP_ERRORS = ""
+
+# Due to upstream instability, and another OE project with conflicting
+# needs, nail down a specific, known-working version of madwifi-ng.
+# Remove this once the madwifi-ng stuff seems to stabilize once again.
+PREFERRED_VERSION_madwifi-ng ?= "r2156-20070225"
diff --git a/conf/distro/mokoslug.conf b/conf/distro/mokoslug.conf
index ea20fdd6b6..5598694397 100644
--- a/conf/distro/mokoslug.conf
+++ b/conf/distro/mokoslug.conf
@@ -14,9 +14,16 @@ DISTRO_VERSION = "1.0-alpha"
 DISTRO_REVISION = "1"
 DISTRO_TYPE = "debug"
 
+MACHINE_TASK_PROVIDER = "task-base task-mokogateway-everything"
+
+# Even though the NSLU2 does not have built-in bluetooth,
+# we assume that a MokoSlug gateway has a bluetooth dongle.
 MACHINE_FEATURES_append_nslu2 = " bluetooth"
 
-# No room for debug apps in 8MB.
-DEBUG_APPS = ""
+# No room for debug apps on an NSLU2.
+DEBUG_APPS_nslu2 = ""
+
+# No room for a kernel image on an NSLU2.
+IMAGE_PREPROCESS_COMMAND_append_nslu2 = "rm ${IMAGE_ROOTFS}/boot/zImage*;"
 
-INHERIT += "nslu2-image"
\ No newline at end of file
+INHERIT_append_nslu2 = "nslu2-image"
\ No newline at end of file
diff --git a/conf/documentation.conf b/conf/documentation.conf
index eec06daf7c..84533e69a1 100644
--- a/conf/documentation.conf
+++ b/conf/documentation.conf
@@ -122,6 +122,9 @@ SEPPUKU_QUERY[doc]    = "The query script of the bugzilla"
 SEPPUKU_NEWREPORT[doc]= "This is the url used to create a new bug report, note the defaults for version and priority and more, and the trailing &"
 #SEPPUKU_ADDCOMMENT     = "http://bugzilla.openmoko.org/cgi-bin/bugzilla/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&longdesclength=2&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Neo1973&target_milestone=Phase+0&"
 SEPPUKU_ADDCOMMENT[doc]= "The url used to reopen bug reports and to add another new comment"
+#SEPPUKU_ATTACHMENT = "http:/bugzilla.openmoko.org/cgi-bin/bugzilla/attachment.cgi"
+SEPPUKU_ATTACHMENT[doc] = "The url used to create attachments."
+
 
 #SEPPUKU_PRODUCT       = "OpenMoko"
 SEPPUKU_PRODUCT[doc]  = "The product inside the bugtracker"
diff --git a/conf/machine/fic-gta01.conf b/conf/machine/fic-gta01.conf
index f6b35d721b..5450c1ebd3 100644
--- a/conf/machine/fic-gta01.conf
+++ b/conf/machine/fic-gta01.conf
@@ -11,25 +11,26 @@ PREFERRED_PROVIDER_virtual/kernel = "linux-gta01"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost"
 
-MACHINE_EXTRA_RDEPENDS = ""
+MACHINE_EXTRA_RDEPENDS = "alsa-state"
 
 # package gta01 specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
   kernel-module-gta01-pm-bt  \
   kernel-module-gta01-pm-gps \
   kernel-module-gta01-pm-gsm \
-  kernel-module-gta01kbd "
+  kernel-module-gta01kbd \
+  alsa-state"
 
 MACHINE_TASK_PROVIDER = "task-base"
 
 # used by sysvinit_2
-SERIAL_CONSOLE = "115200 ttySAC0"
+#SERIAL_CONSOLE = "115200 ttySAC0"
 
 # used by some images
 ROOT_FLASH_SIZE = "60"
 
 # extra jffs2 tweaks
-EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad -n"
+EXTRA_IMAGECMD_jffs2 = "--eraseblock=0x4000 --pad=0x3C00000 -n"
 
 # build tools
 EXTRA_IMAGEDEPENDS += "sjf2410-linux-native"
diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf
index 7184958664..7f7d24c1e9 100644
--- a/conf/machine/turbostation.conf
+++ b/conf/machine/turbostation.conf
@@ -13,14 +13,15 @@ MACHINE_FEATURES= "kernel26 usbhost"
 PREFERRED_PROVIDER_virtual/kernel = "linux-turbostation"
 
 # Do we need any kernel modules?
-OPENPROTIUM_KERNEL = ""
+OPENTURBOSTATION_KERNEL = ""
 
 # We want udev support in the image
 udevdir = "/dev"
-OPENPROTIUM_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