From: Richard Purdie <rpurdie@linux.intel.com>
Date: Thu, 29 Oct 2009 23:42:11 +0000 (+0000)
Subject: package.bbclass: Remove hardcoded use of PKGDEST variable (from Poky)
X-Git-Tag: Release-2010-05/1~1728^2~26^2~8^2~6
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c41e3631d31a1932fcbb0098eab0520f90711cc3;p=openembedded.git

package.bbclass: Remove hardcoded use of PKGDEST variable (from Poky)

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---

diff --git a/classes/package.bbclass b/classes/package.bbclass
index f4a881ab57..2c085be797 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -517,6 +517,7 @@ python emit_pkgdata() {
  		return
 
 	packages = bb.data.getVar('PACKAGES', d, True)
+	pkgdest = bb.data.getVar('PKGDEST', d, 1)
 	pkgdatadir = bb.data.getVar('PKGDATA_DIR', d, True)
 
 	pstageactive = bb.data.getVar('PSTAGING_ACTIVE', d, True)
@@ -560,7 +561,7 @@ python emit_pkgdata() {
 		allow_empty = bb.data.getVar('ALLOW_EMPTY_%s' % pkg, d, True)
 		if not allow_empty:
 			allow_empty = bb.data.getVar('ALLOW_EMPTY', d, True)
-		root = "%s/install/%s" % (workdir, pkg)
+		root = "%s/%s" % (pkgdest, pkg)
 		os.chdir(root)
 		g = glob('*') + glob('.[!.]*')
 		if g or allow_empty == "1":