merge of '70b4e64ac7a19c85aafe36376208542257f06435'

     and 'f77e00e9693f39979c7e8a37a8db6dc793fd1832'

76 files changed, 53 insertions, 43949 deletions

diff --git a/packages/ftpd-topfield/files/usb-header-name.patch b/packages/ftpd-topfield/files/usb-header-name.patch
new file mode 100644
index 0000000000..b3149341e2
--- /dev/null
+++ b/packages/ftpd-topfield/files/usb-header-name.patch
@@ -0,0 +1,11 @@
+--- ../../libtopfield/usb_io.h.orig	2006-01-05 14:55:10.000000000 +1030
++++ ../../libtopfield/usb_io.h	2007-02-20 02:25:43.000000000 +1030
+@@ -34,7 +34,7 @@
+ #include <linux/types.h>
+ #include <linux/version.h>
+ 
+-#include <linux/usb.h>
++#include <linux/usb_ch9.h>
+ #include <linux/usbdevice_fs.h>
+ 
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,0)
diff --git a/packages/ftpd-topfield/ftpd-topfield_0.6.10.bb b/packages/ftpd-topfield/ftpd-topfield_0.7.0.bb
index fab729b209..9e2ff9bc23 100755
--- a/packages/ftpd-topfield/ftpd-topfield_0.6.10.bb
+++ b/packages/ftpd-topfield/ftpd-topfield_0.7.0.bb
@@ -5,8 +5,9 @@ HOMEPAGE = "http://sourceforge.net/projects/puppy"
 SECTION = "net"
 LICENSE = "MIT"
 
-SRC_URI = "cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_6_10 \
-	   cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_6_10 \
+SRC_URI = "cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=ftpd-topfield;tag=FTPD_TOPFIELD_0_7_0 \
+	   cvs://anonymous@puppy.cvs.sourceforge.net/cvsroot/puppy;method=pserver;module=libtopfield;tag=FTPD_TOPFIELD_0_7_0 \
+	   file://usb-header-name.patch;patch=1 \
 	   file://init"
 
 # The source will end up in the subdirectory 'ftpd-topfield' - no release name
diff --git a/packages/gpephone/gpe-session-scripts-phone_0.67.bb b/packages/gpephone/gpe-session-scripts-phone_0.67.bb
index e2904b833c..beb1b360ad 100644
--- a/packages/gpephone/gpe-session-scripts-phone_0.67.bb
+++ b/packages/gpephone/gpe-session-scripts-phone_0.67.bb
@@ -4,8 +4,8 @@ DESCRIPTION = "GPE session startup scripts hack for GPE Phone Edition"
 LICENSE = "GPL"
 SECTION = "gpe"
 PRIORITY = "optional"
-RDEPENDS_${PN} = "gpe-applauncher gpe-phonepanel gpe-session-starter gpe-bluetooth gpe-question xmodmap xdpyinfo xserver-common"
-DEPENDS = "matchbox-wm gpe-applauncher gpe-phonepanel gpe-bluetooth gpe-question xmodmap xdpyinfo xserver-common"
+RDEPENDS_${PN} = "gpe-applauncher gpe-phonepanel gpe-session-starter gpe-question xmodmap xdpyinfo xserver-common"
+DEPENDS = "matchbox-wm gpe-applauncher gpe-phonepanel gpe-question xmodmap xdpyinfo xserver-common"
 
 SRC_URI = "${GPE_MIRROR}/gpe-session-scripts-${PV}.tar.gz \
            file://matchbox-session \
diff --git a/packages/gpephone/task-gpephone.bb b/packages/gpephone/task-gpephone.bb
index 488b4d29d7..6ccb91c028 100644
--- a/packages/gpephone/task-gpephone.bb
+++ b/packages/gpephone/task-gpephone.bb
@@ -73,8 +73,6 @@ RDEPENDS_gpephone-task-pim := "\
      gpesyncd"
 
 RDEPENDS_gpephone-task-settings := "\
-    gpe-bluetooth \
-    gpe-beam \
     gpe-su \
     gpe-conf \
     gpe-clock \
diff --git a/packages/kexec/kexec-tools-1.101/kexec-tools-arm.patch b/packages/kexec/kexec-tools-1.101/kexec-tools-arm.patch
index b36a476d82..6e43b76096 100644
--- a/packages/kexec/kexec-tools-1.101/kexec-tools-arm.patch
+++ b/packages/kexec/kexec-tools-1.101/kexec-tools-arm.patch
@@ -285,7 +285,7 @@ Index: kexec-tools-1.101/kexec/kexec-syscall.h
  #define __NR_kexec_load		246
  #endif
 +#ifdef __arm__
