[oe-commits] Richard Purdie : package.bbclass: Remove hardcoded use of PKGDEST variable (from Poky)

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: c41e3631d31a1932fcbb0098eab0520f90711cc3
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=c41e3631d31a1932fcbb0098eab0520f90711cc3

Author: Richard Purdie <rpurdie at linux.intel.com>
Date:   Thu Oct 29 23:42:11 2009 +0000

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

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

---

 classes/package.bbclass |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/classes/package.bbclass b/classes/package.bbclass
index f4a881a..2c085be 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":