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 f4a881a..2c085be 100644 (file)
--- 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":