merge of '37a4a98782bda17b384e225dc6561e633f49393c'

     and '8703e298438768d4c30698e05f523d4554ee2c04'

5 files changed, 29 insertions, 2 deletions

diff --git a/packages/autoconf/autoconf-2.61/config-site.patch b/packages/autoconf/autoconf-2.61/config-site.patch
new file mode 100644
index 0000000000..0fa49720c1
--- /dev/null
+++ b/packages/autoconf/autoconf-2.61/config-site.patch
@@ -0,0 +1,13 @@
+Index: autoconf-2.61/lib/autoconf/general.m4
+===================================================================
+--- autoconf-2.61.orig/lib/autoconf/general.m4	2007-07-10 15:09:01.000000000 +0100
++++ autoconf-2.61/lib/autoconf/general.m4	2007-07-10 15:09:17.000000000 +0100
+@@ -1767,7 +1767,7 @@
+ m4_define([AC_SITE_LOAD],
+ [# Prefer explicitly selected file to automatically selected ones.
+ if test -n "$CONFIG_SITE"; then
+-  set x "$CONFIG_SITE"
++  set x $CONFIG_SITE
+ elif test "x$prefix" != xNONE; then
+   set x "$prefix/share/config.site" "$prefix/etc/config.site"
+ else
diff --git a/packages/autoconf/autoconf_2.61.bb b/packages/autoconf/autoconf_2.61.bb
index 370315f041..e6a452c9a0 100644
--- a/packages/autoconf/autoconf_2.61.bb
+++ b/packages/autoconf/autoconf_2.61.bb
@@ -8,6 +8,7 @@ SRC_URI += "file://autoreconf-include.patch;patch=1 \
 	   file://autoreconf-foreign.patch;patch=1 \
 	   file://autoreconf-gnuconfigize.patch;patch=1 \
 	   file://autoheader-nonfatal-warnings.patch;patch=1 \
+	   file://config-site.patch;patch=1 \
 	   ${@['file://path_prog_fixes.patch;patch=1', ''][bb.data.inherits_class('native', d)]}"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch b/packages/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch
new file mode 100644
index 0000000000..e6cc42bb65
--- /dev/null
+++ b/packages/gcc/gcc-csl-arm/gcc-3.4.4-eabi-bigendian.patch
@@ -0,0 +1,12 @@
+--- gcc-2005q3/gcc/config/arm/linux-eabi.h~	2007-07-10 09:19:47.000000000 +0930
++++ gcc-2005q3/gcc/config/arm/linux-eabi.h	2007-07-10 10:42:37.000000000 +0930
+@@ -48,7 +48,8 @@
+ #define SUBTARGET_CPU_DEFAULT TARGET_CPU_arm10tdmi
+ 
+ #undef SUBTARGET_EXTRA_LINK_SPEC
+-#define SUBTARGET_EXTRA_LINK_SPEC " -m armelf_linux_eabi"
++#define SUBTARGET_EXTRA_LINK_SPEC \
++    " %{mbig-endian:-m armelfb_linux_eabi} %{mlittle-endian:-m armelf_linux_eabi} "
+ 
+ /* Use ld-linux.so.3 so that it will be possible to run "classic"
+    GNU/Linux binaries on an EABI system.  */
diff --git a/packages/gcc/gcc_csl-arm-2005q3.bb b/packages/gcc/gcc_csl-arm-2005q3.bb
index d1053dad1d..4f41ca06af 100644
--- a/packages/gcc/gcc_csl-arm-2005q3.bb
+++ b/packages/gcc/gcc_csl-arm-2005q3.bb
@@ -13,7 +13,8 @@ inherit autotools gettext
 require gcc-package.inc
 
 SRC_URI = "http://www.codesourcery.com/public/gnu_toolchain/arm/2005q3-2/arm-2005q3-2-arm-none-linux-gnueabi.src.tar.bz2 \
-           file://gcc_optab_arm.patch;patch=1"
+           file://gcc_optab_arm.patch;patch=1 \
+           file://gcc-3.4.4-eabi-bigendian.patch;patch=1"
 
 do_unpack2() {
 	cd ${WORKDIR}
diff --git a/packages/linux/fsg3-kernel_2.6.18.bb b/packages/linux/fsg3-kernel_2.6.18.bb
index 2e9991f548..5c6688a0af 100644
--- a/packages/linux/fsg3-kernel_2.6.18.bb
+++ b/packages/linux/fsg3-kernel_2.6.18.bb
@@ -6,7 +6,7 @@
 # http://trac.nslu2-linux.org/kernel/
 #
 # The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "898"
+IXP4XX_KERNEL_SVN_REV = "902"
 #
 # The directory containing the patches to be applied is
 # specified below