-+#define __NR_kexec_load		__NR_SYSCALL_BASE + 189  
++#define __NR_kexec_load		__NR_SYSCALL_BASE + 347  
 +#endif
  #ifndef __NR_kexec_load
  #error Unknown processor architecture.  Needs a kexec_load syscall number.
diff --git a/packages/kexec/kexec-tools_1.101.bb b/packages/kexec/kexec-tools_1.101.bb
index fe2b5e1765..4dfab1e06f 100644
--- a/packages/kexec/kexec-tools_1.101.bb
+++ b/packages/kexec/kexec-tools_1.101.bb
@@ -4,7 +4,7 @@ HOMEPAGE = "http://www.xmission.com/~ebiederm/files/kexec/"
 SECTION = "kernel/userland"
 DEPENDS = "virtual/kernel zlib"
 LICENSE = "GPL"
-PR = "r0"
+PR = "r1"
 
 inherit autotools
 
diff --git a/packages/libxslt/libxslt_1.1.17.bb b/packages/libxslt/libxslt_1.1.17.bb
index 9c59407ebf..7abd2c30b6 100644
--- a/packages/libxslt/libxslt_1.1.17.bb
+++ b/packages/libxslt/libxslt_1.1.17.bb
@@ -5,7 +5,8 @@ DEPENDS = "libxml2"
 LICENSE = "MIT"
 PR = "r2"
 
-SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz"
+SRC_URI = "ftp://xmlsoft.org/libxml2/libxslt-${PV}.tar.gz \
+           file://destdir.patch;patch=1"
 S = "${WORKDIR}/libxslt-${PV}"
 
 inherit autotools pkgconfig
diff --git a/packages/linux/ixp4xx-kernel_2.6.19.bb b/packages/linux/ixp4xx-kernel_2.6.19.bb
index 293f06a8e1..c724535b63 100644
--- a/packages/linux/ixp4xx-kernel_2.6.19.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.19.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 = "698"
+IXP4XX_KERNEL_SVN_REV = "699"
 #
 # The directory containing the patches to be applied is
 # specified below
diff --git a/packages/linux/ixp4xx-kernel_2.6.20.bb b/packages/linux/ixp4xx-kernel_2.6.20.bb
index 434fed24d5..0cd0a59969 100644
--- a/packages/linux/ixp4xx-kernel_2.6.20.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.20.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 = "698"
+IXP4XX_KERNEL_SVN_REV = "699"
 #
 # The directory containing the patches to be applied is
 # specified below
