propagate from branch 'org.openembedded.dev' (head 0238eff8862126ac83c3f05d7a6fb094fe...

            to branch 'org.openembedded.dev.avr32' (head afeaa97ba6962d277699aab10b0b6a8089342824)

diff --cc conf/distro/angstrom-2007.1.conf
Simple merge

diff --cc conf/distro/angstrom-2008.1.conf
index 9614581,265b572..70a7f84
--- 1/conf/distro/angstrom-2008.1.conf
--- 2/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@@ -66,10 -80,7 +66,18 @@@ PREFERRED_VERSION_linux-libc-headers        
  PREFERRED_VERSION_glibc               = "2.6.1"
  PREFERRED_VERSION_glibc-intermediate  = "2.6.1"
  PREFERRED_VERSION_glibc-initial       = "2.6.1"
 +PREFERRED_VERSION_uclibc ?= "0.9.29"
 +PREFERRED_VERSION_uclibc-initial ?= "0.9.29"
 +
 +
++#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE
++PREFERRED_VERSION_binutils_avr32 = "2.17"
++PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
++PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
++#there's is no avr32 patch for 0.9.29
++PREFERRED_VERSION_uclibc_avr32 = "0.9.28"
++PREFERRED_VERSION_uclibc-initial_avr32 = "0.9.28"
+ 
  #Prefer a newer GTK+ and friends
  PREFERRED_VERSION_gtk+                = "2.12.0"
  PREFERRED_VERSION_glib-2.0              = "2.14.0"

diff --cc conf/distro/include/angstrom.inc
Simple merge

diff --cc packages/busybox/busybox_1.2.1.bb
index 325111c,773c5e1..3b7016a
--- 1/packages/busybox/busybox_1.2.1.bb
--- 2/packages/busybox/busybox_1.2.1.bb
+++ b/packages/busybox/busybox_1.2.1.bb
@@@ -5,6 -5,8 +5,7 @@@ PR = "r15
  SRC_URI += "file://wget-long-options.patch;patch=1 \
           file://df_rootfs.patch;patch=1 \
             file://defconfig"
 -
+ SRC_URI_append_avr32 = " file://install-should-unlink-dest-if-it-exists.patch;patch=1"
  
  do_configure () {
        install -m 0644 ${WORKDIR}/defconfig ${S}/.config.oe

diff --cc packages/gcc/gcc-cross_4.1.2.bb
Simple merge

diff --cc packages/gcc/gcc-package-cross.inc
index 5c6b370,cbd01c3..51a45cd
--- 1/packages/gcc/gcc-package-cross.inc
--- 2/packages/gcc/gcc-package-cross.inc
+++ b/packages/gcc/gcc-package-cross.inc
@@@ -75,12 -75,7 +75,12 @@@ do_install () 
         if [ "x${OLD_INHIBIT_PACKAGE_STRIP}" != "x1" ]; then
                 ${TARGET_PREFIX}strip ${D}${target_libdir}/libstdc++.so.*
                 ${TARGET_PREFIX}strip ${D}${target_libdir}/libg2c.so.* || true
-                ${TARGET_PREFIX}strip ${D}${target_base_libdir}/libgcc_s.so.*
+                ${TARGET_PREFIX}strip ${D}${target_base_libdir}/libgcc_s.so.* || true
                 ${TARGET_PREFIX}strip ${D}${target_libdir}/libgfortran*.so* || true
        fi
 +     
 +       # Link gfortran to g77 to satisfy not-so-smart configure or hard coded g77
 +       # gfortran is fully backwards compatible. This is a safe and practical solution. 
 +       ln -sf ${CROSS_DIR}/bin/${TARGET_PREFIX}gfortran ${CROSS_DIR}/bin/${TARGET_PREFIX}g77 || true
 +       ln -sf ${CROSS_DIR}/${TARGET_SYS}/bin/gfortran ${CROSS_DIR}/${TARGET_SYS}/bin/g77 || true
  }

diff --cc packages/gcc/gcc_4.1.2.bb
Simple merge

diff --cc packages/gcc/gcc_4.2.1.bb
index 2e1f20a,af90755..688ccda
--- 1/packages/gcc/gcc_4.2.1.bb
--- 2/packages/gcc/gcc_4.2.1.bb
+++ b/packages/gcc/gcc_4.2.1.bb
@@@ -1,4 -1,4 +1,4 @@@
--PR = "r6"
++PR = "r7"
  DESCRIPTION = "The GNU cc and gcc C compilers."
  HOMEPAGE = "http://www.gnu.org/software/gcc/"
  SECTION = "devel"
@@@ -39,9 -39,34 +39,35 @@@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gc
          file://fix-ICE-in-arm_unwind_emit_set.diff;patch=1 \
        file://cache-amnesia.patch;patch=1 \
          file://gfortran.patch;patch=1 \
 +        file://pr34130.patch;patch=1 \
  "
  
+ SRC_URI_avr32 = " http://ewi546.ewi.utwente.nl/tmp/avr32-gcc-4.2.1-atmel.1.0.1.tar.gz \
+         file://100-uclibc-conf.patch;patch=1 \
+         file://103-uclibc-conf-noupstream.patch;patch=1 \
+         file://200-uclibc-locale.patch;patch=1 \
+         file://203-uclibc-locale-no__x.patch;patch=1 \
+         file://204-uclibc-locale-wchar_fix.patch;patch=1 \
+         file://205-uclibc-locale-update.patch;patch=1 \
+         file://300-libstdc++-pic.patch;patch=1 \
+         file://301-missing-execinfo_h.patch;patch=1 \
+         file://302-c99-snprintf.patch;patch=1 \
+         file://303-c99-complex-ugly-hack.patch;patch=1 \
+         file://304-index_macro.patch;patch=1 \
+         file://305-libmudflap-susv3-legacy.patch;patch=1 \
+         file://306-libstdc++-namespace.patch;patch=1 \
+         file://307-locale_facets.patch;patch=1 \
+         file://402-libbackend_dep_gcov-iov.h.patch;patch=1 \
+         file://602-sdk-libstdc++-includes.patch;patch=1 \
+         file://740-sh-pr24836.patch;patch=1 \
+         file://904-flatten-switch-stmt-00.patch;patch=1 \
+         file://gcc41-configure.in.patch;patch=1 \
+         file://ldflags.patch;patch=1 \
+         file://zecke-xgcc-cpp.patch;patch=1 \
+         file://cache-amnesia.patch;patch=1 \
+         file://gfortran.patch;patch=1 \
+ "
+ 
  SRC_URI_append_ep93xx = " \
          file://arm-crunch-saveregs.patch;patch=1 \
          file://arm-crunch-20000320.patch;patch=1 \

diff --cc packages/linux/linux.inc
Simple merge

diff --cc packages/linux/linux_2.6.23.bb
index 6d9a3c7,225c707..bd8b171
--- 1/packages/linux/linux_2.6.23.bb
--- 2/packages/linux/linux_2.6.23.bb
+++ b/packages/linux/linux_2.6.23.bb
@@@ -5,8 -5,9 +5,9 @@@ DEFAULT_PREFERENCE = "-1
  DEFAULT_PREFERENCE_cm-x270 = "1"
  DEFAULT_PREFERENCE_mpc8313e-rdb = "1"
  DEFAULT_PREFERENCE_mpc8323e-rdb = "1"
+ DEFAULT_PREFERENCE_avr32 = "1"
  
 -PR = "r3"
 +PR = "r6"
  
  SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-2.6.23.tar.bz2 \
           file://binutils-buildid-arm.patch;patch=1 \

diff --cc packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index f78bef0,7822e40..98dfb0a
--- 1/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
--- 2/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
+++ b/packages/xorg-xserver/xserver-kdrive_1.3.0.0.bb
@@@ -3,7 -3,7 +3,7 @@@ require xserver-kdrive-common.in
  DEPENDS += "libxkbfile libxcalibrate"
  
  PE = "1"
- PR = "r21"
 -PR = "r19"
++PR = "r22"
  
  SRC_URI = "${XORG_MIRROR}/individual/xserver/xorg-server-${PV}.tar.bz2 \
        ${KDRIVE_COMMON_PATCHES} \
@@@ -19,10 -19,9 +19,11 @@@
        file://w100.patch;patch=1 \
        file://w100-autofoo.patch;patch=1 \
        file://w100-fix-offscreen-bmp.patch;patch=1 \
-         file://kdrive-1.3-18bpp.patch;patch=1 \
-         file://gumstix-kmode.patch;patch=1 \
-         file://smedia-glamo.patch;patch=1 \
-         file://build-glamo.patch;patch=1 \
+     file://xorg-avr32-support.diff;patch=1 \
+     file://kdrive-1.3-18bpp.patch;patch=1 \
+     file://gumstix-kmode.patch;patch=1 \
++    file://smedia-glamo.patch;patch=1 \ 
++    file://build-glamo.patch;patch=1 \
  "
  
  S = "${WORKDIR}/xorg-server-${PV}"