Merges.

2004/05/22 12:46:48-04:00 local!kergoth
Bugfixes per the recent FILESDIR cleanup.

2004/05/22 01:03:38-04:00 local!kergoth
Run a perl script against the repo to kill off direct FILESDIR usage
in favor of relative file:// paths in SRC_URI, and WORKDIR references
in functions.

2004/05/21 23:07:58-04:00 local!kergoth
Switch file:// FILESDIR uris in SRC_URI to the new relative path format.

BKrev: 40af8428aNyDLBX0MRtyso3VCpMv1w

12 files changed, 211 insertions, 110 deletions

diff --git a/linux/gumstix_2.6.5-gnalm1-gum0.oe b/linux/gumstix_2.6.5-gnalm1-gum0.oe
index e69de29bb2..bae18ef450 100644
--- a/linux/gumstix_2.6.5-gnalm1-gum0.oe
+++ b/linux/gumstix_2.6.5-gnalm1-gum0.oe
@@ -0,0 +1,25 @@
+DESCRIPTION = "Linux kernel for OMAP processors"
+LICENSE = "GPL"
+
+# NOTE: pulled local linux-2.6.5-gnalm1, since it didn't apply cleanly
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.5.tar.bz2 \
+           file://linux-2.6.5-gnalm1.patch;patch=1 \
+           http://gumstix.superlucidity.net/downloads/kernel/patches/linux-2.6.5-gnalm1-gum0.patch;patch=1 \
+           file://defconfig"
+S = "${WORKDIR}/linux-2.6.5"
+
+inherit kernel
+
+KERNEL_IMAGETYPE = "zImage"
+
+do_configure_prepend() {
+	oe_machinstall -m 0644 ${WORKDIR}/defconfig ${S}/.config || die "no default configuration for ${MACHINE} available."
+        oe_runmake oldconfig
+}
+
+python __anonymous () {
+	import re
+	host = oe.data.getVar('HOST_SYS', d, 1)
+	if not re.match('arm.*-linux', host):
+		raise oe.parse.SkipPackage("incompatible with host %s" % host)
+}
diff --git a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.9.oe b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.9.oe
index ac148fa327..4566c12497 100644
--- a/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.9.oe
+++ b/linux/handhelds-pxa_2.4.19-rmk6-pxa1-hh36.9.oe
@@ -7,8 +7,8 @@ KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')} \
-	   file://${FILESDIR}/linux-2.4-no-short-loads.patch;patch=1 \
-	   file://${FILESDIR}/linux-2.4-cpufreq.patch;patch=1"
+	   file://linux-2.4-no-short-loads.patch;patch=1 \
+	   file://linux-2.4-cpufreq.patch;patch=1"
 
 S = "${WORKDIR}/kernel"
 
diff --git a/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.8.oe b/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.8.oe
index 385b616e71..e8aa500b26 100644
--- a/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.8.oe
+++ b/linux/handhelds-sa_2.4.19-rmk6-pxa1-hh36.8.oe
@@ -10,7 +10,7 @@ FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/handhelds-sa-${PV}"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=linux/kernel;tag=${@'K' + oe.data.getVar('PV',d,1).replace('.', '-')}    \
            \
-           file://${FILESDIR}/mkdep.patch;patch=1"
+           file://mkdep.patch;patch=1"
 
 S = "${WORKDIR}/kernel"
 
diff --git a/linux/linux-bast_2.4.25-vrs1-bast1.oe b/linux/linux-bast_2.4.25-vrs1-bast1.oe
index 1781b2246f..b7aaf451ec 100644
--- a/linux/linux-bast_2.4.25-vrs1-bast1.oe
+++ b/linux/linux-bast_2.4.25-vrs1-bast1.oe
@@ -6,10 +6,11 @@ KERNEL_CCSUFFIX = "-3.3.3"
 COMPATIBLE_HOST = "arm.*-linux"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
