summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package_deb.bbclass5
-rw-r--r--meta/classes/package_ipk.bbclass5
2 files changed, 6 insertions, 4 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index a5b850d8ad..eb8895e64a 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -69,7 +69,7 @@ python do_package_deb_install () {
69} 69}
70 70
71python do_package_deb () { 71python do_package_deb () {
72 import sys, re, fcntl, copy 72 import sys, re, copy
73 73
74 workdir = bb.data.getVar('WORKDIR', d, 1) 74 workdir = bb.data.getVar('WORKDIR', d, 1)
75 if not workdir: 75 if not workdir:
@@ -104,7 +104,8 @@ python do_package_deb () {
104 104
105 for pkg in packages.split(): 105 for pkg in packages.split():
106 localdata = bb.data.createCopy(d) 106 localdata = bb.data.createCopy(d)
107 root = "%s/install/%s" % (workdir, pkg) 107 pkgdest = bb.data.getVar('PKGDEST', d, 1)
108 root = "%s/%s" % (pkgdest, pkg)
108 109
109 lf = bb.utils.lockfile(root + ".lock") 110 lf = bb.utils.lockfile(root + ".lock")
110 111
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index e69745665f..6dceb284bc 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -115,7 +115,7 @@ package_generate_ipkg_conf () {
115} 115}
116 116
117python do_package_ipk () { 117python do_package_ipk () {
118 import sys, re, fcntl, copy 118 import sys, re, copy
119 119
120 workdir = bb.data.getVar('WORKDIR', d, 1) 120 workdir = bb.data.getVar('WORKDIR', d, 1)
121 if not workdir: 121 if not workdir:
@@ -154,7 +154,8 @@ python do_package_ipk () {
154 154
155 for pkg in packages.split(): 155 for pkg in packages.split():
156 localdata = bb.data.createCopy(d) 156 localdata = bb.data.createCopy(d)
157 root = "%s/install/%s" % (workdir, pkg) 157 pkgdest = bb.data.getVar('PKGDEST', d, 1)
158 root = "%s/%s" % (pkgdest, pkg)
158 159
159 lf = bb.utils.lockfile(root + ".lock") 160 lf = bb.utils.lockfile(root + ".lock")
160 161