aboutsummaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2008-02-19 12:21:57 +0000
committerRichard Purdie <rpurdie@rpsys.net>2008-02-19 12:21:57 +0000
commitfe7f68a8201ffd272cb2abd9bf6b6c2a8cf0e172 (patch)
treeae2caa182d46369fd27e45192c4425f5183ce9ae /classes
parent695ca19882ed557a40fd39c9d5252af105190eac (diff)
downloadopenembedded-fe7f68a8201ffd272cb2abd9bf6b6c2a8cf0e172.tar.gz
openembedded-fe7f68a8201ffd272cb2abd9bf6b6c2a8cf0e172.tar.bz2
openembedded-fe7f68a8201ffd272cb2abd9bf6b6c2a8cf0e172.zip
package_deb.bbclass: Tweaks from poky - use PKGDEST, don't clobber any existing do_package_write_deb depends and only set when PACKAGES isn't empty
Diffstat (limited to 'classes')
-rw-r--r--classes/package_deb.bbclass12
1 files changed, 8 insertions, 4 deletions
diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass
index c550c2fbff..1a3622c3bb 100644
--- a/classes/package_deb.bbclass
+++ b/classes/package_deb.bbclass
@@ -54,7 +54,7 @@ python do_package_deb_install () {
# env of the fork+execve'd processs
# Set up environment
- apt_config = os.getenv('APT_CONFIG')
+ apt_config_backup = os.getenv('APT_CONFIG')
os.putenv('APT_CONFIG', os.path.join(stagingdir, 'etc', 'apt', 'apt.conf'))
path = os.getenv('PATH')
os.putenv('PATH', '%s:%s' % (stagingbindir, os.getenv('PATH')))
@@ -64,7 +64,7 @@ python do_package_deb_install () {
commands.getstatusoutput('apt-get install -y %s' % pkgfn)
# revert environment
- os.putenv('APT_CONFIG', apt_config)
+ os.putenv('APT_CONFIG', apt_config_backup)
os.putenv('PATH', path)
}
@@ -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")
@@ -265,7 +266,10 @@ python do_package_deb () {
python () {
import bb
if bb.data.getVar('PACKAGES', d, True) != '':
- bb.data.setVarFlag('do_package_write_deb', 'depends', 'dpkg-native:do_populate_staging fakeroot-native:do_populate_staging', d)
+ deps = (bb.data.getVarFlag('do_package_write_deb', 'depends', d) or "").split()
+ deps.append('dpkg-native:do_populate_staging')
+ deps.append('fakeroot-native:do_populate_staging')
+ bb.data.setVarFlag('do_package_write_deb', 'depends', " ".join(deps), d)
}
python do_package_write_deb () {