From 2b8f679ffe5929b5a11eb71e514aa4997c36f13e Mon Sep 17 00:00:00 2001
From: Chris Larson <clarson@kergoth.com>
Date: Sat, 22 May 2004 16:47:36 +0000
Subject: 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
---
orinoco/orinoco-modules_0.13e.oe | 7 ++++---
orinoco/orinoco-modules_0.15rc1.oe | 5 +++--
2 files changed, 7 insertions(+), 5 deletions(-)
(limited to 'orinoco')
diff --git a/orinoco/orinoco-modules_0.13e.oe b/orinoco/orinoco-modules_0.13e.oe
index 613b3171f9..01d44e5907 100644
--- a/orinoco/orinoco-modules_0.13e.oe
+++ b/orinoco/orinoco-modules_0.13e.oe
@@ -6,14 +6,15 @@ MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
SRC_URI = "http://ozlabs.org/people/dgibson/dldwd/orinoco-${PV}.tar.gz; \
- file://${FILESDIR}/crosscompile.patch;patch=1 \
- file://${FILESDIR}/monitor-${PV}.patch;patch=1"
+ file://crosscompile.patch;patch=1 \
+ file://monitor-${PV}.patch;patch=1 \
+ file://spectrum*"
S = "${WORKDIR}/orinoco-${PV}"
inherit module
do_compile_prepend() {
- cp -f ${FILESDIR}/spectrum* ${S}/
+ cp -f ${WORKDIR}/spectrum* ${S}/
}
do_install() {
diff --git a/orinoco/orinoco-modules_0.15rc1.oe b/orinoco/orinoco-modules_0.15rc1.oe
index 6c286fe722..8c3ef93c68 100644
--- a/orinoco/orinoco-modules_0.15rc1.oe
+++ b/orinoco/orinoco-modules_0.15rc1.oe
@@ -5,7 +5,8 @@ PRIORITY = "optional"
MAINTAINER = "Michael Lauer <mickey@Vanille.de>"
LICENSE = "GPL"
-SRC_URI = "${SOURCEFORGE_MIRROR}/orinoco/orinoco-${PV}.tar.gz"
+SRC_URI = "${SOURCEFORGE_MIRROR}/orinoco/orinoco-${PV}.tar.gz \
+ file://spectrum.conf"
S = "${WORKDIR}/orinoco-${PV}"
inherit module
@@ -14,6 +15,6 @@ do_install() {
install -d ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless
install -d ${D}/etc/pcmcia
install -m 0755 *.o ${D}/lib/modules/${KERNEL_VERSION}/kernel/drivers/net/wireless/
- install -m 0644 ${FILESDIR}/spectrum.conf ${D}/etc/pcmcia/
+ install -m 0644 ${WORKDIR}/spectrum.conf ${D}/etc/pcmcia/
install -m 0644 hermes.conf ${D}/etc/pcmcia/
}
--
cgit v1.2.3