From: Chris Larson <clarson@kergoth.com>
Date: Mon, 13 Sep 2004 19:21:20 +0000 (+0000)
Subject: Merge openembedded@openembedded.bkbits.net:packages
X-Git-Tag: Release-2010-05/1~17209
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7ea0a8a7b1bde4a2f7c15e064b824462b4633930;p=openembedded.git

Merge openembedded@openembedded.bkbits.net:packages
into handhelds.org:/home/kergoth/code/oe/packages

2004/09/13 15:21:13-04:00 handhelds.org!kergoth
Non-native packages installing to ${STAGING_BINDIR} is BAD. BAD. BAD.

BKrev: 4145f330GvlJOniJtO51hVM7yT9AYA
---

diff --git a/ipkg-utils/ipkg-utils-native_1.6cvs.oe b/ipkg-utils/ipkg-utils-native_1.6cvs.oe
index b8c3f763f6..349593d99c 100644
--- a/ipkg-utils/ipkg-utils-native_1.6cvs.oe
+++ b/ipkg-utils/ipkg-utils-native_1.6cvs.oe
@@ -1,11 +1,10 @@
 include ipkg-utils_${PV}.oe
-PR = "r2"
+PR = "r3"
 inherit native
 DEPENDS = "python-native"
 
 do_stage() {
         for i in ${INSTALL}; do
-                install $i ${STAGING_BINDIR}
+                install -m 0755 $i ${STAGING_BINDIR}
         done
 }
-
diff --git a/ipkg-utils/ipkg-utils_1.6cvs.oe b/ipkg-utils/ipkg-utils_1.6cvs.oe
index d25f098864..f73b52a423 100644
--- a/ipkg-utils/ipkg-utils_1.6cvs.oe
+++ b/ipkg-utils/ipkg-utils_1.6cvs.oe
@@ -7,7 +7,7 @@ LICENSE = "GPL"
 CONFLICTS = "ipkg-link"
 RDEPENDS = "python"
 PV_append = "${CVSDATE}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=ipkg-utils \
 	   file://fix-ipkg-link.patch;patch=1"
@@ -19,13 +19,6 @@ do_compile() {
 	oe_runmake ipkg-compare-versions
 }
 
-do_stage() {
-	for i in ${INSTALL}
-	do
-		install -m 0755 $i ${STAGING_BINDIR}
-	done
-}
-
 do_install() {
 	install -d ${D}${bindir}
 	for i in ${INSTALL}