merge of '67610d438a2b24071b341922d01602d41bf4da8f'

     and '7824a9c2a0a95d7eb46cd065355bda4d7a16780a'

7 files changed, 42 insertions, 9 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 0294eb981e..9f6814e526 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -169,6 +169,8 @@ DEPLOY_DIR_TAR = "${DEPLOY_DIR}/tar"
 DEPLOY_DIR_IPK = "${DEPLOY_DIR}/ipk"
 DEPLOY_DIR_RPM = "${DEPLOY_DIR}/rpm"
 DEPLOY_DIR_DEB = "${DEPLOY_DIR}/deb"
+DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images"
+DEPLOY_DIR_TOOLS = "${DEPLOY_DIR}/tools"
 
 ##################################################################
 # Kernel info.
@@ -181,10 +183,10 @@ STAGING_KERNEL_DIR = "${STAGING_DIR}/${HOST_SYS}/kernel"
 # Specific image creation and rootfs population info.
 ##################################################################
 
-DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images"
 IMAGE_ROOTFS = "${TMPDIR}/rootfs"
 IMAGE_BASENAME = "rootfs"
 IMAGE_NAME = "${IMAGE_BASENAME}-${MACHINE}-${DATETIME}"
+IMAGE_LINK_NAME = "${IMAGE_BASENAME}-${MACHINE}"
 IMAGE_CMD = ""
 IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --faketime \
 		   --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index e868ed581d..d6766bedbc 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 = "34"
+DISTRO_REVISION = "35"
 
 require conf/distro/include/angstrom.inc
 require conf/distro/include/sane-srcdates.inc
@@ -88,6 +88,8 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.16-hh9"
 PREFERRED_VERSION_linux-handhelds-2.6_h3900 ?= "2.6.19-hh13"
 PREFERRED_VERSION_linux-handhelds-2.6_htcuniversal ?= "2.6.19-hh13"
 
+PREFERRED_VERSION_file = "4.18"
+PREFERRED_VERSION_file_native = "4.18"
 
 SRCDATE_gconf-dbus = "20060719"
 SRCDATE_gnome-vfs-dbus = "20060803"
@@ -109,8 +111,7 @@ PREFERRED_PROVIDER_esound 		?= "pulseaudio"
 PREFERRED_VERSION_fontconfig = "2.4.1"
 PREFERRED_VERSION_freetype = "2.3.0"
 PREFERRED_VERSION_freetype-native = "2.2.1"
-#fix screen corruption issues
-PREFERRED_VERSION_cairo = "1.3.14"
+PREFERRED_VERSION_cairo = "1.4.0"
 
 #work around a segfault in gcc for armv4t
 PREFERRED_VERSION_glib-2.0_ep93xx = "2.12.3"
diff --git a/conf/distro/openprotium.conf b/conf/distro/openprotium.conf
index 56f08c48e0..928817d815 100644
--- a/conf/distro/openprotium.conf
+++ b/conf/distro/openprotium.conf
@@ -49,7 +49,6 @@ PREFERRED_VERSION_glibc-initial = "2.3.2"
 #
 USE_NLS ?= "no"
 TARGET_OS = "linux"
-TARGET_FPU = "hard"
 HOTPLUG = "udev"
 PREFERRED_PROVIDER_virtual/libiconv = "glibc"
 PREFERRED_PROVIDER_virtual/libintl = "glibc"
diff --git a/conf/documentation.conf b/conf/documentation.conf
index f5be55eb82..eec06daf7c 100644
--- a/conf/documentation.conf
+++ b/conf/documentation.conf
@@ -108,3 +108,22 @@ SOURCE_MIRROR_FETCH[doc] = "Switch marking build as source fetcher. Used to skip
 
 BBINCLUDELOGS[doc] = "Boolean switch to get log printed on failure."
 BBINCLUDELOGS_LINES[doc] = "Amount of log lines printed on failure."
+
+
+# seppuku bbclass
+SEPPUKU_AUTOBUILD[doc] = "This is an autobuild, broken packages are cleaned automatically. Don't define this at all if this is not an autobuild"
+SEPPUKU_USER[doc]     = "The login-name for the bugzilla account"
+SEPPUKU_PASS[doc]     = "The password for this account"
+#SEPPUKU_LOGIN         = "http://bugzilla.openmoko.org/cgi-bin/bugzilla/query.cgi?"
+SEPPUKU_LOGIN[doc]    = "path to the login script of the bugzilla, note the ? at the end"
+#SEPPUKU_QUERY         = "http://bugzilla.openmoko.org/cgi-bin/bugzilla/buglist.cgi"
+SEPPUKU_QUERY[doc]    = "The query script of the bugzilla"
+#SEPPUKU_NEWREPORT     = "http://bugzilla.openmoko.org/cgi-bin/bugzilla/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=unspecified&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Neo1973&"
+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_PRODUCT       = "OpenMoko"
+SEPPUKU_PRODUCT[doc]  = "The product inside the bugtracker"
+#SEPPUKU_COMPONENT     = "autobuilds"
+SEPPUKU_COMPONENT[doc]= "The component inside the bugtracker"
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index df00fbae37..02d54686f8 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -139,4 +139,4 @@ BBINCLUDELOGS = "yes"
 #CVS_TARBALL_STASH = ""
 
 # EDIT THIS FILE and then remove the line below before using!
-REMOVE_THIS_LINE:="${@oe.fatal('Read the comments in your conf/local.conf')}"
+REMOVE_THIS_LINE:="${@bb.fatal('Read the comments in your conf/local.conf')}"
diff --git a/conf/machine/storcenter.conf b/conf/machine/storcenter.conf
index 511d200deb..7463bc77d0 100644
--- a/conf/machine/storcenter.conf
+++ b/conf/machine/storcenter.conf
@@ -1,5 +1,6 @@
 TARGET_ARCH = "powerpc"
 TARGET_OS = "linux"
+TARGET_FPU = "hard"
 # TARGET_VENDOR = "oe"
 PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
 # terminal specs - console, but no other ports
diff --git a/conf/machine/turbostation.conf b/conf/machine/turbostation.conf
index d3952e1d4a..7184958664 100644
--- a/conf/machine/turbostation.conf
+++ b/conf/machine/turbostation.conf
@@ -1,15 +1,26 @@
 TARGET_ARCH = "powerpc"
 TARGET_OS = "linux"
-# TARGET_VENDOR = "oe"
+TARGET_FPU = "hard"
 PACKAGE_EXTRA_ARCHS = "ppc ppc603e"
+MACHINE_TASK_PROVIDER = "task-base"
+
 # terminal specs - console, but no other ports
 SERIAL_CONSOLE="115200 console"
 USE_VT="0"
 
 MODUTILS=26
-MACHINE_TASK_PROVIDER = "task-base"
 MACHINE_FEATURES= "kernel26 usbhost"
-BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm"
 PREFERRED_PROVIDER_virtual/kernel = "linux-turbostation"
 
+# Do we need any kernel modules?
+OPENPROTIUM_KERNEL = ""
+
+# We want udev support in the image
+udevdir = "/dev"
+OPENPROTIUM_SUPPORT ?= "diffutils cpio findutils uboot-utils udev"
+BOOTSTRAP_EXTRA_RDEPENDS = "udev mdadm"
+
+ROOT_FLASH_SIZE = 12
+# Hardware stuff
+ERASEBLOCK_SIZE = "0x20000"	
 require conf/machine/include/tune-ppc603e.conf