From c49a71d2caa63a221aef1188e6a737491498110a Mon Sep 17 00:00:00 2001
From: Michael Lauer <mickey@vanille-media.de>
Date: Sat, 23 Apr 2005 07:19:15 +0000
Subject: revert 1.3269.1.1 and achieve the same using OVERRIDES

BKrev: 4269f6f3otos6ZpOnL0jQy335oqASQ
---
 packages/pcmcia-cs/pcmcia-cs-3.2.8/ide.opts.spitz |  0
 packages/pcmcia-cs/pcmcia-cs-3.2.8/spitz/ide.opts |  0
 packages/pcmcia-cs/pcmcia-cs_3.2.8.bb             | 17 ++++-------------
 3 files changed, 4 insertions(+), 13 deletions(-)
 delete mode 100644 packages/pcmcia-cs/pcmcia-cs-3.2.8/ide.opts.spitz
 create mode 100644 packages/pcmcia-cs/pcmcia-cs-3.2.8/spitz/ide.opts

(limited to 'packages/pcmcia-cs')

diff --git a/packages/pcmcia-cs/pcmcia-cs-3.2.8/ide.opts.spitz b/packages/pcmcia-cs/pcmcia-cs-3.2.8/ide.opts.spitz
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/packages/pcmcia-cs/pcmcia-cs-3.2.8/spitz/ide.opts b/packages/pcmcia-cs/pcmcia-cs-3.2.8/spitz/ide.opts
new file mode 100644
index 0000000000..e69de29bb2
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/
-- 
cgit v1.2.3