Merge bk://oe-devel.bkbits.net/openembedded

into  bkbits.net:/repos/n/nslu2-linux/openembedded

2005/05/11 11:26:43+01:00 rpsys.net!RP
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into tim.rpsys.net:/usr/oe/openembedded

2005/05/11 11:25:33+01:00 rpsys.net!RP
linux-oz-2.6: Add machtypes and mtd definitions for akita/spitz + tweak modules

2005/05/11 12:13:58+02:00 utwente.nl!koen
  add dep on goffice to gnumeric 1.5.1

2005/05/11 12:11:47+02:00 utwente.nl!koen
Add goffice 0.0.1 - A library for Gnome Office

2005/05/11 11:40:00+02:00 utwente.nl!koen
Add pango 1.8.1

2005/05/11 11:35:27+02:00 utwente.nl!koen
Add libgsf 0.12

BKrev: 4281e0f8s3VZSUzwoA-EjYmi4hlmXA

3 files changed, 21 insertions, 17 deletions

diff --git a/packages/linux/linux-openzaurus-2.6.11/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.11/defconfig-c7x0
index 6b48b24be6..9acb46da2d 100644
--- a/packages/linux/linux-openzaurus-2.6.11/defconfig-c7x0
+++ b/packages/linux/linux-openzaurus-2.6.11/defconfig-c7x0
@@ -1136,7 +1136,7 @@ CONFIG_USB=m
 #
 # Miscellaneous USB options
 #
-# CONFIG_USB_DEVICEFS is not set
+CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
@@ -1147,7 +1147,7 @@ CONFIG_USB_ARCH_HAS_HCD=y
 #
 # USB Host Controller Drivers
 #
-CONFIG_USB_SL811_HCD=m
+# CONFIG_USB_SL811_HCD is not set
 
 #
 # USB Device Class drivers
@@ -1258,7 +1258,7 @@ CONFIG_USB_AX8817X=y
 # USB Serial Converter support
 #
 CONFIG_USB_SERIAL=m
-# CONFIG_USB_SERIAL_GENERIC is not set
+CONFIG_USB_SERIAL_GENERIC=y
 CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
 CONFIG_USB_SERIAL_DIGI_ACCELEPORT=m
@@ -1332,12 +1332,12 @@ CONFIG_USB_PXA2XX=y
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 # CONFIG_USB_GADGET_OMAP is not set
 # CONFIG_USB_GADGET_DUALSPEED is not set
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_ETH=y
+CONFIG_USB_ZERO=m
+CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y
-# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_FILE_STORAGE is not set
-# CONFIG_USB_G_SERIAL is not set
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FILE_STORAGE=m
+CONFIG_USB_G_SERIAL=m
 
 #
 # MMC/SD Card support
diff --git a/packages/linux/linux-openzaurus-2.6.12-rc3-mm2/defconfig-c7x0 b/packages/linux/linux-openzaurus-2.6.12-rc3-mm2/defconfig-c7x0
index 92cbf38e67..8d06d1f8a4 100644
--- a/packages/linux/linux-openzaurus-2.6.12-rc3-mm2/defconfig-c7x0
+++ b/packages/linux/linux-openzaurus-2.6.12-rc3-mm2/defconfig-c7x0
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.12-rc3-mm2
-# Tue May 10 23:11:46 2005
+# Wed May 11 11:21:04 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -1027,7 +1027,7 @@ CONFIG_USB=m
 #
 # Miscellaneous USB options
 #
-# CONFIG_USB_DEVICEFS is not set
+CONFIG_USB_DEVICEFS=y
 # CONFIG_USB_BANDWIDTH is not set
 # CONFIG_USB_DYNAMIC_MINORS is not set
 # CONFIG_USB_SUSPEND is not set
@@ -1037,7 +1037,7 @@ CONFIG_USB=m
 # USB Host Controller Drivers
 #
 # CONFIG_USB_ISP116X_HCD is not set
-CONFIG_USB_SL811_HCD=m
+# CONFIG_USB_SL811_HCD is not set
 
 #
 # USB Device Class drivers
@@ -1151,7 +1151,7 @@ CONFIG_USB_MON=m
 # USB Serial Converter support
 #
 CONFIG_USB_SERIAL=m
-# CONFIG_USB_SERIAL_GENERIC is not set
+CONFIG_USB_SERIAL_GENERIC=y
 # CONFIG_USB_SERIAL_AIRPRIME is not set
 CONFIG_USB_SERIAL_BELKIN=m
 CONFIG_USB_SERIAL_WHITEHEAT=m
@@ -1208,6 +1208,7 @@ CONFIG_USB_CYTHERM=m
 CONFIG_USB_PHIDGETKIT=m
 CONFIG_USB_PHIDGETSERVO=m
 CONFIG_USB_IDMOUSE=m
+# CONFIG_USB_TEST is not set
 
 #
 # USB ATM/DSL drivers
@@ -1227,12 +1228,13 @@ CONFIG_USB_PXA2XX=y
 # CONFIG_USB_GADGET_OMAP is not set
 # CONFIG_USB_GADGET_DUMMY_HCD is not set
 # CONFIG_USB_GADGET_DUALSPEED is not set
-# CONFIG_USB_ZERO is not set
-CONFIG_USB_ETH=y
+CONFIG_USB_ZERO=m
+CONFIG_USB_ETH=m
 CONFIG_USB_ETH_RNDIS=y
-# CONFIG_USB_GADGETFS is not set
-# CONFIG_USB_FILE_STORAGE is not set
-# CONFIG_USB_G_SERIAL is not set
+CONFIG_USB_GADGETFS=m
+CONFIG_USB_FILE_STORAGE=m
+# CONFIG_USB_FILE_STORAGE_TEST is not set
+CONFIG_USB_G_SERIAL=m
 
 #
 # MMC/SD Card support
diff --git a/packages/linux/linux-openzaurus_2.6.12-rc3-mm2.bb b/packages/linux/linux-openzaurus_2.6.12-rc3-mm2.bb
index 408ae54ee4..2b51313628 100644
--- a/packages/linux/linux-openzaurus_2.6.12-rc3-mm2.bb
+++ b/packages/linux/linux-openzaurus_2.6.12-rc3-mm2.bb
@@ -25,6 +25,7 @@ JLSRC = "http://www.cs.wisc.edu/~lenz/zaurus/files/"
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \
            ftp://ftp.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.12-rc3.bz2;patch=1 \
            ftp://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6/2.6.12-rc3/2.6.12-rc3-mm2/2.6.12-rc3-mm2.bz2;patch=1 \
+	   ${RPSRC}/machtype_update-r1.patch;patch=1 \
            ${RPSRC}/corgi_kbd3-r6.patch;patch=1 \
            ${RPSRC}/pxa_rtc-r1.patch;patch=1 \
            ${RPSRC}/pxa_irda-r1.patch;patch=1 \
@@ -40,6 +41,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.11.tar.gz \
            ${RPSRC}/corgi_snd-r6.patch;patch=1 \
            ${RPSRC}/w100_split-r8.patch;patch=1 \
            ${RPSRC}/pxa_i2c-r1.patch;patch=1 \
+	   ${RPSRC}/spitz_mtd-r0.patch;patch=1 \
            ${DOSRC}/pxa2xx-ir-dma-r0.patch;patch=1 \
            ${DOSRC}/tc6393-device-r2.patch;patch=1 \
            ${DOSRC}/tc6393_nand-r2.patch;patch=1 \