-	   ftp://ftp.arm.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-2.4.25-vrs1.bz2;patch=1 \
-	   http://www.simtec.co.uk/products/SWLINUX/files/patch-2.4.25-vrs1-bast1.bz2;patch=1 \
-	   file://${FILESDIR}/defconfig \
-	   file://${FILESDIR}/mkdep.patch;patch=1"
+           ftp://ftp.arm.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-2.4.25-vrs1.bz2;patch=1 \
+           http://www.simtec.co.uk/products/SWLINUX/files/patch-2.4.25-vrs1-bast1.bz2;patch=1 \
+           file://defconfig \
+           file://mkdep.patch;patch=1 \
+           file://defconfig"
 S = "${WORKDIR}/linux-${KV}"
 
 inherit kernel
@@ -17,5 +18,5 @@ inherit kernel
 KERNEL_IMAGETYPE = "zImage"
 
 do_configure_prepend() {
-	cp ${FILESDIR}/defconfig ${S}/.config
+	cp ${WORKDIR}/defconfig ${S}/.config
 }
diff --git a/linux/linux-epia_2.6.5.oe b/linux/linux-epia_2.6.5.oe
index 3df615ebcc..d0cad17f52 100644
--- a/linux/linux-epia_2.6.5.oe
+++ b/linux/linux-epia_2.6.5.oe
@@ -1,7 +1,8 @@
 DESCRIPTION = "Linux kernel for VIA EPiA"
 LICENSE = "GPL"
 
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2"
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
+           file://epia_defconfig"
 S = "${WORKDIR}/linux-${PV}"
 
 COMPATIBLE_HOST = 'i.86.*-linux'
@@ -12,5 +13,5 @@ ARCH = "i386"
 KERNEL_IMAGETYPE = "bzImage"
 
 do_configure_prepend() {
-	install -m 0644 ${FILESDIR}/epia_defconfig ${S}/.config
+	install -m 0644 ${WORKDIR}/epia_defconfig ${S}/.config
 }
diff --git a/linux/mnci-ramses-2.4.21-rmk2-pxa1.oe b/linux/mnci-ramses-2.4.21-rmk2-pxa1.oe
index 5a60f4b3d8..57fcc8dbd8 100644
--- a/linux/mnci-ramses-2.4.21-rmk2-pxa1.oe
+++ b/linux/mnci-ramses-2.4.21-rmk2-pxa1.oe
@@ -9,46 +9,46 @@ DESCRIPTION = "Linux kernel for MNCI device"
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
 	   ftp://ftp.arm.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-${KV}-rmk${RMKV}.gz;patch=1 \
 	   ftp://source.mvista.com/pub/xscale/pxa/diff-${KV}-rmk${RMKV}-pxa${PXAV}.gz;patch=1 \
