summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Lauer <mickey@vanille-media.de>2005-04-23 07:19:15 +0000
committerMichael Lauer <mickey@vanille-media.de>2005-04-23 07:19:15 +0000
commitc49a71d2caa63a221aef1188e6a737491498110a (patch)
treeac7470826192c74693c30d3c8f48f5f8cc309027
parentaeb4695cff0ee8e1dfc787ba68837d1dd5074099 (diff)
revert 1.3269.1.1 and achieve the same using OVERRIDES
BKrev: 4269f6f3otos6ZpOnL0jQy335oqASQ
-rw-r--r--packages/pcmcia-cs/pcmcia-cs-3.2.8/spitz/ide.opts (renamed from packages/pcmcia-cs/pcmcia-cs-3.2.8/ide.opts.spitz)0
-rw-r--r--packages/pcmcia-cs/pcmcia-cs_3.2.8.bb17
2 files changed, 4 insertions, 13 deletions
diff --git a/packages/pcmcia-cs/pcmcia-cs-3.2.8/ide.opts.spitz b/packages/pcmcia-cs/pcmcia-cs-3.2.8/spitz/ide.opts
index e69de29bb2..e69de29bb2 100644
--- a/packages/pcmcia-cs/pcmcia-cs-3.2.8/ide.opts.spitz
+++ b/packages/pcmcia-cs/pcmcia-cs-3.2.8/spitz/ide.opts
diff --git a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
index 7c1bb8476d..2aa41a6c32 100644
--- a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
+++ b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
@@ -3,7 +3,7 @@ SECTION = "base"
PRIORITY = "required"
LICENSE = "GPL"
DEPENDS = "virtual/kernel"
-PR = "r18"
+PR = "r19"
SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \
file://busybox.patch;patch=1 \
@@ -13,12 +13,11 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/pcmcia-cs/pcmcia-cs-${PV}.tar.gz \
file://ratoc-cfu1u.patch;patch=1 \
file://pcmcia \
file://ide.opts \
- file://ide.opts.spitz \
file://wireless.opts \
file://network.conf \
file://wnv.conf"
-SRC_URI_append_spitz += " file://nocleanup.patch;patch=1"
+SRC_URI_append_spitz = " file://nocleanup.patch;patch=1"
S = "${WORKDIR}/pcmcia-cs-${PV}"
INITSCRIPT_NAME = "pcmcia"
@@ -82,16 +81,8 @@ do_install() {
# ensure that config.opts always exists, albeit empty
echo >> ${D}${sysconfdir}/pcmcia/config.opts
-
- case ${MACHINE} in
- spitz)
- install -m 0644 ${WORKDIR}/ide.opts.spitz \
- ${D}${sysconfdir}/pcmcia/ide.opts
- ;;
- *)
- install -m 0644 ${WORKDIR}/ide.opts ${D}${sysconfdir}/pcmcia/
- ;;
- esac
+
+ install -m 0644 ${WORKDIR}/ide.opts ${D}${sysconfdir}/pcmcia/
install -m 0644 ${WORKDIR}/wireless.opts ${D}${sysconfdir}/pcmcia/
for i in etc/cis/*; do
install -m 0644 $i ${D}${sysconfdir}/pcmcia/cis/