merge of 9163a4b2aa3f51ec4fd9c17fbf7e8cacf1c0f767

     and b4098f1c54899bc7168ca2c5d533fd2676462e9c

7 files changed, 51 insertions, 69 deletions

diff --git a/conf/distro/jlime-donkey.conf b/conf/distro/jlime-donkey.conf
index 1871af384b..01c90a5b26 100644
--- a/conf/distro/jlime-donkey.conf
+++ b/conf/distro/jlime-donkey.conf
@@ -30,9 +30,9 @@ PREFERRED_PROVIDER_xserver        = "xserver-kdrive"
 PREFERRED_VERSION_binutils = "2.15.94.0.1"
 PREFERRED_VERSION_binutils-cross = "2.15.94.0.1"
 PREFERRED_VERSION_binutils-cross-sdk = "2.15.94.0.1"
-PREFERRED_VERSION_gcc = "3.4.4"
-PREFERRED_VERSION_gcc-cross = "3.4.4"
-PREFERRED_VERSION_gcc-cross-initial = "3.4.4"
+PREFERRED_VERSION_gcc = "4.1.1"
+PREFERRED_VERSION_gcc-cross = "4.1.1"
+PREFERRED_VERSION_gcc-cross-initial = "4.1.1"
 PREFERRED_VERSION_linux-libc-headers = "2.6.15.99"                                             		    
 PREFERRED_VERSION_glibc = "2.3.5+cvs20050627"
 PREFERRED_VERSION_glibc-initial = "2.3.2"
@@ -71,12 +71,22 @@ OPIE_VERSION = "1.2.2"
 include conf/distro/preferred-opie-versions.inc  
 
 #<>
+#<> We want pcmciautils, not pcmcia-cs
+#<>
+PCMCIA_MANAGER = "pcmciautils"
+
+#<>
 #<>We want to be able to build this for all jornadas so
 #<>to not mess up the folders we need to make them dynamic.
 #<>It will use different folders depending on Arch (set in local.conf)
 include conf/distro/include/multimachine.conf
 
 #<>
+#<> Dont wanna break stuff when "some" packages do -O3, so lets set it at -O2
+#<>
+FULL_OPTIMIZATION = "-O2"
+
+#<>
 #<>Our Image files should look abit better.
 #<>
 #<>
diff --git a/packages/linux/linux-jlime-sh3-2.6.11/defconfig_jlime b/packages/linux/linux-jlime-sh3-2.6.11/defconfig_jlime
index 4314ec03b3..16a427b68a 100644
--- a/packages/linux/linux-jlime-sh3-2.6.11/defconfig_jlime
+++ b/packages/linux/linux-jlime-sh3-2.6.11/defconfig_jlime
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.11
-# Sat Apr 23 23:08:14 2005
+# Fri May 26 02:30:50 2006
 #
 CONFIG_SUPERH=y
 CONFIG_UID16=y
@@ -627,7 +627,7 @@ CONFIG_ATMEL=m
 # Wireless 802.11b Pcmcia/Cardbus cards support
 #
 CONFIG_PCMCIA_HERMES=m
-CONFIG_AIRO_CS=m
+# CONFIG_AIRO_CS is not set
 CONFIG_PCMCIA_ATMEL=m
 CONFIG_PCMCIA_WL3501=m
 CONFIG_NET_WIRELESS=y
@@ -783,67 +783,7 @@ CONFIG_PRINTER=y
 #
 # I2C support
 #
-CONFIG_I2C=m
-CONFIG_I2C_CHARDEV=m
-
-#
-# I2C Algorithms
-#
-CONFIG_I2C_ALGOBIT=m
-CONFIG_I2C_ALGOPCF=m
-CONFIG_I2C_ALGOPCA=m
-
-#
-# I2C Hardware Bus support
-#
-# CONFIG_I2C_ELEKTOR is not set
-CONFIG_I2C_ISA=m
-CONFIG_I2C_PARPORT=m
-CONFIG_I2C_PARPORT_LIGHT=m
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_PCA_ISA is not set
-
-#
-# Hardware Sensors Chip support
-#
-CONFIG_I2C_SENSOR=m
-CONFIG_SENSORS_ADM1021=m
-CONFIG_SENSORS_ADM1025=m
-CONFIG_SENSORS_ADM1026=m
-CONFIG_SENSORS_ADM1031=m
-CONFIG_SENSORS_ASB100=m
-CONFIG_SENSORS_DS1621=m
-CONFIG_SENSORS_FSCHER=m
-CONFIG_SENSORS_GL518SM=m
-CONFIG_SENSORS_IT87=m
-CONFIG_SENSORS_LM63=m
-CONFIG_SENSORS_LM75=m
-CONFIG_SENSORS_LM77=m
-CONFIG_SENSORS_LM78=m
-CONFIG_SENSORS_LM80=m
-CONFIG_SENSORS_LM83=m
-CONFIG_SENSORS_LM85=m
-CONFIG_SENSORS_LM87=m
-CONFIG_SENSORS_LM90=m
-CONFIG_SENSORS_MAX1619=m
-CONFIG_SENSORS_PC87360=m
-CONFIG_SENSORS_SMSC47B397=m
-CONFIG_SENSORS_SMSC47M1=m
-CONFIG_SENSORS_W83781D=m
-CONFIG_SENSORS_W83L785TS=m
-CONFIG_SENSORS_W83627HF=m
-
-#
-# Other I2C Chip support
-#
-CONFIG_SENSORS_EEPROM=m
-CONFIG_SENSORS_PCF8574=m
-CONFIG_SENSORS_PCF8591=m
-CONFIG_SENSORS_RTC8564=m
-CONFIG_I2C_DEBUG_CORE=y
-CONFIG_I2C_DEBUG_ALGO=y
-CONFIG_I2C_DEBUG_BUS=y
-CONFIG_I2C_DEBUG_CHIP=y
+# CONFIG_I2C is not set
 
 #
 # Dallas's 1-wire bus