-	   file://${FILESDIR}/linux-vtcomparison.patch;patch=1		\
-           file://${FILESDIR}/linux-iw241_we16-6.patch;patch=1		\
-           file://${FILESDIR}/linux-mkdep.patch;patch=1			\
-           file://${FILESDIR}/arm-noshortloads.patch;patch=1		\
-           file://${FILESDIR}/arm-tiocmmodembits.patch;patch=1		\
-           file://${FILESDIR}/pxa-pcmcia.patch;patch=1			\
-           file://${FILESDIR}/pxa-smc91x.patch;patch=1			\
-           file://${FILESDIR}/pxa-usb.patch;patch=1			\
-           file://${FILESDIR}/pxa-usbeth.patch;patch=1			\
-           file://${FILESDIR}/pxa-irda.patch;patch=1			\
-           file://${FILESDIR}/pxa-ac97.patch;patch=1			\
-           file://${FILESDIR}/pxa-timerint.patch;patch=1		\
-           file://${FILESDIR}/fb-buffered.patch;patch=1			\
-           file://${FILESDIR}/fb-turn180.patch;patch=1			\
-           file://${FILESDIR}/i2c-ds1337.patch;patch=1			\
-           file://${FILESDIR}/keyb-input.patch;patch=1			\
-           file://${FILESDIR}/keyb-module.patch;patch=1			\
-           file://${FILESDIR}/logo-noscrollregion.patch;patch=1		\
-           file://${FILESDIR}/net-dhcp-timeout.patch;patch=1		\
-           file://${FILESDIR}/pm.patch;patch=1				\
-           file://${FILESDIR}/swap-performance.patch.patch;patch=1	\
-           file://${FILESDIR}/small-nocramdisk.patch;patch=1		\
-           file://${FILESDIR}/smc91x-ethtool.patch;patch=1		\
-           file://${FILESDIR}/ucb1x00.patch;patch=1			\
-           file://${FILESDIR}/vmalloc.patch;patch=1			\
-           file://${FILESDIR}/orinoco-cvs.patch;patch=1			\
-           file://${FILESDIR}/usb-sl811.patch;patch=1			\
-           file://${FILESDIR}/ramses.patch;patch=1			\
-           file://${FILESDIR}/ramses-ac97.patch;patch=1			\
-           file://${FILESDIR}/ramses-keyb.patch;patch=1			\
-           file://${FILESDIR}/ramses-mtd.patch;patch=1			\
-           file://${FILESDIR}/ramses-orinoco-ignorecis.patch;patch=1	\
-           file://${FILESDIR}/ramses-pcmcia.patch;patch=1		\
-           file://${FILESDIR}/ramses-serial.patch;patch=1		\
-           file://${FILESDIR}/ramses-smc91x.patch;patch=1		\
-           file://${FILESDIR}/ramses-sysctl.patch;patch=1		\
-           file://${FILESDIR}/ramses-ucb1x00-dejitter.patch;patch=1	\
-           file://${FILESDIR}/ramses-lcd.patch;patch=1			\
-           file://${FILESDIR}/ramses-usb.patch;patch=1			\
-           file://${FILESDIR}/wedge.patch;patch=1"
+	   file://linux-vtcomparison.patch;patch=1		\
+           file://linux-iw241_we16-6.patch;patch=1		\
+           file://linux-mkdep.patch;patch=1			\
+           file://arm-noshortloads.patch;patch=1		\
+           file://arm-tiocmmodembits.patch;patch=1		\
+           file://pxa-pcmcia.patch;patch=1			\
+           file://pxa-smc91x.patch;patch=1			\
+           file://pxa-usb.patch;patch=1			\
+           file://pxa-usbeth.patch;patch=1			\
+           file://pxa-irda.patch;patch=1			\
+           file://pxa-ac97.patch;patch=1			\
+           file://pxa-timerint.patch;patch=1		\
+           file://fb-buffered.patch;patch=1			\
+           file://fb-turn180.patch;patch=1			\
+           file://i2c-ds1337.patch;patch=1			\
+           file://keyb-input.patch;patch=1			\
+           file://keyb-module.patch;patch=1			\
+           file://logo-noscrollregion.patch;patch=1		\
+           file://net-dhcp-timeout.patch;patch=1		\
+           file://pm.patch;patch=1				\
+           file://swap-performance.patch.patch;patch=1	\
+           file://small-nocramdisk.patch;patch=1		\
+           file://smc91x-ethtool.patch;patch=1		\
+           file://ucb1x00.patch;patch=1			\
+           file://vmalloc.patch;patch=1			\
+           file://orinoco-cvs.patch;patch=1			\
+           file://usb-sl811.patch;patch=1			\
+           file://ramses.patch;patch=1			\
+           file://ramses-ac97.patch;patch=1			\
+           file://ramses-keyb.patch;patch=1			\
+           file://ramses-mtd.patch;patch=1			\
+           file://ramses-orinoco-ignorecis.patch;patch=1	\
+           file://ramses-pcmcia.patch;patch=1		\
+           file://ramses-serial.patch;patch=1		\
+           file://ramses-smc91x.patch;patch=1		\
+           file://ramses-sysctl.patch;patch=1		\
+           file://ramses-ucb1x00-dejitter.patch;patch=1	\
+           file://ramses-lcd.patch;patch=1			\
+           file://ramses-usb.patch;patch=1			\
+           file://wedge.patch;patch=1"
 
 S = "${WORKDIR}/linux-${KV}"
 