diff --git a/packages/linux/linux-rp-2.6.18/.mtn2git_empty b/packages/linux/linux-rp-2.6.18/.mtn2git_empty
deleted file mode 100644
index e69de29bb2..0000000000
--- a/packages/linux/linux-rp-2.6.18/.mtn2git_empty
+++ /dev/null
diff --git a/packages/linux/linux-rp-2.6.18/add-oz-release-string.patch b/packages/linux/linux-rp-2.6.18/add-oz-release-string.patch
deleted file mode 100644
index 44b33c2e56..0000000000
--- a/packages/linux/linux-rp-2.6.18/add-oz-release-string.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Index: git/init/version.c
-===================================================================
---- git.orig/init/version.c	2006-07-04 21:49:14.000000000 +0100
-+++ git/init/version.c	2006-07-05 10:02:57.000000000 +0100
-@@ -30,5 +30,5 @@
- EXPORT_SYMBOL(system_utsname);
- 
- const char linux_banner[] =
--	"Linux version " UTS_RELEASE " (" LINUX_COMPILE_BY "@"
-+	"Linux version " UTS_RELEASE OPENZAURUS_RELEASE " (" LINUX_COMPILE_BY "@"
- 	LINUX_COMPILE_HOST ") (" LINUX_COMPILER ") " UTS_VERSION "\n";
-Index: git/Makefile
-===================================================================
---- git.orig/Makefile	2006-07-04 21:48:58.000000000 +0100
-+++ git/Makefile	2006-07-05 10:05:03.000000000 +0100
-@@ -859,6 +859,7 @@
- define filechk_version.h
- 	(echo \#define LINUX_VERSION_CODE $(shell                             \
- 	expr $(VERSION) \* 65536 + $(PATCHLEVEL) \* 256 + $(SUBLEVEL));     \
-+	echo \#define OPENZAURUS_RELEASE \"$(OPENZAURUS_RELEASE)\"; \
- 	echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';)
- endef
- 
diff --git a/packages/linux/linux-rp-2.6.18/collie-mcp-r1.patch b/packages/linux/linux-rp-2.6.18/collie-mcp-r1.patch
deleted file mode 100644
index a7b2342fd0..0000000000
--- a/packages/linux/linux-rp-2.6.18/collie-mcp-r1.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: linux-2.6.18/arch/arm/mach-sa1100/collie.c
-===================================================================
---- linux-2.6.18.orig/arch/arm/mach-sa1100/collie.c	2006-09-20 16:23:37.000000000 +0200
-+++ linux-2.6.18/arch/arm/mach-sa1100/collie.c	2006-09-20 16:23:38.000000000 +0200
-@@ -259,6 +259,11 @@
- 	GAFR |= GPIO_MCP_CLK;
- 	GPDR &= ~GPIO_MCP_CLK;
- 
-+	// Reset Codec
-+	GAFR &= ~COLLIE_GPIO_UCB1x00_RESET;
-+	GPDR |= COLLIE_GPIO_UCB1x00_RESET;
-+	GPSR |= COLLIE_GPIO_UCB1x00_RESET;
-+
- #ifdef CONFIG_PCMCIA_SA1100
- 	platform_scoop_config = &collie_pcmcia_config;
- #endif
diff --git a/packages/linux/linux-rp-2.6.18/connectplus-remove-ide-HACK.patch b/packages/linux/linux-rp-2.6.18/connectplus-remove-ide-HACK.patch
deleted file mode 100644
index 4414b21191..0000000000
--- a/packages/linux/linux-rp-2.6.18/connectplus-remove-ide-HACK.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Index: linux-2.6.13/drivers/ide/legacy/ide-cs.c
-===================================================================
---- linux-2.6.13.orig/drivers/ide/legacy/ide-cs.c	2005-09-01 22:43:46.000000000 +0100
-+++ linux-2.6.13/drivers/ide/legacy/ide-cs.c	2005-09-01 22:45:46.000000000 +0100
-@@ -488,7 +488,6 @@
- 	PCMCIA_DEVICE_PROD_ID123("KODAK Picture Card       ", "KODAK  ", "V100K", 0x94a0d8f3, 0xe4fc3ea0, 0xe5e7eed4),
- 	PCMCIA_DEVICE_PROD_ID1("STI Flash", 0xe4a13209),
- 	PCMCIA_DEVICE_PROD_ID12("STI", "Flash 5.0", 0xbf2df18d, 0x8cb57a0e),
--	PCMCIA_MFC_DEVICE_PROD_ID12(1, "SanDisk", "ConnectPlus", 0x7a954bd9, 0x74be00c6),
- 	PCMCIA_DEVICE_NULL,
- };
- MODULE_DEVICE_TABLE(pcmcia, ide_ids);
diff --git a/packages/linux/linux-rp-2.6.18/defconfig-akita b/packages/linux/linux-rp-2.6.18/defconfig-akita
deleted file mode 100644
index c56e81b602..0000000000
--- a/packages/linux/linux-rp-2.6.18/defconfig-akita
+++ /dev/null
@@ -1,1565 +0,0 @@
-#
-# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.16
-# Thu Mar 23 22:11:12 2006
-#
-CONFIG_ARM=y
-CONFIG_MMU=y
-CONFIG_RWSEM_GENERIC_SPINLOCK=y
-CONFIG_GENERIC_CALIBRATE_DELAY=y
-CONFIG_ARCH_MTD_XIP=y
-
-#
-# Code maturity level options
-#
-CONFIG_EXPERIMENTAL=y
-CONFIG_BROKEN_ON_SMP=y
-CONFIG_LOCK_KERNEL=y
-CONFIG_INIT_ENV_ARG_LIMIT=32
-
-#
-# General setup
-#
-CONFIG_LOCALVERSION=""
-CONFIG_LOCALVERSION_AUTO=y
-CONFIG_SWAP=y
-CONFIG_SYSVIPC=y
-# CONFIG_POSIX_MQUEUE is not set
-CONFIG_BSD_PROCESS_ACCT=y
-# CONFIG_BSD_PROCESS_ACCT_V3 is not set
-CONFIG_SYSCTL=y
-# CONFIG_AUDIT is not set
-# CONFIG_IKCONFIG is not set
-CONFIG_INITRAMFS_SOURCE=""
-CONFIG_UID16=y
-CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-CONFIG_EMBEDDED=y
-CONFIG_KALLSYMS=y
-# CONFIG_KALLSYMS_ALL is not set
-# CONFIG_KALLSYMS_EXTRA_PASS is not set
-CONFIG_HOTPLUG=y
-CONFIG_PRINTK=y
-CONFIG_BUG=y
-CONFIG_ELF_CORE=y
-CONFIG_BASE_FULL=y
-CONFIG_FUTEX=y
-CONFIG_EPOLL=y
-CONFIG_SHMEM=y
-CONFIG_CC_ALIGN_FUNCTIONS=0
-CONFIG_CC_ALIGN_LABELS=0
-CONFIG_CC_ALIGN_LOOPS=0
-CONFIG_CC_ALIGN_JUMPS=0
-CONFIG_SLAB=y
-# CONFIG_TINY_SHMEM is not set
-CONFIG_BASE_SMALL=0
-# CONFIG_SLOB is not set
-
-#
-# Loadable module support
-#
-CONFIG_MODULES=y
-CONFIG_MODULE_UNLOAD=y
-CONFIG_MODULE_FORCE_UNLOAD=y
-CONFIG_OBSOLETE_MODPARM=y
-# CONFIG_MODVERSIONS is not set
-# CONFIG_MODULE_SRCVERSION_ALL is not set
-CONFIG_KMOD=y
-
-#
-# Block layer
-#
-
-#
-# IO Schedulers
-#
-CONFIG_IOSCHED_NOOP=y
-CONFIG_IOSCHED_AS=y
-CONFIG_IOSCHED_DEADLINE=m
-CONFIG_IOSCHED_CFQ=m
-CONFIG_DEFAULT_AS=y
-# CONFIG_DEFAULT_DEADLINE is not set
-# CONFIG_DEFAULT_CFQ is not set
-# CONFIG_DEFAULT_NOOP is not set
-CONFIG_DEFAULT_IOSCHED="anticipatory"
-
-#
-# System Type
-#
-# CONFIG_ARCH_CLPS7500 is not set
-# CONFIG_ARCH_CLPS711X is not set
-# CONFIG_ARCH_CO285 is not set
-# CONFIG_ARCH_EBSA110 is not set
-# CONFIG_ARCH_FOOTBRIDGE is not set
-# CONFIG_ARCH_INTEGRATOR is not set
-# CONFIG_ARCH_IOP3XX is not set
-# CONFIG_ARCH_IXP4XX is not set
-# CONFIG_ARCH_IXP2000 is not set
-# CONFIG_ARCH_L7200 is not set
-CONFIG_ARCH_PXA=y
-# CONFIG_ARCH_RPC is not set
-# CONFIG_ARCH_SA1100 is not set
-# CONFIG_ARCH_S3C2410 is not set
-# CONFIG_ARCH_SHARK is not set
-# CONFIG_ARCH_LH7A40X is not set
-# CONFIG_ARCH_OMAP is not set
-# CONFIG_ARCH_VERSATILE is not set
-# CONFIG_ARCH_REALVIEW is not set
-# CONFIG_ARCH_IMX is not set
-# CONFIG_ARCH_H720X is not set
-# CONFIG_ARCH_AAEC2000 is not set
-# CONFIG_ARCH_AT91RM9200 is not set
-
-#
-# Intel PXA2xx Implementations
-#
-# CONFIG_ARCH_LUBBOCK is not set
-# CONFIG_MACH_MAINSTONE is not set
-# CONFIG_ARCH_PXA_IDP is not set
-CONFIG_PXA_SHARPSL=y
-# CONFIG_MACH_HX2750 is not set
-# CONFIG_PXA_SHARPSL_25x is not set
-CONFIG_PXA_SHARPSL_27x=y
-CONFIG_MACH_AKITA=y
-CONFIG_MACH_SPITZ=y
-CONFIG_MACH_BORZOI=y
-CONFIG_PXA27x=y
-# CONFIG_PXA_KEYS is not set
-CONFIG_IWMMXT=y
-CONFIG_PXA_SHARP_Cxx00=y
-CONFIG_PXA_SSP=y
-
-#
-# Processor Type
-#
-CONFIG_CPU_32=y
-CONFIG_CPU_XSCALE=y
-CONFIG_CPU_32v5=y
-CONFIG_CPU_ABRT_EV5T=y
-CONFIG_CPU_CACHE_VIVT=y
-CONFIG_CPU_TLB_V4WBI=y
-
-#
-# Processor Features
-#
-CONFIG_ARM_THUMB=y
-CONFIG_XSCALE_PMU=y
-CONFIG_KEXEC=y
-CONFIG_SHARP_PARAM=y
-CONFIG_SHARPSL_PM=y
-CONFIG_SHARP_SCOOP=y
-
-#
-# Bus support
-#
-
-#
-# PCCARD (PCMCIA/CardBus) support
-#
-CONFIG_PCCARD=y
-# CONFIG_PCMCIA_DEBUG is not set
-CONFIG_PCMCIA=y
-CONFIG_PCMCIA_LOAD_CIS=y
-CONFIG_PCMCIA_IOCTL=y
-
-#
-# PC-card bridges