From: Richard Purdie <rpurdie@linux.intel.com>
Date: Thu, 29 Oct 2009 23:41:48 +0000 (+0000)
Subject: package.bbclass: Remove hardcoded use of PKGDEST variable
X-Git-Tag: 2011-1~6868
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=0eee29e45161195663ccf5a795aada97257f1832;p=openembedded-core.git

package.bbclass: Remove hardcoded use of PKGDEST variable

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

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index ca23cc6472..7928fe9f6b 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -454,6 +454,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)
@@ -497,7 +498,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('*')
 		if g or allow_empty == "1":