diff --git a/linux/omap_2.6.5-omap1.oe b/linux/omap_2.6.5-omap1.oe
index e69de29bb2..d35dfced88 100644
--- a/linux/omap_2.6.5-omap1.oe
+++ b/linux/omap_2.6.5-omap1.oe
@@ -0,0 +1,23 @@
+DESCRIPTION = "Linux kernel for OMAP processors"
+LICENSE = "GPL"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-2.6.5.tar.bz2 \
+           http://www.muru.com/linux/omap/patches/patch-2.6.5-omap1.bz2;patch=1 \
+           file://defconfig"
+S = "${WORKDIR}/linux-2.6.5"
+
+inherit kernel
+
+KERNEL_IMAGETYPE = "zImage"
+
+do_configure_prepend() {
+	oe_machinstall -m 0644 ${WORKDIR}/defconfig ${S}/.config || die "no default configuration for ${MACHINE} available."
+        oe_runmake oldconfig
+}
+
+python __anonymous () {
+	import re
+	host = oe.data.getVar('HOST_SYS', d, 1)
+	if not re.match('arm.*-linux', host):
+		raise oe.parse.SkipPackage("incompatible with host %s" % host)
+}
diff --git a/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe b/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe
index 735c3ca724..bdfd9780b4 100644
--- a/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe
+++ b/linux/opensimpad_2.4.25-vrs2-pxa1-jpm1.oe
@@ -7,18 +7,17 @@ PXAV = "${@oe.data.getVar('PV',d,True).split('-')[2]}"
 JPMV = "${@oe.data.getVar('PV',d,True).split('-')[3]}"
 
 SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
-           file://${FILESDIR}/${KV}-${VRSV}.patch;patch=1                 \
-           file://${FILESDIR}/${KV}-${VRSV}-${PXAV}.patch;patch=1         \
-           file://${FILESDIR}/${KV}-${VRSV}-${PXAV}-${JPMV}.patch;patch=1 \
-           \
-           file://${FILESDIR}/scrolling-area.patch;patch=1                \
-           file://${FILESDIR}/sound-volume-reversed.patch;patch=1         \
-           \
-           file://${FILESDIR}/mkdep.patch;patch=1"
+           file://${KV}-${VRSV}.patch;patch=1 \
+           file://${KV}-${VRSV}-${PXAV}.patch;patch=1 \
+           file://${KV}-${VRSV}-${PXAV}-${JPMV}.patch;patch=1 \
+           file://scrolling-area.patch;patch=1 \
+           file://sound-volume-reversed.patch;patch=1 \
+           file://mkdep.patch;patch=1 \
+           file://defconfig-${MACHINE}"
 
 # apply this when we have a patch that allows building with gcc 3.x:
-# SRC_URI_append = file://${FILESDIR}/gcc-3.3.patch;patch=1
-# SRC_URI_append = file://${FILESDIR}/machtune-args.patch;patch=1
+# SRC_URI_append = file://gcc-3.3.patch;patch=1
+# SRC_URI_append = file://machtune-args.patch;patch=1
 
 S = "${WORKDIR}/linux-${KV}"
 
