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

1 files changed, 25 insertions, 28 deletions

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."
 }