6 files changed, 56 insertions, 3 deletions
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index d0e732bcc9..6d5d84a794 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -220,8 +220,6 @@ PREFERRED_VERSION_linux-handhelds-2.6               ?= "2.6.21-hh12"
 RDEPENDS_kernel-base_hx4700 = ""
 RDEPENDS_kernel-base_htcuniversal = ""
 
-PREFERRED_VERSION_linux_at91sam9263ek               ?= "2.6.20"
-
 # Needed for crappy ipaqs with broken hostap in the kernel
 PREFERRED_VERSION_hostap-modules                    ?= "0.4.7"
 PREFERRED_VERSION_hostap-utils                      ?= "0.4.7"
@@ -249,6 +247,8 @@ PREFERRED_VERSION_osb-jscore       = "0.5.2+svn${SRCDATE}"
 PREFERRED_VERSION_osb-nrcit        = "0.5.2+svn${SRCDATE}"
 PREFERRED_VERSION_osb-nrcore       = "0.5.2+svn${SRCDATE}"
 
+PREFERRED_PROVIDER_avahi = "avahi"
+
 #Small machines prefer kdrive, but we might ship full Xorg in other images
 PREFERRED_PROVIDER_virtual/xserver  ?= "xserver-kdrive"
 PREFERRED_PROVIDER_xserver          ?= "xserver-kdrive"
diff --git a/conf/distro/include/angstrom.inc b/conf/distro/include/angstrom.inc
index 3b859a9d04..7d364a5ee0 100644
--- a/conf/distro/include/angstrom.inc
+++ b/conf/distro/include/angstrom.inc
@@ -210,6 +210,53 @@ DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
 # Angstrom *always* has some form of release config, so error out if someone thinks he knows better 
 DISTRO_CHECK := "${@bb.data.getVar("DISTRO_VERSION",d,1) or bb.fatal('Remove this line or set a dummy DISTRO_VERSION if you really want to build an unversioned distro')}"
 
+
+# Configuration for tinderbox, so people only need:
+# INHERIT          += "tinderclient"
+# in their local.conf 
+
+#Name of the client
+TINDER_MACHINE  = "${MACHINE}-${ANGSTROM_MODE}-build-image"
+
+# Which lof file to write to, which tree to report to
+TINDER_LOG        = "${TMPDIR}/tinder.log"
+TINDER_TREE       = "Angstrom"
+
+# HTTP posting    
+TINDER_HOST       ?= "ewi546.ewi.utwente.nl"
+TINDER_URL        ?= "/tinderbox"
+
+# Which branch do we build
+TINDER_BRANCH     = "org.openembedded.dev"
+   
+## Clobbing
+## 0 for rebuilding everything from scratch
+## 1 for incremental builds
+TINDER_CLOBBER    = "1"
+
+## Do a report at all
+TINDER_REPORT     = "1"
+
+# Configuration for seppuku autobuilder, people only need to put:
+# INHERIT += "seppuku"
+# SEPPUKU_USER         = "your_bugzilla@user.id"
+# SEPPUKU_PASS         = "your_bugzilla_password"
+# in their local.conf
+
+# seppuku bbclass
+SEPPUKU_LOGIN        = "http://bugs.openembedded.org/query.cgi?"
+SEPPUKU_QUERY       = "http://bugs.openembedded.org/buglist.cgi?"
+SEPPUKU_NEWREPORT    = "http://bugs.openembedded.org/post_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"
+SEPPUKU_ADDCOMMENT   = "http://bugs.openembedded.org/process_bug.cgi?bug_file_loc=http%3A%2F%2F&version=Angstrom&priority=P2&bug_severity=normal&op_sys=Linux&rep_platform=Other&"SEPPUKU_ATTACHMENT = "http://bugs.openembedded.org/attachment.cgi?"
+SEPPUKU_AUTOBUILD = "1"
+
+SEPPUKU_PRODUCT      = "Openembedded"
+SEPPUKU_COMPONENT    = "build"
+
+
+
+
+
 # We want images supporting the following features (for task-base)
 DISTRO_FEATURES = "nfs smbfs wifi ppp alsa bluetooth ext2 irda pcmcia usbgadget usbhost pci"
 DISTRO_FEATURES_nslu2 = "nfs smbfs alsa bluetooth ext2 usbhost pci"
diff --git a/conf/machine/include/tune-arm1136jf-s.conf b/conf/machine/include/tune-arm1136jf-s.conf
index 68316f36bf..a69df825c0 100644
--- a/conf/machine/include/tune-arm1136jf-s.conf
+++ b/conf/machine/include/tune-arm1136jf-s.conf
@@ -1,2 +1,3 @@
 TARGET_CC_ARCH = "-march=armv6j -mtune=arm1136jf-s -mfpu=vfp -mfloat-abi=softfp"
-PACKAGE_ARCH = "armv6"
-\ No newline at end of file
+FEED_ARCH = "armv6"
+PACKAGE_ARCH = "armv6"
diff --git a/conf/machine/include/tune-arm920t.conf b/conf/machine/include/tune-arm920t.conf
index 373bf46727..b142d3325a 100644
--- a/conf/machine/include/tune-arm920t.conf
+++ b/conf/machine/include/tune-arm920t.conf
@@ -1,3 +1,4 @@
+FEED_ARCH = "armv4t"
 PACKAGE_ARCH = "armv4t" 
 TARGET_CC_ARCH = "-march=armv4t -mtune=arm920t"
 
diff --git a/conf/machine/include/tune-arm926ejs.conf b/conf/machine/include/tune-arm926ejs.conf
index 31fe8868ca..c3e8d7aefc 100644
--- a/conf/machine/include/tune-arm926ejs.conf
+++ b/conf/machine/include/tune-arm926ejs.conf
@@ -1,3 +1,5 @@
+FEED_ARCH = "armv5te"
+
 # For gcc 3.x you need:
 #TARGET_CC_ARCH = "-march=armv5te -mtune=arm926ejs"
 # For gcc 4.x you need:
diff --git a/conf/machine/include/tune-xscale.conf b/conf/machine/include/tune-xscale.conf
index 1d212946e4..f14aee9aed 100644
--- a/conf/machine/include/tune-xscale.conf
+++ b/conf/machine/include/tune-xscale.conf
@@ -1,3 +1,5 @@
+FEED_ARCH = "armv5te"
+
 TARGET_CC_ARCH = "-march=armv5te -mtune=xscale"
 TARGET_CC_KERNEL_ARCH = "-march=armv5te -mtune=xscale"
 PACKAGE_ARCH = "${@['armv5teb', 'armv5te'][bb.data.getVar('SITEINFO_ENDIANESS', d, 1) == 'le']}"