diff options
| author | Richard Purdie <richard@openedhand.com> | 2007-11-24 23:05:05 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-11-24 23:05:05 +0000 |
| commit | 1d01a5ef0098de42aac7334a6794d83f91d1f637 (patch) | |
| tree | d411280da8959f821f24d01e77a8891eabf7f63a | |
| parent | 62a3ee38ed1076de75d40f56c757098b6c219810 (diff) | |
| download | openembedded-core-1d01a5ef0098de42aac7334a6794d83f91d1f637.tar.gz openembedded-core-1d01a5ef0098de42aac7334a6794d83f91d1f637.tar.bz2 openembedded-core-1d01a5ef0098de42aac7334a6794d83f91d1f637.zip | |
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
| -rw-r--r-- | meta/classes/package_deb.bbclass | 5 | ||||
| -rw-r--r-- | meta/classes/package_ipk.bbclass | 5 |
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 () { } 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 e69745665f..6dceb284bc 100644 --- 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") |