merge of '7474030a47375702cb66f00aa7ded40e585cf3fd'

     and '9f671f6c3a17dbd8450e267353cf95d120238e50'

13 files changed, 143 insertions, 13 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index dba0f2839d..a782557a35 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -11893,3 +11893,7 @@ sha256=63287527c8d9e27e801cf0804436f3494bd569db05d49dcdd2a942ae72fa9055
 [ftp://ftp.software.ibm.com/software/globalization/icu/3.6/icu4c-3_6-src.tgz]
 md5=6243f7a19e03e05403ce84e597510d4c
 sha256=5135e8d69d6206d320515df7aeee7027711ab1aef9d8dbf29571a97a9746b041
+
+[ftp://mama.indstate.edu/linux/tree/tree-1.5.1.tgz]
+md5=274ca4d36ee6fb216fa6cf01ad5eaa84
+sha256=1cda1c4d43c6e11ac2214e0a886f1d184bf59d49252cb489b110697f686f809c
diff --git a/conf/distro/amsdelta-oe.conf b/conf/distro/amsdelta-oe.conf
index 6e7adda029..6d3ad7bd6b 100644
--- a/conf/distro/amsdelta-oe.conf
+++ b/conf/distro/amsdelta-oe.conf
@@ -2,7 +2,7 @@ DISTRO = "amsdelta-oe"
 DISTRO_NAME = "AmsDelta Linux"
 DISTRO_VERSION = "unstable-${DATE}"
 
-require conf/distro/ansgstrom-2007.1.conf
+require conf/distro/angstrom-2007.1.conf
 
 
 DISTRO_TYPE = "debug"
diff --git a/conf/distro/angstrom-2007.1.conf b/conf/distro/angstrom-2007.1.conf
index 71303ab836..0458249125 100644
--- a/conf/distro/angstrom-2007.1.conf
+++ b/conf/distro/angstrom-2007.1.conf
@@ -152,9 +152,14 @@ PREFERRED_VERSION_osb-nrcore  = "0.5.2+svn${SRCDATE}"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive"
 PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
 
+PREFERRED_VERSION_xserver-kdrive ?= "1.2.0"
+PREFERRED_VERSION_libxrandr ?= "1.2.1"
+PREFERRED_VERSION_xrandr ?= "1.2.0" 
+PREFERRED_VERSION_randrproto ?= "1.2.1"
+
 require conf/distro/include/preferred-xorg-versions-X11R7.2.inc
 
-#PREFERRED_VERSION_xserver-kdrive = "1.2.0"
+
 PREFERRED_VERSION_gtk+ = "2.10.12"
 PREFERRED_VERSION_libgnomeui = "2.16.1"
 
@@ -213,17 +218,33 @@ PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc = "uc
 PREFERRED_VERSION_gcc ?= "4.1.2"
 PREFERRED_VERSION_gcc-cross ?= "4.1.2"
 PREFERRED_VERSION_gcc-cross-sdk ?= "4.1.2"
-PREFERRED_VERSION_gcc-cross-initial ?= "4.1.1"
+PREFERRED_VERSION_gcc-cross-initial ?= "4.1.2"
 
 PREFERRED_VERSION_binutils ?= "2.17.50.0.5"
 PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.5"
 PREFERRED_VERSION_binutils-cross-sdk ?= "2.17.50.0.5"
 
+#avr32 only has patches for binutils 2.17 and gcc 4.0.2 in OE
+PREFERRED_VERSION_gcc_avr32 = "4.0.2"
+PREFERRED_VERSION_gcc-cross_avr32 = "4.0.2"
+PREFERRED_VERSION_gcc-cross-sdk_avr32 = "4.0.2"
+PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.0.2"
+
+PREFERRED_VERSION_binutils_avr32 = "2.17"
+PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
+PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
+
+
+
+
 PREFERRED_VERSION_linux-libc-headers ?= "2.6.20"
 
 PREFERRED_VERSION_glibc ?= "2.5"
 PREFERRED_VERSION_uclibc ?= "0.9.29"
 
+#there's is no avr32 patch for 0.9.29
+PREFERRED_VERSION_uclibc_avr32 = "0.9.28"
+
 PREFERRED_VERSION_glibc-intermediate_i686 ?= "2.4"
 PREFERRED_VERSION_glibc-intermediate ?= "2.5"
 
diff --git a/conf/machine/at32stk1000.conf b/conf/machine/at32stk1000.conf
new file mode 100644
index 0000000000..faa4785fb4
--- /dev/null
+++ b/conf/machine/at32stk1000.conf
@@ -0,0 +1,21 @@
+#@TYPE: Machine
+#@Name: Atmel STK1000 AVR32AP7000 Development Platform
+#@DESCRIPTION: Atmel STK1000 AVR32AP7000 Development Platform
+
+
+TARGET_ARCH = "avr32"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200"
+
+# used by some images
+ROOT_FLASH_SIZE = "8"
+EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf
new file mode 100644
index 0000000000..b725831321
--- /dev/null
+++ b/conf/machine/atngw100.conf
@@ -0,0 +1,20 @@
+#@TYPE: Machine
+#@Name: Atmel ATNGW100 Network Gateway Kit 
+#@DESCRIPTION: Atmel ATNGW100 Network Gateway Kit
+
+TARGET_ARCH = "avr32"
+
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 ext2 usbhost usbgadget"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200"
+
+# used by some images
+ROOT_FLASH_SIZE = "8"
+EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
+
diff --git a/conf/machine/db1200.conf b/conf/machine/db1200.conf
index 5fafb0cd56..cbde602824 100644
--- a/conf/machine/db1200.conf
+++ b/conf/machine/db1200.conf
@@ -1,7 +1,6 @@
 # Alchemy db1200
 
 TARGET_ARCH = "mipsel"
-PACKAGE_ARCHS = "${TARGET_ARCH} ${MACHINE}"
 
 PREFERRED_PROVIDERS += " virtual/${TARGET_PREFIX}depmod:module-init-tools-cross"
 
diff --git a/conf/machine/dht-walnut.conf b/conf/machine/dht-walnut.conf
index 268b2a361c..0ca65b79a9 100644
--- a/conf/machine/dht-walnut.conf
+++ b/conf/machine/dht-walnut.conf
@@ -1,21 +1,26 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
 #@TYPE: Machine
 #@Name: DHT-Walnut Development Platform
 #@DESCRIPTION: Machine configuration for the DHT-Walnut 405GP  development platform
 
 TARGET_ARCH = "powerpc"
-PACKAGE_EXTRA_ARCHS = "ppc405"
+PACKAGE_EXTRA_ARCHS = "all ${MACHINE} ppc ppc405"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 
 MACHINE_FEATURES = "kernel26 ext2"
+MACHINE_TASK_PROVIDER = "task-base"
 
 TARGET_CPU = "405"
-OLDEST_KERNEL = "2.6.12"
+OLDEST_KERNEL = "2.6.18"
 
-#tune for the 405 cpu
-require conf/machine/include/tune-ppc405.conf
+#don't try to access tty1
+USE_VT = "0"
 
+SERIAL_CONSOLE = "115200 ttyS0"
 
 
-SERIAL_CONSOLE = "115200 ttyS0"
+#tune for the 405 cpu
+require conf/machine/include/tune-ppc405.conf
 
diff --git a/conf/machine/epia.conf b/conf/machine/epia.conf
index 1497e303c4..5a3b5875a3 100644
--- a/conf/machine/epia.conf
+++ b/conf/machine/epia.conf
@@ -6,9 +6,14 @@ PACKAGE_EXTRA_ARCHS = "i386 i486"
 PREFERRED_PROVIDER_virtual/kernel = "linux-epia"
 OLDEST_KERNEL = "2.6.5"
 
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
 IMAGE_FSTYPES = "ext2.gz"
 
-MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" 
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2"
+MACHINE_TASK_PROVIDER = "task-base"
+
 
 require conf/machine/include/tune-c3.conf
 
diff --git a/conf/machine/i586-generic.conf b/conf/machine/i586-generic.conf
new file mode 100644
index 0000000000..6abdf0e25b
--- /dev/null
+++ b/conf/machine/i586-generic.conf
@@ -0,0 +1,25 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+#@TYPE: Machine
+#@NAME: i586-generic
+#@DESCRIPTION: Machine configuration for a generic i586 machine
+
+
+TARGET_ARCH = "i586"
+PACKAGE_EXTRA_ARCHS = "x86 i386 i486"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
+OLDEST_KERNEL = "2.6.18"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+IMAGE_FSTYPES = "ext2.gz"
+
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2"
+MACHINE_TASK_PROVIDER = "task-base"
+
+
+
+#tune for the i586 cpu
+require conf/machine/include/tune-i586.conf
diff --git a/conf/machine/i686-generic.conf b/conf/machine/i686-generic.conf
new file mode 100644
index 0000000000..21549653f6
--- /dev/null
+++ b/conf/machine/i686-generic.conf
@@ -0,0 +1,24 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
+#@TYPE: Machine
+#@NAME: i686-generic
+#@DESCRIPTION: Machine configuration for a generic i686 machine
+
+
+TARGET_ARCH = "i686"
+PACKAGE_EXTRA_ARCHS = "x86 i386 i486 i586"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
+OLDEST_KERNEL = "2.6.18"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
+IMAGE_FSTYPES = "ext2.gz"
+
+MACHINE_FEATURES = "kernel26 screen keyboard pci ushbost acpi ext2" 
+MACHINE_TASK_PROVIDER = "task-base"
+
+
+#tune for the i686 cpu
+require conf/machine/include/tune-i686.conf
diff --git a/conf/machine/include/tune-ppc440e.conf b/conf/machine/include/tune-ppc440e.conf
new file mode 100644
index 0000000000..0cfa50c69e
--- /dev/null
+++ b/conf/machine/include/tune-ppc440e.conf
@@ -0,0 +1,2 @@
+TARGET_CC_ARCH = "-mcpu=440fp"
+PACKAGE_ARCH = "ppc440"
diff --git a/conf/machine/magicbox.conf b/conf/machine/magicbox.conf
index 19dae402d9..756e064c6a 100644
--- a/conf/machine/magicbox.conf
+++ b/conf/machine/magicbox.conf
@@ -1,3 +1,5 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
 #@TYPE: Machine
 #@Name: Magicbox router board
 #@DESCRIPTION: Machine configuration for Magicbox router board http://wwww.magicbox.pl
diff --git a/conf/machine/sequoia.conf b/conf/machine/sequoia.conf
index b2d0f3593e..a6f31ab84a 100644
--- a/conf/machine/sequoia.conf
+++ b/conf/machine/sequoia.conf
@@ -1,10 +1,12 @@
+# Copyright (C) 2007, Stelios Koroneos - Digital OPSiS, All Rights Reserved
+# Released under the MIT license (see packages/COPYING)
 #@TYPE: Machine
 #@Name: AMCC Sequoia Development Platform
 #@DESCRIPTION: Machine configuration for the AMCC Sequoia development platform http://www.amcc.com/Embedded/Downloads/440EPx/
 
 
 TARGET_ARCH = "powerpc"
-PACKAGE_EXTRA_ARCHS = "all  ${MACHINE} ppc ppc440"
+PACKAGE_EXTRA_ARCHS = "all  ${MACHINE} ppc ppc440e"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-${MACHINE}"
 
@@ -17,10 +19,10 @@ USE_VT = "0"
 
 SERIAL_CONSOLE = "115200 ttyS0"
 
-PREFERRED_VERSION_u-boot = "1.1.2"
+PREFERRED_VERSION_u-boot = "git"
 EXTRA_IMAGECMD = "--big-endian"
 ERASEBLOCK_SIZE = "0x10000"
 IMAGE_FSTYPES = "jffs2"
 
 #tune for the AMCC440 cpu
-require conf/machine/include/tune-ppc440.conf
+require conf/machine/include/tune-ppc440e.conf