package_{ipk|deb}.bbclass: Remove hardcoded install path reference

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3224 311d38ba-8fff-0310-9ca6-ca027cbcb966

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index a5b850d8ad4a90a4efe2e36b087d7d3a7d5fcf0c..eb8895e64adecb1f10f640abd3211bdd2b93eeb2 100644 (file)
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -69,7 +69,7 @@ python do_package_deb_install () {
 }
 
 python do_package_deb () {
-    import sys, re, fcntl, copy
+    import sys, re, copy
 
     workdir = bb.data.getVar('WORKDIR', d, 1)
     if not workdir:
@@ -104,7 +104,8 @@ python do_package_deb () {
 
     for pkg in packages.split():
         localdata = bb.data.createCopy(d)
-        root = "%s/install/%s" % (workdir, pkg)
+        pkgdest = bb.data.getVar('PKGDEST', d, 1)
+        root = "%s/%s" % (pkgdest, pkg)
 
         lf = bb.utils.lockfile(root + ".lock")
 

diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index e69745665f0d050d7f9328b7d4354cccc941f5e5..6dceb284bccf4452d09ba916baae6ea87fe3fd39 100644 (file)
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -115,7 +115,7 @@ package_generate_ipkg_conf () {
 }
 
 python do_package_ipk () {
-       import sys, re, fcntl, copy
+       import sys, re, copy
 
        workdir = bb.data.getVar('WORKDIR', d, 1)
        if not workdir:
@@ -154,7 +154,8 @@ python do_package_ipk () {
 
        for pkg in packages.split():
                localdata = bb.data.createCopy(d)
-               root = "%s/install/%s" % (workdir, pkg)
+               pkgdest = bb.data.getVar('PKGDEST', d, 1)
+               root = "%s/%s" % (pkgdest, pkg)
 
                lf = bb.utils.lockfile(root + ".lock")