From dba2b89720b0318a28ebe7778294873b9353f71d Mon Sep 17 00:00:00 2001
From: "nslu2-linux.adm@bkbits.net" <nslu2-linux.adm@bkbits.net>
Date: Wed, 23 Feb 2005 12:47:30 +0000
Subject: 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
---
 packages/python/python-pymp3_0.3.4.bb         | 10 +++++-----
 packages/python/python-pyqt_3.13.bb           |  4 ++--
 packages/python/python-pyqwt_3.10.bb          |  4 ++--
 packages/python/python-quicklauncher_0.0.1.bb |  8 ++++----
 packages/python/python-scapy_0.9.17.bb        |  4 ++--
 packages/python/python-sip_4.1.1.bb           |  4 ++--
 6 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'packages/python')

diff --git a/packages/python/python-pymp3_0.3.4.bb b/packages/python/python-pymp3_0.3.4.bb
index 000bb9712f..a4b5bf4223 100644
--- a/packages/python/python-pymp3_0.3.4.bb
+++ b/packages/python/python-pymp3_0.3.4.bb
@@ -12,17 +12,17 @@ PY_FILES = "box_info.py layer.py sound_ctrl.py stack.py txt_tools.py"
 
 do_install() {
 
-   install -d ${D}/${libdir}
-   install -d ${D}/${libdir}/${PYTHON_DIR}
-   install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages
+   install -d ${D}${libdir}
+   install -d ${D}${libdir}/${PYTHON_DIR}
+   install -d ${D}${libdir}/${PYTHON_DIR}/site-packages
 
    for f in ${PY_FILES}
    do
       install -m 0644 $f ${D}${libdir}/${PYTHON_DIR}/site-packages/
    done
 
-   install -d ${D}/${bindir}
-   install -m 755 pymp3 ${D}/${bindir}/
+   install -d ${D}${bindir}
+   install -m 755 pymp3 ${D}${bindir}/
 }
 
 FILES_${PN} += " ${libdir}/${PYTHON_DIR}/site-packages/"
diff --git a/packages/python/python-pyqt_3.13.bb b/packages/python/python-pyqt_3.13.bb
index a1cc6a6bfb..bddc1dca95 100644
--- a/packages/python/python-pyqt_3.13.bb
+++ b/packages/python/python-pyqt_3.13.bb
@@ -46,10 +46,10 @@ do_stage() {
 }
 
 do_install() {
-    install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages/
+    install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/
     for module in ${SIP_MODULES}
     do
-	install -m 0755 ${module}/lib${module}.so ${D}/${libdir}/${PYTHON_DIR}/site-packages/${module}.so
+	install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/${module}.so
     done
 }
 
diff --git a/packages/python/python-pyqwt_3.10.bb b/packages/python/python-pyqwt_3.10.bb
index c39661bd28..8677ed05ea 100644
--- a/packages/python/python-pyqwt_3.10.bb
+++ b/packages/python/python-pyqwt_3.10.bb
@@ -54,10 +54,10 @@ do_stage() {
 }
 
 do_install() {
-    install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages/
+    install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/
     for module in ${SIP_MODULES}
     do
-        install -m 0755 ${module}/lib${module}.so ${D}/${libdir}/${PYTHON_DIR}/site-packages/${module}.so
+        install -m 0755 ${module}/lib${module}.so ${D}${libdir}/${PYTHON_DIR}/site-packages/${module}.so
     done
 }
 
diff --git a/packages/python/python-quicklauncher_0.0.1.bb b/packages/python/python-quicklauncher_0.0.1.bb
index aa294caeee..c675a2f0fc 100644
--- a/packages/python/python-quicklauncher_0.0.1.bb
+++ b/packages/python/python-quicklauncher_0.0.1.bb
@@ -18,10 +18,10 @@ do_compile() {
 #
 
 do_install() {
-	install -d ${D}/${libdir}/${PYTHON_DIR}/
-	install -m 0755 quicklauncher.py ${D}/${libdir}/${PYTHON_DIR}/
-	install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages/quicklauncher/
-	install -m 0755 testapp.py ${D}/${libdir}/${PYTHON_DIR}/site-packages/quicklauncher/
+	install -d ${D}${libdir}/${PYTHON_DIR}/
+	install -m 0755 quicklauncher.py ${D}${libdir}/${PYTHON_DIR}/
+	install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/quicklauncher/
+	install -m 0755 testapp.py ${D}${libdir}/${PYTHON_DIR}/site-packages/quicklauncher/
 }
  
 
diff --git a/packages/python/python-scapy_0.9.17.bb b/packages/python/python-scapy_0.9.17.bb
index 278fc88a86..d90875f75e 100644
--- a/packages/python/python-scapy_0.9.17.bb
+++ b/packages/python/python-scapy_0.9.17.bb
@@ -13,8 +13,8 @@ SRC_URI = "http://www.cartel-securite.fr/pbiondi/python/scapy-${PV}.tar.gz"
 S = "${WORKDIR}/${SRCNAME}-${PV}"
 
 do_install() {
-	install -d ${D}/${libdir}/${PYTHON_DIR}
-	install -m 0755 ${S}/scapy.py ${D}/${libdir}/${PYTHON_DIR}/
+	install -d ${D}${libdir}/${PYTHON_DIR}
+	install -m 0755 ${S}/scapy.py ${D}${libdir}/${PYTHON_DIR}/
 }
 
 FILES_${PN} = "${libdir}/${PYTHON_DIR}/"
diff --git a/packages/python/python-sip_4.1.1.bb b/packages/python/python-sip_4.1.1.bb
index cc600c691c..5a402d3aee 100644
--- a/packages/python/python-sip_4.1.1.bb
+++ b/packages/python/python-sip_4.1.1.bb
@@ -34,8 +34,8 @@ do_stage() {
 }
 
 do_install() {
-	install -d ${D}/${libdir}/${PYTHON_DIR}/site-packages/
-	install libsip.so.1.0.0 ${D}/${libdir}/${PYTHON_DIR}/site-packages/sip.so
+	install -d ${D}${libdir}/${PYTHON_DIR}/site-packages/
+	install libsip.so.1.0.0 ${D}${libdir}/${PYTHON_DIR}/site-packages/sip.so
 }
 
 FILES_${PN} = "${libdir}/${PYTHON_DIR}/site-packages/sip.so"
-- 
cgit v1.2.3