diff options
| author | Robert Schuster <thebohemian@gmx.net> | 2008-03-04 16:46:11 +0000 |
|---|---|---|
| committer | Robert Schuster <thebohemian@gmx.net> | 2008-03-04 16:46:11 +0000 |
| commit | ba69123b245d6244b756a07f7118bfb11acb47f0 (patch) | |
| tree | 6c0f87cbb91fb142e9b748fdc2628e8390f5edd0 /classes/package_deb.bbclass | |
| parent | 25fe9599d951a3de39a2e8983810f2c6a40d74b0 (diff) | |
| parent | b1fbc8c1b11f8c30bf327b4605defac0a3d47457 (diff) | |
merge of '1d06736abd89e6b42d2eaf5918fcd17ad518fcb3'
and '3601bc2cdb1e980ccaf4f1de781d948df8d45545'
Diffstat (limited to 'classes/package_deb.bbclass')
| -rw-r--r-- | classes/package_deb.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass index 1a3622c3bb..22b6166685 100644 --- a/classes/package_deb.bbclass +++ b/classes/package_deb.bbclass @@ -28,7 +28,7 @@ python do_package_deb_install () { pkgfn = bb.data.getVar('PKGFN', d, 1) rootfs = bb.data.getVar('IMAGE_ROOTFS', d, 1) debdir = bb.data.getVar('DEPLOY_DIR_DEB', d, 1) - stagingdir = bb.data.getVar('STAGING_DIR', d, 1) + apt_config = bb.data.expand('${STAGING_ETCDIR_NATIVE}/apt/apt.conf', d) stagingbindir = bb.data.getVar('STAGING_BINDIR_NATIVE', d, 1) tmpdir = bb.data.getVar('TMPDIR', d, 1) @@ -55,7 +55,7 @@ python do_package_deb_install () { # Set up environment apt_config_backup = os.getenv('APT_CONFIG') - os.putenv('APT_CONFIG', os.path.join(stagingdir, 'etc', 'apt', 'apt.conf')) + os.putenv('APT_CONFIG', apt_config) path = os.getenv('PATH') os.putenv('PATH', '%s:%s' % (stagingbindir, os.getenv('PATH'))) |