@@ -34,7 +33,7 @@ export CMDLINE = "mtdparts=sa1100:512k(boot),1m(kernel),-(root) console=ttySA ro
 EXTRA_OEMAKE = ""
 
 do_configure() {
-        install -m 0644 ${FILESDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
+        install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
 
         mem=${MEM}
         rd=${RD}
diff --git a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe
index c90d559c5b..f0143f41c3 100644
--- a/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe
+++ b/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.oe
@@ -7,36 +7,33 @@ SHARPV = "20031107"
 DESCRIPTION = "Linux kernel for OpenZaurus PXA processor based devices."
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"
 
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2                                           \
-           ftp://ftp.arm.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-${KV}-rmk${RMKV}.gz;patch=1     \
-           ftp://source.mvista.com/pub/xscale/pxa/diff-${KV}-rmk${RMKV}-pxa${PXAV}.gz;patch=1                       \
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
+           ftp://ftp.arm.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-${KV}-rmk${RMKV}.gz;patch=1 \
+           ftp://source.mvista.com/pub/xscale/pxa/diff-${KV}-rmk${RMKV}-pxa${PXAV}.gz;patch=1 \
            http://developer.ezaurus.com/sl_j/source/c860/${SHARPV}/linux-${PV}-slc860-${SHARPV}-rom1_10.bz2;patch=1 \
-           \
-           file://${FILESDIR}/piro.patch;patch=1                               \
-           file://${FILESDIR}/swap-performance.patch;patch=1                   \
-           \
-           file://${FILESDIR}/bluetooth-2.4.18-mh11.patch;patch=1              \
-           file://${FILESDIR}/iw_handlers.w13-5.diff;patch=1                   \
-           file://${FILESDIR}/iw_handlers.w14-5.diff;patch=1                   \
-           file://${FILESDIR}/iw240_we15-6.diff;patch=1                        \
-           \
-           file://${FILESDIR}/bt950_cs.patch;patch=1                       \
-           file://${FILESDIR}/bluecard_cs.patch;patch=1                    \
-           file://${FILESDIR}/sharpsl_battery.patch;patch=1                \
-           file://${FILESDIR}/irda-qos.patch;patch=1                       \
-           \
-           file://${FILESDIR}/buffered-fbmem.patch;patch=1            \
-           file://${FILESDIR}/enable-sysrq.patch;patch=1              \
-           file://${FILESDIR}/compile.patch;patch=1                   \
-           file://${FILESDIR}/idecs.patch;patch=1                     \
-           file://${FILESDIR}/logo.patch;patch=1                      \
-           file://${FILESDIR}/initsh.patch;patch=1                    \
-           file://${FILESDIR}/keyboard-ctrl+alt.patch;patch=1         \
-           file://${FILESDIR}/keymap-more-sane.patch;patch=1          \
-           file://${FILESDIR}/mkdep.patch;patch=1"
+           file://piro.patch;patch=1 \
+           file://swap-performance.patch;patch=1 \
+           file://bluetooth-2.4.18-mh11.patch;patch=1 \
+           file://iw_handlers.w13-5.diff;patch=1 \
+           file://iw_handlers.w14-5.diff;patch=1 \
+           file://iw240_we15-6.diff;patch=1 \
+           file://bt950_cs.patch;patch=1 \
+           file://bluecard_cs.patch;patch=1 \
+           file://sharpsl_battery.patch;patch=1 \
+           file://irda-qos.patch;patch=1 \
+           file://buffered-fbmem.patch;patch=1 \
+           file://enable-sysrq.patch;patch=1 \
+           file://compile.patch;patch=1 \
+           file://idecs.patch;patch=1 \
+           file://logo.patch;patch=1 \
+           file://initsh.patch;patch=1 \
+           file://keyboard-ctrl+alt.patch;patch=1 \
+           file://keymap-more-sane.patch;patch=1 \
+           file://mkdep.patch;patch=1 \
+           file://defconfig-${MACHINE}"
 
 # apply this when we have a kernel that builds with gcc 3.x:
-# SRC_URI_append = file://${FILESDIR}/machtune-args.patch;patch=1
+# SRC_URI_append = file://machtune-args.patch;patch=1
 
 S = "${WORKDIR}/linux"
 
@@ -54,5 +51,5 @@ KERNEL_LDSUFFIX = "-2.11.2"
 COMPATIBLE_HOST = "arm.*-linux"
 
 do_configure_prepend() {
-	install -m 0644 ${FILESDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
+	install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
 }
diff --git a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
index 0ae13b6119..7ca76ab7fe 100644
--- a/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
+++ b/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.oe
@@ -8,24 +8,22 @@ DESCRIPTION = "Linux kernel for OpenZaurus StrongArm processor based devices."
 
 FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/openzaurus-sa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"
 
-SRC_URI = "http://aurach.ewu.edu/ield_software/ch5/ROM3.10_stuff/linux-sl5500-${SHARPV}-rom3_10.tar.bz2      \
-           \
-           file://${FILESDIR}/cacko.patch;patch=1                     \
-           file://${FILESDIR}/battery.patch;patch=1                   \
-           \
-           file://${FILESDIR}/bluetooth-patch-2.4.18-mh9.diff;patch=1 \
-           file://${FILESDIR}/iw_handlers.w13-5.diff;patch=1          \
-           file://${FILESDIR}/iw_handlers.w14-5.diff;patch=1          \
-           file://${FILESDIR}/iw240_we15-6.diff;patch=1               \
-           \
-           file://${FILESDIR}/idecs.patch;patch=1                     \
-           file://${FILESDIR}/logo.patch;patch=1                      \
-           file://${FILESDIR}/initsh.patch;patch=1                    \
-           file://${FILESDIR}/mkdep.patch;patch=1"
+SRC_URI = "http://aurach.ewu.edu/ield_software/ch5/ROM3.10_stuff/linux-sl5500-${SHARPV}-rom3_10.tar.bz2 \
+           file://cacko.patch;patch=1 \
+           file://battery.patch;patch=1 \
+           file://bluetooth-patch-2.4.18-mh9.diff;patch=1 \
+           file://iw_handlers.w13-5.diff;patch=1 \
+           file://iw_handlers.w14-5.diff;patch=1 \
+           file://iw240_we15-6.diff;patch=1 \
+           file://idecs.patch;patch=1 \
+           file://logo.patch;patch=1 \
+           file://initsh.patch;patch=1 \
+           file://mkdep.patch;patch=1 \
+           file://defconfig-${MACHINE}"
 
 # apply this when we have a patch that allows building with gcc 3.x:
-# SRC_URI_append = file://${FILESDIR}/gcc-3.3.patch;patch=1
-# SRC_URI_append = file://${FILESDIR}/machtune-args.patch;patch=1
+# SRC_URI_append = file://gcc-3.3.patch;patch=1
+# SRC_URI_append = file://machtune-args.patch;patch=1
 
 S = "${WORKDIR}/linux"
 
@@ -50,7 +48,7 @@ export RD = "32"
 export CMDLINE = "console=ttySA root=/dev/mtdblock4 rootfstype=jffs2 jffs2_orphand_inodes=delete"
 
 do_configure_prepend() {
-        install -m 0644 ${FILESDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
+        install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
 
         mem=${MEM}
         rd=${RD}
diff --git a/linux/openzaurus-tosa_2.4.18-rmk7-pxa3-embedix20040311.oe b/linux/openzaurus-tosa_2.4.18-rmk7-pxa3-embedix20040311.oe
index e69de29bb2..30ccbff071 100644
--- a/linux/openzaurus-tosa_2.4.18-rmk7-pxa3-embedix20040311.oe
+++ b/linux/openzaurus-tosa_2.4.18-rmk7-pxa3-embedix20040311.oe
@@ -0,0 +1,56 @@
+PV = "2.4.18-rmk7-pxa3-embedix"
+LICENSE = "GPL"
+KV = "2.4.18"
+RMKV = "7"
+PXAV = "3"
+SHARPV = "20040311"
+DESCRIPTION = "Linux kernel for OpenZaurus PXA processor based devices."
+FILESDIR = "${@os.path.dirname(oe.data.getVar('FILE',d,1))}/openzaurus-pxa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"
+
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.4/linux-${KV}.tar.bz2 \
+           ftp://ftp.arm.linux.org.uk/pub/armlinux/source/kernel-patches/v2.4/patch-${KV}-rmk${RMKV}.gz;patch=1 \
+           ftp://source.mvista.com/pub/xscale/pxa/diff-${KV}-rmk${RMKV}-pxa${PXAV}.gz;patch=1 \
+           http://developer.ezaurus.com/sl_j/source/6000/${SHARPV}/linux-${PV}-sl6000-${SHARPV}-rom1_11.bz2;patch=1 \
+           file://piro.patch;patch=1 \
+           file://swap-performance.patch;patch=1 \
+           file://bluetooth-2.4.18-mh11.patch;patch=1 \
+           file://iw_handlers.w13-5.diff;patch=1 \
+           file://iw_handlers.w14-5.diff;patch=1 \
+           file://iw240_we15-6.diff;patch=1 \
+           file://bt950_cs.patch;patch=1 \
+           file://bluecard_cs.patch;patch=1 \
+           file://sharpsl_battery.patch;patch=1 \
+           file://irda-qos.patch;patch=1 \
+           file://buffered-fbmem.patch;patch=1 \
+           file://enable-sysrq.patch;patch=1 \
+           file://compile.patch;patch=1 \
+           file://idecs.patch;patch=1 \
+           file://logo.patch;patch=1 \
+           file://initsh.patch;patch=1 \
+           file://keyboard-ctrl+alt.patch;patch=1 \
+           file://keymap-more-sane.patch;patch=1 \
+           file://mkdep.patch;patch=1 \
+           file://logo-lang-link-fix.patch;patch=1 \
+           file://defconfig-${MACHINE}"
+
+# apply this when we have a kernel that builds with gcc 3.x:
+# SRC_URI_append = file://machtune-args.patch;patch=1
+
+S = "${WORKDIR}/linux"
+
+inherit kernel
+
+#
+# Compensate for sucky bootloader on all Sharp Zaurus models
+#
+FILES_kernel = ""
+ALLOW_EMPTY = 1
+
+EXTRA_OEMAKE = ""
+KERNEL_CCSUFFIX = "-2.95"
+KERNEL_LDSUFFIX = "-2.11.2"
+COMPATIBLE_HOST = "arm.*-linux"
+
+do_configure_prepend() {
+	install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
+}
diff --git a/linux/openzaurus_2.6.5-jl3.oe b/linux/openzaurus_2.6.5-jl3.oe
index 31fbdc9e2a..49d9cfbd66 100644
--- a/linux/openzaurus_2.6.5-jl3.oe
+++ b/linux/openzaurus_2.6.5-jl3.oe
@@ -2,8 +2,10 @@ DESCRIPTION = "Linux kernel for Zaurus devices."
 LICENSE = "GPL"
 KV = "${@oe.data.getVar('PV',d,True).split('-')[0]}"
 
-SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${KV}.tar.bz2               \
-	   http://www.cs.wisc.edu/~lenz/zaurus/files/patch-${PV}.diff.gz;patch=1    "
+SRC_URI = "ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-${KV}.tar.bz2 \
+           http://www.cs.wisc.edu/~lenz/zaurus/files/patch-${PV}.diff.gz;patch=1 \
+           file://defconfig-collie \
+           file://defconfig-shepherd"
 S = "${WORKDIR}/linux-${KV}"
 
 inherit kernel
@@ -18,7 +20,7 @@ export CMDLINE = "noinitrd root=/dev/mtdblock2 rootfstype=jffs2 console=tty0 jff
 EXTRA_OEMAKE = ""
 
 do_configure() {
-        install -m 0644 ${FILESDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
+        install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
 
         mem=${MEM}
         rd=${RD}
@@ -43,4 +45,3 @@ do_compile() {
         unset CFLAGS CPPFLAGS CXXFLAGS LDFLAGS
         oe_runmake
 }
-