@@ -923,7 +863,6 @@ CONFIG_SOUND_PRIME=y
 # CONFIG_SOUND_MSNDCLAS is not set
 # CONFIG_SOUND_MSNDPIN is not set
 # CONFIG_SOUND_OSS is not set
-# CONFIG_SOUND_TVMIXER is not set
 # CONFIG_SOUND_AD1980 is not set
 CONFIG_SOUND_SH_DAC_AUDIO=y
 CONFIG_SOUND_SH_DAC_AUDIO_CHANNEL=1
diff --git a/packages/pcmcia-cs/pcmcia-cs-3.2.8/superh-noO3.patch b/packages/pcmcia-cs/pcmcia-cs-3.2.8/superh-noO3.patch
new file mode 100644
index 0000000000..ca28688f04
--- /dev/null
+++ b/packages/pcmcia-cs/pcmcia-cs-3.2.8/superh-noO3.patch
@@ -0,0 +1,11 @@
+--- pcmcia-cs-3.2.8/rules.mk_orig	2006-05-26 23:23:12.000000000 +0000
++++ pcmcia-cs-3.2.8/rules.mk	2006-05-26 23:23:18.000000000 +0000
+@@ -1,7 +1,7 @@
+ # Global defaults
+ 
+ # Kernel compiles must have optimization enabled!
+-CFLAGS = -O3 -Wall -Wstrict-prototypes -pipe $(WFLAG)
++CFLAGS = -O2 -Wall -Wstrict-prototypes -pipe $(WFLAG)
+ COFLAGS = -kv
+ YFLAGS = -d
+ 
diff --git a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
index 1db3006e14..4ca5377b2c 100644
--- a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
+++ b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
@@ -20,6 +20,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \
 	   file://wnv.conf"
 
 SRC_URI_append_spitz = " file://nocleanup.patch;patch=1"
+SRC_URI_append_sh3 = " file://superh-noO3.patch;patch=1"
+
 S = "${WORKDIR}/pcmcia-cs-${PV}"
 
 INITSCRIPT_NAME = "pcmcia"
diff --git a/packages/rsync/rsync_2.6.7.bb b/packages/rsync/rsync_2.6.7.bb
index 421dc76d48..e349a6eb4a 100644
--- a/packages/rsync/rsync_2.6.7.bb
+++ b/packages/rsync/rsync_2.6.7.bb
@@ -4,8 +4,8 @@ SECTION = "console/network"
 PRIORITY = "optional"
 PR = "r1"
 
-SRC_URI = "http://rsync.samba.org/ftp/rsync/rsync-${PV}.tar.gz \
-file://rsyncd.conf"
+SRC_URI = "http://rsync.samba.org/ftp/rsync/old-versions/rsync-${PV}.tar.gz \
+           file://rsyncd.conf"
 
 inherit autotools
 
diff --git a/packages/rsync/rsync_2.6.8.bb b/packages/rsync/rsync_2.6.8.bb
new file mode 100644
index 0000000000..78e2d6eef7
--- /dev/null
+++ b/packages/rsync/rsync_2.6.8.bb
@@ -0,0 +1,17 @@
+LICENSE = "GPL"
+DESCRIPTION = "A file-synchronization tool"
+SECTION = "console/network"
+PRIORITY = "optional"
+PR = "r0"
+
+SRC_URI = "http://rsync.samba.org/ftp/rsync/rsync-${PV}.tar.gz \
+           file://rsyncd.conf"
+
+inherit autotools
+
+do_install_append() {
+	install -d ${D}/etc
+	install -m 0644 ${WORKDIR}/rsyncd.conf ${D}/etc
+}
+		
+EXTRA_OEMAKE='STRIP=""'
diff --git a/site/sh3-linux b/site/sh3-linux
index a31cee3b70..8f7998a3de 100644
--- a/site/sh3-linux
+++ b/site/sh3-linux
@@ -21,6 +21,9 @@ ac_cv_sizeof_unsigned_long=${ac_cv_sizeof_unsigned_long=4}
 ac_cv_sizeof_unsigned_long_long=${ac_cv_sizeof_unsigned_long_long=8}
 ac_cv_sizeof_signed_char=${ac_cv_sizeof_signed_char=1}
 
+# lzo
+ac_cv_sizeof_char_p=${ac_cv_sizeof_char_p=4}
+
 ac_cv_sys_restartable_syscalls=yes
 ac_cv_uchar=${ac_cv_uchar=no}
 ac_cv_uint=${ac_cv_uint=yes}