summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--conf/distro/angstrom-2008.1.conf4
-rw-r--r--conf/distro/include/angstrom-2007-preferred-versions.inc6
-rw-r--r--conf/distro/include/sane-srcrevs.inc2
-rw-r--r--conf/machine/atngw100.conf4
-rw-r--r--conf/machine/h5000.conf3
-rw-r--r--conf/machine/mpc8313e-rdb.conf2
-rw-r--r--conf/machine/mpc8323e-rdb.conf2
-rw-r--r--packages/altboot/altboot.inc2
-rw-r--r--packages/altboot/altboot_1.0.8+1.0.9_pre1.bb2
-rw-r--r--packages/altboot/altboot_1.0.8.bb2
-rw-r--r--packages/altboot/altboot_1.1.1+wip-SVNR78.bb2
-rw-r--r--packages/altboot/altboot_svn.bb2
-rw-r--r--packages/asterisk/asterisk-core-sounds-en-alaw_1.4.8.bb (renamed from packages/asterisk/asterisk-core-sounds-en-alaw_1.4.7.bb)0
-rw-r--r--packages/asterisk/asterisk-core-sounds-en-g729_1.4.8.bb (renamed from packages/asterisk/asterisk-core-sounds-en-g729_1.4.7.bb)0
-rw-r--r--packages/asterisk/asterisk-core-sounds-en-gsm_1.4.8.bb (renamed from packages/asterisk/asterisk-core-sounds-en-gsm_1.4.7.bb)0
-rw-r--r--packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.8.bb (renamed from packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.7.bb)0
-rw-r--r--packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.7.bb (renamed from packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.6.bb)6
-rw-r--r--packages/asterisk/asterisk-extra-sounds-en-g729_1.4.7.bb (renamed from packages/asterisk/asterisk-extra-sounds-en-g729_1.4.6.bb)6
-rw-r--r--packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.7.bb (renamed from packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.6.bb)6
-rw-r--r--packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.7.bb (renamed from packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.6.bb)6
-rw-r--r--packages/binutils/binutils-2.17/500-avr32-atmel.1.3.0.patch111130
-rw-r--r--packages/binutils/binutils-2.17/501-avr32-fix-pool-alignment.patch26
-rw-r--r--packages/binutils/binutils_2.17.bb8
-rw-r--r--packages/gsm/files/default5
-rw-r--r--packages/gsm/gsmd.inc2
-rw-r--r--packages/inetutils/inetutils_1.5.bb17
-rw-r--r--packages/libmad/files/libmad-0.15.1b-avr32-optimization.patch62
-rw-r--r--packages/libmad/libmad_0.15.1b.bb2
-rw-r--r--packages/linux/linux-openmoko_2.6.24.bb61
-rw-r--r--packages/linux/linux.inc13
-rw-r--r--packages/opie-ttf-support/opie-ttf-support_1.1.bb22
-rw-r--r--packages/python/python-edbus_cvs.bb4
-rw-r--r--packages/qemu/qemu-0.9.1/writev_fix.patch17
-rw-r--r--packages/qemu/qemu_0.9.1.bb3
-rw-r--r--packages/tasks/task-base.bb2
-rw-r--r--packages/xorg-app/bdftopcf-native_1.0.0.bb11
-rw-r--r--packages/xorg-font/font-util-native_1.0.1.bb11
-rw-r--r--packages/xorg-xserver/xserver-kdrive-1.4/keyboard-resume-workaround.patch16
-rw-r--r--packages/xorg-xserver/xserver-kdrive_1.4.bb3
39 files changed, 111368 insertions, 104 deletions
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index ec8a5b9b30..4f950ffff1 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -71,8 +71,8 @@ PREFERRED_VERSION_uclibc-initial ?= "0.9.29"
#Prefer a newer GTK+ and friends
-PREFERRED_VERSION_gtk+ = "2.12.0"
-PREFERRED_VERSION_glib-2.0 = "2.14.0"
+PREFERRED_VERSION_gtk+ = "2.12.3"
+PREFERRED_VERSION_glib-2.0 = "2.14.4"
PREFERRED_VERSION_pango = "1.18.1"
# prefer newest for speed and fun
diff --git a/conf/distro/include/angstrom-2007-preferred-versions.inc b/conf/distro/include/angstrom-2007-preferred-versions.inc
index 02e2399e4e..d712fadb8c 100644
--- a/conf/distro/include/angstrom-2007-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2007-preferred-versions.inc
@@ -886,7 +886,7 @@ PREFERRED_VERSION_libgalago ?= "0.3.3"
PREFERRED_VERSION_libgc ?= "6.7"
PREFERRED_VERSION_libgcrypt ?= "1.2.3"
PREFERRED_VERSION_libgeda ?= "20050820"
-PREFERRED_VERSION_libgemwidget ?= "0.1"
+PREFERRED_VERSION_libgemwidget ?= "1.0"
PREFERRED_VERSION_libglade ?= "2.6.2"
PREFERRED_VERSION_libglademm ?= "2.4.1"
PREFERRED_VERSION_libgmime ?= "2.1.7"
@@ -918,7 +918,7 @@ PREFERRED_VERSION_libhildonfm ?= "1.9.41"
PREFERRED_VERSION_libhildonhelp ?= "1.9.1"
PREFERRED_VERSION_libhildonmime ?= "1.9.5"
PREFERRED_VERSION_libhtml-mason-perl ?= "1.35"
-PREFERRED_VERSION_libiac ?= "0.1"
+PREFERRED_VERSION_libiac ?= "1.0"
PREFERRED_VERSION_libice ?= "1.0.4"
PREFERRED_VERSION_libiconv ?= "1.11"
PREFERRED_VERSION_libid3 ?= "1.1"
@@ -946,7 +946,7 @@ PREFERRED_VERSION_libmailwrapper ?= "1.2.3"
PREFERRED_VERSION_libmatchbox ?= "1.9"
PREFERRED_VERSION_libmath-bigint-gmp-perl ?= "1.18"
PREFERRED_VERSION_libmikmod ?= "3.2.0-beta2"
-PREFERRED_VERSION_libmimedir ?= "0.3.1"
+PREFERRED_VERSION_libmimedir ?= "0.4.2"
PREFERRED_VERSION_libmng ?= "1.0.8"
PREFERRED_VERSION_libmodplug ?= "0.7"
PREFERRED_VERSION_libmodule-build-perl ?= "0.2805"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 50ba415363..c8b67efb7a 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -45,7 +45,7 @@ SRCREV_pn-libxosd ?= "627"
SRCREV_pn-linux-bfin ?= "3758"
SRCREV_pn-linux-hackndev-2.6 ?= "1308"
SRCREV_pn-linux-ixp4xx ?= "1021"
-SRCREV_pn-linux-openmoko ?= "3801"
+SRCREV_pn-linux-openmoko ?= "4014"
SRCREV_pn-llvm-gcc4 ?= "374"
SRCREV_pn-llvm-gcc4-cross ?= "374"
SRCREV_pn-maemo-mapper ?= "118"
diff --git a/conf/machine/atngw100.conf b/conf/machine/atngw100.conf
index 21e256b04a..559bd40c75 100644
--- a/conf/machine/atngw100.conf
+++ b/conf/machine/atngw100.conf
@@ -22,3 +22,7 @@ EXTRA_IMAGECMD_jffs2 = " --big-endian --pagesize=4096 --eraseblock=65536"
PREFERRED_VERSION_u-boot = "1.1.4"
KERNEL_IMAGETYPE = "uImage"
+UBOOT_ENTRYPOINT = "0x90000000"
+UBOOT_LOADADRESS = "0x10000000"
+
+
diff --git a/conf/machine/h5000.conf b/conf/machine/h5000.conf
index c4c1237bae..1f29438061 100644
--- a/conf/machine/h5000.conf
+++ b/conf/machine/h5000.conf
@@ -27,7 +27,8 @@ EXTRA_IMAGECMD_jffs2 = "-e 0x40000 -p ; echo '${IMAGE_NAME} ${IMAGE_NAME}.rootf
MACHINE_EXTRA_RDEPENDS = "kernel ipaq-boot-params"
MACHINE_EXTRA_RRECOMMENDS = " kernel-module-h5400-lcd \
kernel-module-h5400-battery \
- kernel-module-snd-soc-h5000"
+ kernel-module-snd-soc-h5000 \
+ kernel-module-i2c-pxa"
#
# Modules autoload and other boot properties
diff --git a/conf/machine/mpc8313e-rdb.conf b/conf/machine/mpc8313e-rdb.conf
index 3bc18e3f9e..27706cbd4a 100644
--- a/conf/machine/mpc8313e-rdb.conf
+++ b/conf/machine/mpc8313e-rdb.conf
@@ -10,6 +10,8 @@ PREFERRED_VERSION_u-boot = "git"
MACHINE_FEATURES = "kernel26 usbhost ext2"
+KERNEL_IMAGETYPE = "uImage"
+
PREFERRED_VERSION_u-boot = "1.3.1"
UBOOT_MACHINE = "MPC8313ERDB_33_config"
diff --git a/conf/machine/mpc8323e-rdb.conf b/conf/machine/mpc8323e-rdb.conf
index ee2c6144a9..38f3b1930c 100644
--- a/conf/machine/mpc8323e-rdb.conf
+++ b/conf/machine/mpc8323e-rdb.conf
@@ -10,6 +10,8 @@ PREFERRED_PROVIDER_virtual/kernel = "linux"
MACHINE_FEATURES = "kernel26 usbhost pci ext2 uboot"
+KERNEL_IMAGETYPE = "uImage"
+
PREFERRED_VERSION_u-boot = "1.1.6"
UBOOT_MACHINE = "MPC8323ERDB_config"
diff --git a/packages/altboot/altboot.inc b/packages/altboot/altboot.inc
index 8a1eae87e8..9fe1e7a03b 100644
--- a/packages/altboot/altboot.inc
+++ b/packages/altboot/altboot.inc
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.hentges.net/misc/openzaurus/index.shtml"
LICENSE = "GPL"
RDEPENDS_${PN} = "${PN}-conf"
RDEPENDS_${PN}-conf = "${PN}"
-RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools kexec-tools"
+RRECOMMENDS_${PN} = "e2fsprogs-e2fsck dosfstools kexec-tools kernel-module-loop"
RRECOMMENDS_${PN}_spitz += " kernel-module-jffs2"
S = "${WORKDIR}/trunk/"
diff --git a/packages/altboot/altboot_1.0.8+1.0.9_pre1.bb b/packages/altboot/altboot_1.0.8+1.0.9_pre1.bb
index 3128e794b9..aa359ff0c9 100644
--- a/packages/altboot/altboot_1.0.8+1.0.9_pre1.bb
+++ b/packages/altboot/altboot_1.0.8+1.0.9_pre1.bb
@@ -9,7 +9,7 @@ DEFAULT_PREFERENCE = "-1"
#RDEPENDS_${PN}_append_poodle = " kexec-tools"
#RDEPENDS_${PN}-conf = "${PN}"
-PR = "r0"
+PR = "r1"
SVN_REV="65"
#TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
diff --git a/packages/altboot/altboot_1.0.8.bb b/packages/altboot/altboot_1.0.8.bb
index 96758871f9..de2a249010 100644
--- a/packages/altboot/altboot_1.0.8.bb
+++ b/packages/altboot/altboot_1.0.8.bb
@@ -1,6 +1,6 @@
require altboot.inc
-PR = "r2"
+PR = "r3"
TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '-')}"
SRC_URI = "svn://hentges.net/public/altboot/tags/;module=${TAG};proto=svn"
diff --git a/packages/altboot/altboot_1.1.1+wip-SVNR78.bb b/packages/altboot/altboot_1.1.1+wip-SVNR78.bb
index b74bc7baa4..be50911f69 100644
--- a/packages/altboot/altboot_1.1.1+wip-SVNR78.bb
+++ b/packages/altboot/altboot_1.1.1+wip-SVNR78.bb
@@ -1,6 +1,6 @@
require altboot.inc
-PR = "r0"
+PR = "r1"
SVN_REV = "78"
SRC_URI = "svn://hentges.net/public/altboot;module=trunk;rev=${SVN_REV} \
diff --git a/packages/altboot/altboot_svn.bb b/packages/altboot/altboot_svn.bb
index 0d3c869482..a736ccd7c4 100644
--- a/packages/altboot/altboot_svn.bb
+++ b/packages/altboot/altboot_svn.bb
@@ -1,7 +1,7 @@
require altboot.inc
PV = "1.1.1+wip-${SRCDATE}"
-PR = "r2"
+PR = "r3"
SRC_URI = "svn://hentges.net/public/altboot;module=trunk;proto=svn"
diff --git a/packages/asterisk/asterisk-core-sounds-en-alaw_1.4.7.bb b/packages/asterisk/asterisk-core-sounds-en-alaw_1.4.8.bb
index f1b3d12cd7..f1b3d12cd7 100644
--- a/packages/asterisk/asterisk-core-sounds-en-alaw_1.4.7.bb
+++ b/packages/asterisk/asterisk-core-sounds-en-alaw_1.4.8.bb
diff --git a/packages/asterisk/asterisk-core-sounds-en-g729_1.4.7.bb b/packages/asterisk/asterisk-core-sounds-en-g729_1.4.8.bb
index 205c8ff067..205c8ff067 100644
--- a/packages/asterisk/asterisk-core-sounds-en-g729_1.4.7.bb
+++ b/packages/asterisk/asterisk-core-sounds-en-g729_1.4.8.bb
diff --git a/packages/asterisk/asterisk-core-sounds-en-gsm_1.4.7.bb b/packages/asterisk/asterisk-core-sounds-en-gsm_1.4.8.bb
index 2a46c74f84..2a46c74f84 100644
--- a/packages/asterisk/asterisk-core-sounds-en-gsm_1.4.7.bb
+++ b/packages/asterisk/asterisk-core-sounds-en-gsm_1.4.8.bb
diff --git a/packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.7.bb b/packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.8.bb
index c29ae60f99..c29ae60f99 100644
--- a/packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.7.bb
+++ b/packages/asterisk/asterisk-core-sounds-en-ulaw_1.4.8.bb
diff --git a/packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.6.bb b/packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.7.bb
index f18d46258f..2bea38c99b 100644
--- a/packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.6.bb
+++ b/packages/asterisk/asterisk-extra-sounds-en-alaw_1.4.7.bb
@@ -10,8 +10,6 @@ SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extr
do_install() {
install -d ${D}${localstatedir}/lib/asterisk/sounds
# HACK: moving the files in chunkes (too many of them)
- rm ${WORKDIR}/conf-thereare.alaw
- rm ${WORKDIR}/invalid.alaw
mv ${WORKDIR}/[a-d]*.alaw ${D}${localstatedir}/lib/asterisk/sounds/
mv ${WORKDIR}/[e-l]*.alaw ${D}${localstatedir}/lib/asterisk/sounds/
mv ${WORKDIR}/*.alaw ${D}${localstatedir}/lib/asterisk/sounds/
@@ -21,10 +19,6 @@ do_install() {
#install -m 644 ${WORKDIR}/ha/* ${D}${localstatedir}/lib/asterisk/sounds/ha/
mv ${WORKDIR}/ha ${D}${localstatedir}/lib/asterisk/sounds
- #install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
- #install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
- mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds
-
#install -d ${D}${localstatedir}/lib/asterisk/sounds/wx
#install -m 644 ${WORKDIR}/wx/* ${D}${localstatedir}/lib/asterisk/sounds/wx/
mv ${WORKDIR}/wx ${D}${localstatedir}/lib/asterisk/sounds
diff --git a/packages/asterisk/asterisk-extra-sounds-en-g729_1.4.6.bb b/packages/asterisk/asterisk-extra-sounds-en-g729_1.4.7.bb
index 48fabbbdc4..0656ff1a95 100644
--- a/packages/asterisk/asterisk-extra-sounds-en-g729_1.4.6.bb
+++ b/packages/asterisk/asterisk-extra-sounds-en-g729_1.4.7.bb
@@ -10,8 +10,6 @@ SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extr
do_install() {
install -d ${D}${localstatedir}/lib/asterisk/sounds
# HACK: moving the files in chunks (too many files)
- rm ${WORKDIR}/conf-thereare.g729
- rm ${WORKDIR}/invalid.g729
mv ${WORKDIR}/[a-d]*.g729 ${D}${localstatedir}/lib/asterisk/sounds/
mv ${WORKDIR}/[e-l]*.g729 ${D}${localstatedir}/lib/asterisk/sounds/
mv ${WORKDIR}/*.g729 ${D}${localstatedir}/lib/asterisk/sounds/
@@ -21,10 +19,6 @@ do_install() {
#install -m 644 ${WORKDIR}/ha/* ${D}${localstatedir}/lib/asterisk/sounds/ha/
mv ${WORKDIR}/ha ${D}${localstatedir}/lib/asterisk/sounds
- #install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
- #install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
- mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds
-
#install -d ${D}${localstatedir}/lib/asterisk/sounds/wx
#install -m 644 ${WORKDIR}/wx/* ${D}${localstatedir}/lib/asterisk/sounds/wx/
mv ${WORKDIR}/wx ${D}${localstatedir}/lib/asterisk/sounds
diff --git a/packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.6.bb b/packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.7.bb
index da463391b1..2d74d27996 100644
--- a/packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.6.bb
+++ b/packages/asterisk/asterisk-extra-sounds-en-gsm_1.4.7.bb
@@ -10,8 +10,6 @@ SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extr
do_install() {
install -d ${D}${localstatedir}/lib/asterisk/sounds
# HACK: moving the files in chunks (too many files)
- rm ${WORKDIR}/conf-thereare.gsm
- rm ${WORKDIR}/invalid.gsm
mv ${WORKDIR}/[a-d]*.gsm ${D}${localstatedir}/lib/asterisk/sounds/
mv ${WORKDIR}/[e-l]*.gsm ${D}${localstatedir}/lib/asterisk/sounds/
mv ${WORKDIR}/*.gsm ${D}${localstatedir}/lib/asterisk/sounds/
@@ -21,10 +19,6 @@ do_install() {
#install -m 644 ${WORKDIR}/ha/* ${D}${localstatedir}/lib/asterisk/sounds/ha/
mv ${WORKDIR}/ha ${D}${localstatedir}/lib/asterisk/sounds
- #install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
- #install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
- mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds
-
#install -d ${D}${localstatedir}/lib/asterisk/sounds/wx
#install -m 644 ${WORKDIR}/wx/* ${D}${localstatedir}/lib/asterisk/sounds/wx/
mv ${WORKDIR}/wx ${D}${localstatedir}/lib/asterisk/sounds
diff --git a/packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.6.bb b/packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.7.bb
index 6a6f3f5fba..6d35c65177 100644
--- a/packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.6.bb
+++ b/packages/asterisk/asterisk-extra-sounds-en-ulaw_1.4.7.bb
@@ -10,8 +10,6 @@ SRC_URI="http://downloads.digium.com/pub/telephony/sounds/releases/asterisk-extr
do_install() {
install -d ${D}${localstatedir}/lib/asterisk/sounds
# HACK: moving the files in chunkes (too many of them)
- rm ${WORKDIR}/conf-thereare.ulaw
- rm ${WORKDIR}/invalid.ulaw
mv ${WORKDIR}/[a-d]*.ulaw ${D}${localstatedir}/lib/asterisk/sounds/
mv ${WORKDIR}/[e-l]*.ulaw ${D}${localstatedir}/lib/asterisk/sounds/
mv ${WORKDIR}/*.ulaw ${D}${localstatedir}/lib/asterisk/sounds/
@@ -21,10 +19,6 @@ do_install() {
#install -m 644 ${WORKDIR}/ha/* ${D}${localstatedir}/lib/asterisk/sounds/ha/
mv ${WORKDIR}/ha ${D}${localstatedir}/lib/asterisk/sounds
- #install -d ${D}${localstatedir}/lib/asterisk/sounds/phonetic
- #install -m 644 ${WORKDIR}/phonetic/* ${D}${localstatedir}/lib/asterisk/sounds/phonetic/
- mv ${WORKDIR}/phonetic ${D}${localstatedir}/lib/asterisk/sounds
-
#install -d ${D}${localstatedir}/lib/asterisk/sounds/wx
#install -m 644 ${WORKDIR}/wx/* ${D}${localstatedir}/lib/asterisk/sounds/wx/
mv ${WORKDIR}/wx ${D}${localstatedir}/lib/asterisk/sounds
diff --git a/packages/binutils/binutils-2.17/500-avr32-atmel.1.3.0.patch b/packages/binutils/binutils-2.17/500-avr32-atmel.1.3.0.patch
new file mode 100644
index 0000000000..28a7f00804
--- /dev/null
+++ b/packages/binutils/binutils-2.17/500-avr32-atmel.1.3.0.patch
@@ -0,0 +1,111130 @@
+diff -Nrup binutils-2.17/bfd/aclocal.m4 binutils-2.17.atmel.1.3.0/bfd/aclocal.m4
+--- binutils-2.17/bfd/aclocal.m4 2005-09-30 20:38:50.000000000 +0200
++++ binutils-2.17.atmel.1.3.0/bfd/aclocal.m4 2007-03-26 10:30:51.000000000 +0200
+@@ -1,4 +1,4 @@
+-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
++# generated automatically by aclocal 1.9.6 -*- Autoconf -*-
+
+ # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+ # 2005 Free Software Foundation, Inc.
+@@ -28,7 +28,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api
+ # Call AM_AUTOMAKE_VERSION so it can be traced.
+ # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
+ AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
+- [AM_AUTOMAKE_VERSION([1.9.5])])
++ [AM_AUTOMAKE_VERSION([1.9.6])])
+
+ # AM_AUX_DIR_EXPAND -*- Autoconf -*-
+
+diff -Nrup binutils-2.17/bfd/archures.c binutils-2.17.atmel.1.3.0/bfd/archures.c
+--- binutils-2.17/bfd/archures.c 2006-03-06 14:42:03.000000000 +0100
++++ binutils-2.17.atmel.1.3.0/bfd/archures.c 2007-03-26 10:20:30.000000000 +0200
+@@ -334,6 +334,9 @@ DESCRIPTION
+ .#define bfd_mach_avr3 3
+ .#define bfd_mach_avr4 4
+ .#define bfd_mach_avr5 5
++. bfd_arch_avr32, {* Atmel AVR32 *}
++.#define bfd_mach_avr32_ap 7000
++.#define bfd_mach_avr32_uc 3000
+ . bfd_arch_bfin, {* ADI Blackfin *}
+ .#define bfd_mach_bfin 1
+ . bfd_arch_cr16c, {* National Semiconductor CompactRISC. *}
+@@ -423,6 +426,7 @@ extern const bfd_arch_info_type bfd_alph
+ extern const bfd_arch_info_type bfd_arc_arch;
+ extern const bfd_arch_info_type bfd_arm_arch;
+ extern const bfd_arch_info_type bfd_avr_arch;
++extern const bfd_arch_info_type bfd_avr32_arch;
+ extern const bfd_arch_info_type bfd_bfin_arch;
+ extern const bfd_arch_info_type bfd_cr16c_arch;
+ extern const bfd_arch_info_type bfd_cris_arch;
+@@ -490,6 +494,7 @@ static const bfd_arch_info_type * const
+ &bfd_arc_arch,
+ &bfd_arm_arch,
+ &bfd_avr_arch,
++ &bfd_avr32_arch,
+ &bfd_bfin_arch,
+ &bfd_cr16c_arch,
+ &bfd_cris_arch,
+diff -Nrup binutils-2.17/bfd/bfd-in2.h binutils-2.17.atmel.1.3.0/bfd/bfd-in2.h
+--- binutils-2.17/bfd/bfd-in2.h 2006-03-26 01:38:42.000000000 +0100
++++ binutils-2.17.atmel.1.3.0/bfd/bfd-in2.h 2007-03-26 10:33:41.000000000 +0200
+@@ -1931,6 +1931,9 @@ enum bfd_architecture
+ #define bfd_mach_avr3 3
+ #define bfd_mach_avr4 4
+ #define bfd_mach_avr5 5
++ bfd_arch_avr32, /* Atmel AVR32 */
++#define bfd_mach_avr32_ap 7000
++#define bfd_mach_avr32_uc 3000
+ bfd_arch_bfin, /* ADI Blackfin */
+ #define bfd_mach_bfin 1
+ bfd_arch_cr16c, /* National Semiconductor CompactRISC. */
+@@ -3577,6 +3580,87 @@ instructions */
+ instructions */
+ BFD_RELOC_AVR_6_ADIW,
+
++/* Difference between two labels: L2 - L1. The value of L1 is encoded
++as sym + addend, while the initial difference after assembly is
++inserted into the object file by the assembler. */
++ BFD_RELOC_AVR32_DIFF32,
++ BFD_RELOC_AVR32_DIFF16,
++ BFD_RELOC_AVR32_DIFF8,
++
++/* Reference to a symbol through the Global Offset Table. The linker
++will allocate an entry for symbol in the GOT and insert the offset
++of this entry as the relocation value. */
++ BFD_RELOC_AVR32_GOT32,
++ BFD_RELOC_AVR32_GOT16,
++ BFD_RELOC_AVR32_GOT8,
++
++/* Normal (non-pc-relative) code relocations. Alignment and signedness
++is indicated by the suffixes. S means signed, U means unsigned. W
++means word-aligned, H means halfword-aligned, neither means
++byte-aligned (no alignment.) SUB5 is the same relocation as 16S. */
++ BFD_RELOC_AVR32_21S,
++ BFD_RELOC_AVR32_16U,
++ BFD_RELOC_AVR32_16S,
++ BFD_RELOC_AVR32_SUB5,
++ BFD_RELOC_AVR32_8S_EXT,
++ BFD_RELOC_AVR32_8S,
++
++/* PC-relative relocations are signed if neither 'U' nor 'S' is
++specified. However, we explicitly tack on a 'B' to indicate no
++alignment, to avoid confusion with data relocs. All of these resolve
++to sym + addend - offset, except the one with 'N' (negated) suffix.
++This particular one resolves to offset - sym - addend. */
++ BFD_RELOC_AVR32_22H_PCREL,
++ BFD_RELOC_AVR32_18W_PCREL,
++ BFD_RELOC_AVR32_16B_PCREL,
++ BFD_RELOC_AVR32_16N_PCREL,
++ BFD_RELOC_AVR32_14UW_PCREL,
++ BFD_RELOC_AVR32_11H_PCREL,
++ BFD_RELOC_AVR32_10UW_PCREL,
++ BFD_RELOC_AVR32_9H_PCREL,
++ BFD_RELOC_AVR32_9UW_PCREL,
++
++/* Subtract the link-time address of the GOT from (symbol + addend)
++and insert the result. */
++ BFD_RELOC_AVR32_GOTPC,
++
++/* Reference to a symbol through the GOT. The linker will allocate an
++entry for symbol in the GOT and insert the offset of this entry as
++the relocation value. addend must be zero. As usual, 'S' means
++signed, 'W' means word-aligned, etc. */
++ BFD_RELOC_AVR32_GOTCALL,
++ BFD_RELOC_AVR32_LDA_GOT,
++ BFD_RELOC_AVR32_GOT21S,
++ BFD_RELOC_AVR32_GOT18SW,
++ BFD_RELOC_AVR32_GOT16S,
++
++/* 32-bit constant pool entry. I don't think 8- and 16-bit entries make
++a whole lot of sense. */
++ BFD_RELOC_AVR32_32_CPENT,
++
++/* Constant pool references. Some of these relocations are signed,
++others are unsigned. It doesn't really matter, since the constant
++pool always comes after the code that references it. */
++ BFD_RELOC_AVR32_CPCALL,
++ BFD_RELOC_AVR32_16_CP,
++ BFD_RELOC_AVR32_9W_CP,
++
++/* sym must be the absolute symbol. The addend specifies the alignment
++order, e.g. if addend is 2, the linker must add padding so that the
++next address is aligned to a 4-byte boundary. */
++ BFD_RELOC_AVR32_ALIGN,
++
++/* Code relocations that will never make it to the output file. */
++ BFD_RELOC_AVR32_14UW,
++ BFD_RELOC_AVR32_10UW,
++ BFD_RELOC_AVR32_10SW,
++ BFD_RELOC_AVR32_STHH_W,
++ BFD_RELOC_AVR32_7UW,
++ BFD_RELOC_AVR32_6S,
++ BFD_RELOC_AVR32_6UW,
++ BFD_RELOC_AVR32_4UH,
++ BFD_RELOC_AVR32_3U,
++
+ /* Direct 12 bit. */
+ BFD_RELOC_390_12,
+
+diff -Nrup binutils-2.17/bfd/config.bfd binutils-2.17.atmel.1.3.0/bfd/config.bfd
+--- binutils-2.17/bfd/config.bfd 2006-04-05 14:41:57.000000000 +0200
++++ binutils-2.17.atmel.1.3.0/bfd/config.bfd 2007-03-26 10:20:30.000000000 +0200
+@@ -317,6 +317,10 @@ case "${targ}" in
+ targ_underscore=yes
+ ;;
+
++ avr32-*-*)
++ targ_defvec=bfd_elf32_avr32_vec
++ ;;
++
+ c30-*-*aout* | tic30-*-*aout*)
+ targ_defvec=tic30_aout_vec
+ ;;
+diff -Nrup binutils-2.17/bfd/config.in binutils-2.17.atmel.1.3.0/bfd/config.in
+--- binutils-2.17/bfd/config.in 2005-11-03 17:06:10.000000000 +0100
++++ binutils-2.17.atmel.1.3.0/bfd/config.in 2007-03-26 10:30:55.000000000 +0200
+@@ -313,18 +313,18 @@
+ /* Define to the version of this package. */
+ #undef PACKAGE_VERSION
+
+-/* The size of a `long', as computed by sizeof. */
++/* The size of `long', as computed by sizeof. */
+ #undef SIZEOF_LONG
+
+-/* The size of a `long long', as computed by sizeof. */
++/* The size of `long long', as computed by sizeof. */
+ #undef SIZEOF_LONG_LONG
+
+-/* The size of a `off_t', as computed by sizeof. */
++/* The size of `off_t', as computed by sizeof. */
+ #undef SIZEOF_OFF_T
+
+ /* If using the C implementation of alloca, define if you know the
+ direction of stack growth for your system; otherwise it will be
+- automatically deduced at run-time.
++ automatically deduced at runtime.
+ STACK_DIRECTION > 0 => grows toward higher addresses
+ STACK_DIRECTION < 0 => grows toward lower addresses
+ STACK_DIRECTION = 0 => direction of growth unknown */
+@@ -368,8 +368,8 @@
+ #undef inline
+ #endif
+
+-/* Define to `long' if <sys/types.h> does not define. */
++/* Define to `long int' if <sys/types.h> does not define. */
+ #undef off_t
+
+-/* Define to `unsigned' if <sys/types.h> does not define. */
++/* Define to `unsigned int' if <sys/types.h> does not define. */
+ #undef size_t
+diff -Nrup binutils-2.17/bfd/configure binutils-2.17.atmel.1.3.0/bfd/configure
+--- binutils-2.17/bfd/configure 2006-06-23 20:17:03.000000000 +0200
++++ binutils-2.17.atmel.1.3.0/bfd/configure 2007-03-26 10:30:54.000000000 +0200
+@@ -1,25 +1,54 @@
+ #! /bin/sh
+ # Guess values for system-dependent variables and create Makefiles.
+-# Generated by GNU Autoconf 2.59.
++# Generated by GNU Autoconf 2.61.
+ #
+-# Copyright (C) 2003 Free Software Foundation, Inc.
++# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
++# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
+ # This configure script is free software; the Free Software Foundation
+ # gives unlimited permission to copy, distribute and modify it.
+ ## --------------------- ##
+ ## M4sh Initialization. ##
+ ## --------------------- ##
+
+-# Be Bourne compatible
++# Be more Bourne compatible
++DUALCASE=1; export DUALCASE # for MKS sh
+ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+ emulate sh
+ NULLCMD=:
+ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # is contrary to our usage. Disable this feature.
+ alias -g '${1+"$@"}'='"$@"'
+-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
+- set -o posix
++ setopt NO_GLOB_SUBST
++else
++ case `(set -o) 2>/dev/null` in
++ *posix*) set -o posix ;;
++esac
++
++fi
++
++
++
++
++# PATH needs CR
++# Avoid depending upon Character Ranges.
++as_cr_letters='abcdefghijklmnopqrstuvwxyz'
++as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
++as_cr_Letters=$as_cr_letters$as_cr_LETTERS
++as_cr_digits='0123456789'
++as_cr_alnum=$as_cr_Letters$as_cr_digits
++
++# The user is always right.
++if test "${PATH_SEPARATOR+set}" != set; then
++ echo "#! /bin/sh" >conf$$.sh
++ echo "exit 0" >>conf$$.sh
++ chmod +x conf$$.sh
++ if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
++ PATH_SEPARATOR=';'
++ else
++ PATH_SEPARATOR=:
++ fi
++ rm -f conf$$.sh
+ fi
+-DUALCASE=1; export DUALCASE # for MKS sh
+
+ # Support unset when possible.
+ if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+@@ -29,8 +58,43 @@ else
+ fi
+
+
++# IFS
++# We need space, tab and new line, in precisely that order. Quoting is
++# there to prevent editors from complaining about space-tab.
++# (If _AS_PATH_WALK were called with IFS unset, it would disable word
++# splitting by setting IFS to empty value.)
++as_nl='
++'
++IFS=" "" $as_nl"
++
++# Find who we are. Look in the path if we contain no directory separator.
++case $0 in
++ *[\\/]* ) as_myself=$0 ;;
++ *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
++done
++IFS=$as_save_IFS
++
++ ;;
++esac
++# We did not find ourselves, most probably we were run as `sh COMMAND'
++# in which case we are not to be found in the path.
++if test "x$as_myself" = x; then
++ as_myself=$0
++fi
++if test ! -f "$as_myself"; then
++ echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
++ { (exit 1); exit 1; }
++fi
++
+ # Work around bugs in pre-3.0 UWIN ksh.
+-$as_unset ENV MAIL MAILPATH
++for as_var in ENV MAIL MAILPATH
++do ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
++done
+ PS1='$ '
+ PS2='> '
+ PS4='+ '
+@@ -44,18 +108,19 @@ do
+ if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
+ eval $as_var=C; export $as_var
+ else
+- $as_unset $as_var
++ ($as_unset $as_var) >/dev/null 2>&1 && $as_unset $as_var
<