Merge bk://oe-devel.bkbits.net/openembedded

into bkbits.net:/repos/n/nslu2-linux/openembedded

2005/02/23 12:40:33+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 12:36:37+01:00 uni-frankfurt.de!mickeyl
Merge bk://oe-devel@oe-devel.bkbits.net/openembedded
into gandalf.tm.informatik.uni-frankfurt.de:/local/pkg/oe/packages

2005/02/23 11:34:13+01:00 mn-solutions.de!schurig
Merge http://oe-devel@openembedded.bkbits.net/openembedded
into mnz66.mn-solutions.de:/usr/src/oe/p

2005/02/23 11:33:31+01:00 mn-solutions.de!schurig
fix installation stage

2005/02/23 09:27:44+00:00 (none)!xora
New upstream version of kismet, fixes for compilation problems, and change of maintainer with Brunos permission

2005/02/23 01:11:25+01:00 uni-frankfurt.de!mickeyl
add a sharprom-compatible distro configuration. relies on an external 2.95.3 toolchain (for now... until someone adds it to OE) and needs further work. It's a start for someone interested though.

2005/02/23 01:09:23+01:00 uni-frankfurt.de!mickeyl
bump cvsdate on oz-3.5.3

2005/02/22 17:37:44-06:00 ti.com!kergoth
Fix the quilt PATCHCMD to stop rampantly chmod'ing, which made the CVS directories not executable, thereby screwing up the ability to rm -rf tmp.  Thanks to holger freyther for pointing it out.

BKrev: 421c7b62hBWfitoVhb3IO3ZT5nS71A

1 files changed, 16 insertions, 16 deletions

diff --git a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
index 4f4a437bc5..6b3895a046 100644
--- a/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
+++ b/packages/pcmcia-cs/pcmcia-cs_3.2.8.bb
@@ -58,36 +58,36 @@ INSTALL_ETC_DATA =     "config config.opts ftl.opts ieee1394.opts memory.opts ne
 INSTALL_ETC_DATA_arm = "config             ftl.opts ieee1394.opts memory.opts network.opts parport.opts scsi.opts serial.opts shared"
 
 do_install() {
-	install -d ${D}/${sbindir}
+	install -d ${D}${sbindir}
 	for f in cardmgr/cardctl cardmgr/cardmgr cardmgr/ide_info cardmgr/ifport cardmgr/ifuser cardmgr/pcinitrd flash/ftl_check flash/ftl_format
 	do
-		install -m 0755 $f ${D}/${sbindir}/
+		install -m 0755 $f ${D}${sbindir}/
 	done
-	install -d ${D}/${sysconfdir}/init.d \
-		   ${D}/${sysconfdir}/pcmcia \
-		   ${D}/${sysconfdir}/pcmcia/cis
+	install -d ${D}${sysconfdir}/init.d \
+		   ${D}${sysconfdir}/pcmcia \
+		   ${D}${sysconfdir}/pcmcia/cis
 
-	install -m 0644 ${WORKDIR}/network.conf ${D}/${sysconfdir}/pcmcia/
-	install -m 0644 ${WORKDIR}/wnv.conf ${D}/${sysconfdir}/pcmcia/
+	install -m 0644 ${WORKDIR}/network.conf ${D}${sysconfdir}/pcmcia/
+	install -m 0644 ${WORKDIR}/wnv.conf ${D}${sysconfdir}/pcmcia/
 
 	for i in ${INSTALL_ETC}; do
-		install -m 0755 etc/${i} ${D}/${sysconfdir}/pcmcia/
+		install -m 0755 etc/${i} ${D}${sysconfdir}/pcmcia/
 	done
 	for i in ${INSTALL_ETC_DATA}; do
-		install -m 0644 etc/${i} ${D}/${sysconfdir}/pcmcia/
+		install -m 0644 etc/${i} ${D}${sysconfdir}/pcmcia/
 	done
 
 	# ensure that config.opts always exists, albeit empty
-	echo >> ${D}/${sysconfdir}/pcmcia/config.opts
+	echo >> ${D}${sysconfdir}/pcmcia/config.opts
 
-	install -m 0644 ${WORKDIR}/ide.opts ${D}/${sysconfdir}/pcmcia/
-	install -m 0644 ${WORKDIR}/wireless.opts ${D}/${sysconfdir}/pcmcia/
+	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/
+		install -m 0644 $i ${D}${sysconfdir}/pcmcia/cis/
 	done
-	install -m 0755 etc/rc.pcmcia ${D}/${sysconfdir}/init.d/pcmcia
-	install -d ${D}/${sysconfdir}/sysconfig
-	install -m 0755 ${WORKDIR}/pcmcia ${D}/${sysconfdir}/sysconfig/pcmcia
+	install -m 0755 etc/rc.pcmcia ${D}${sysconfdir}/init.d/pcmcia
+	install -d ${D}${sysconfdir}/sysconfig
+	install -m 0755 ${WORKDIR}/pcmcia ${D}${sysconfdir}/sysconfig/pcmcia
 }
 
 PACKAGES =+ "${PN}-ftl ${PN}-pcinitrd"