propagate from branch 'org.openembedded.dev' (head acccc4840b95c279164a3eeacf89320016...

            to branch 'org.openembedded.dev.avr32' (head 4a915ee0a28076c53049330f3f2e58c7b85ef7a8)

diff --cc conf/distro/angstrom-2008.1.conf
index 976ac38,145c463..5d9f761
--- 1/conf/distro/angstrom-2008.1.conf
--- 2/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@@ -92,16 -85,113 +90,124 @@@ PREFERRED_VERSION_udev                   = "115
  # Our patched-to-hell busybox 1.2.1 is getting old and unmaintanable
  PREFERRED_VERSION_busybox               = "1.7.2" 
  
+ 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"
+ 
+ PREFERRED_VERSION_gcc               ?= "4.2.2"
+ PREFERRED_VERSION_gcc-cross         ?= "4.2.2"
+ PREFERRED_VERSION_gcc-cross-sdk     ?= "4.2.2"
+ PREFERRED_VERSION_gcc-cross-initial ?= "4.2.2"
+ 
+ #Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
+ require conf/distro/include/preferred-gpe-versions-2.8.inc
+ require conf/distro/include/preferred-e-versions.inc
+ require conf/distro/include/preferred-xorg-versions-X11R7.3.inc
  
 +#avr32 only has patches for binutils 2.17 and gcc 4.1.2 in OE
 +PREFERRED_VERSION_gcc_avr32               = "4.1.2"
 +PREFERRED_VERSION_gcc-cross_avr32         = "4.1.2"
 +PREFERRED_VERSION_gcc-cross-sdk_avr32     = "4.1.2"
 +PREFERRED_VERSION_gcc-cross-initial_avr32 = "4.1.2"
 +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"
  
+ # Virtuals:
+ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}binutils = "binutils-cross"
+ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc-initial = "gcc-cross-initial"
+ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}gcc = "gcc-cross"
+ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}g++ = "gcc-cross"
+ 
+ #Set preferred provider for the C library that is used to build the crosscompiler (NPTL voodoo)
+ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc               = "glibc-intermediate"
+ PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc    = "glibc-intermediate"
+ PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-gnueabi-libc-for-gcc  = "glibc-intermediate"
+ PREFERRED_PROVIDER_virtual/arm-angstrom-linux-libc-for-gcc            = "glibc-intermediate"
+ PREFERRED_PROVIDER_virtual/powerpc-angstrom-linux-libc-for-gcc        = "glibc-intermediate"
+ PREFERRED_PROVIDER_virtual/mipsel-angstrom-linux-libc-for-gcc         = "glibc-intermediate"
+ PREFERRED_PROVIDER_virtual/sparc-angstrom-linux-libc-for-gcc          = "glibc-intermediate"
+ 
+ PREFERRED_PROVIDER_virtual/arm-angstrom-linux-uclibcgnueabi-libc-for-gcc    = "uclibc-initial"
+ PREFERRED_PROVIDER_virtual/armeb-angstrom-linux-uclibcgnueabi-libc-for-gcc  = "uclibc-initial"
+ 
+ # hostap stuff, we prefer the in-kernel modules, but those don't work for all machines
+ PREFERRED_PROVIDER_hostap-conf                      ?= "hostap-conf"
+ PREFERRED_PROVIDER_hostap-modules_h2200             ?= "hostap-modules"
+ PREFERRED_PROVIDER_hostap-modules_hx4700            ?= "hostap-modules"
+ 
+ PREFERRED_PROVIDER_virtual/db           ?= "db"
+ PREFERRED_PROVIDER_virtual/db-native    ?= "db-native"
+ PREFERRED_PROVIDER_virtual/libsdl       ?= "libsdl-x11"
+ PREFERRED_PROVIDER_virtual/libx11       ?= "libx11"
+ PREFERRED_PROVIDER_virtual/libxine      ?= "libxine-x11"
+ PREFERRED_PROVIDER_virtual/xserver      ?= "xserver-kdrive"
+ 
+ # Others:
+ PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-headers"
+ PREFERRED_PROVIDER_dbus-glib             = "dbus-glib"
+ PREFERRED_PROVIDER_esound             ?= "pulseaudio"
+ PREFERRED_PROVIDER_gconf                ?= "gconf-dbus"
+ PREFERRED_PROVIDER_gnome-vfs            ?= "gnome-vfs"
+ PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs"
+ PREFERRED_PROVIDER_tslib                ?= "tslib"
+ PREFERRED_PROVIDER_tslib-conf           ?= "tslib"
+ PREFERRED_PROVIDER_libgpewidget         ?= "libgpewidget"
+ PREFERRED_PROVIDER_ntp                  ?= "ntp"
+ PREFERRED_PROVIDER_hotplug               = "udev"
+ PREFERRED_PROVIDER_libxss                = "libxss"
+ 
+ # we don't ship gtk-directfb by default
+ PREFERRED_PROVIDER_gtk+                   ?= "gtk+"
+ PREFERRED_PROVIDER_gdk-pixbuf-loader-ani  ?= "gtk+"
+ PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+"
+ PREFERRED_PROVIDER_gdk-pixbuf-loader-gif  ?= "gtk+"
+ PREFERRED_PROVIDER_gdk-pixbuf-loader-ico  ?= "gtk+"
+ PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+"
+ PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx  ?= "gtk+"
+ PREFERRED_PROVIDER_gdk-pixbuf-loader-png  ?= "gtk+"
+ PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm  ?= "gtk+"
+ PREFERRED_PROVIDER_gdk-pixbuf-loader-ras  ?= "gtk+"
+ PREFERRED_PROVIDER_gdk-pixbuf-loader-tga  ?= "gtk+"
+ PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
+ PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm  ?= "gtk+"
+ PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm  ?= "gtk+"
+ 
+ 
+ #Silence a warning during parsing
+ PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
+ 
+ #This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH}
+ ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
+ require conf/distro/include/angstrom${ARM_ABI}.inc
+ 
+ # do some task-base stuff here
+ 
+ # We want to ship extra debug utils in the rootfs when doing a debug build 
+ DEBUG_APPS ?= ""
+ DEBUG_APPS += '${@base_conditional("DISTRO_TYPE", "release", "", "strace procps",d)}'
+ 
+ # Angstrom want to ship some extra stuff. This should be moved into task-base eventually
+ # contains ipkg specific stuff as well :(
+ DISTRO_EXTRA_RDEPENDS += "\
+     update-modules \
+     ${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)} \   
+     angstrom-version \
+     ipkg ipkg-collateral \
+     util-linux-mount util-linux-umount \
+     ${DEBUG_APPS} \
+     "
+ 
+ DISTRO_EXTRA_RRECOMMENDS += " \
+     kernel-module-vfat \
+     kernel-module-ext2 \
+     kernel-module-af-packet \
+     avahi-daemon \
+     avahi-autoipd \
+     openssh-sftp-server \
+     "

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

diff --cc packages/gcc/gcc-package-cross.inc
index cbd01c3,5c6b370..51a45cd
--- 1/packages/gcc/gcc-package-cross.inc
--- 2/packages/gcc/gcc-package-cross.inc
+++ b/packages/gcc/gcc-package-cross.inc
@@@ -75,7 -75,12 +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/xorg-xserver/xserver-kdrive_1.3.0.0.bb
index 7822e40,368b421..83ef9ea
--- 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
@@@ -19,11 -19,16 +19,20 @@@ SRC_URI = "${XORG_MIRROR}/individual/xs
        file://w100.patch;patch=1 \
        file://w100-autofoo.patch;patch=1 \
        file://w100-fix-offscreen-bmp.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://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://00-xglamo-logs.patch;patch=1 \
+         file://01-xglamo-scrolling-artifact-fix.patch;patch=1 \
+         file://02-xglamo-no-dri.patch;patch=1 \
+         file://03-xglamo-no-vesa.patch;patch=1 \
+ "
+ 
++SRC_URI_append_avr32 = " \
++        file://xorg-avr32-support.diff;patch=1 \
 +"
 +
  S = "${WORKDIR}/xorg-server-${PV}"
  
  W100_OECONF = "--disable-w100"