[oe-commits] org.oe.dev 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
rpurdie commit
openembedded-commits at lists.openembedded.org
Tue Feb 19 13:10:41 UTC 2008
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
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: d9be4ea229c0ac3022e5e107015a099065a27b49
ViewMTN: http://monotone.openembedded.org/revision/info/d9be4ea229c0ac3022e5e107015a099065a27b49
Files:
1
classes/package_deb.bbclass
Diffs:
#
# mt diff -rf3c7be1b4cefd49a2e1b97802167fd924377266b -rd9be4ea229c0ac3022e5e107015a099065a27b49
#
#
#
# patch "classes/package_deb.bbclass"
# from [6692f0e4d021d1a8fe65a65b2185415b80dc4237]
# to [7d3c717409e185acf693d9654d2623edca784403]
#
============================================================
--- classes/package_deb.bbclass 6692f0e4d021d1a8fe65a65b2185415b80dc4237
+++ classes/package_deb.bbclass 7d3c717409e185acf693d9654d2623edca784403
@@ -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 () {
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 () {
More information about the Openembedded-commits
mailing list