diff options
| author | John Lee <john_lee@openmoko.org> | 2008-02-29 10:18:28 +0000 |
|---|---|---|
| committer | Openmoko anonymizer key <devel@lists.openmoko.org> | 2008-02-29 10:18:28 +0000 |
| commit | 022ac4bfbd6d85f4accbd23f18138a10b2e9f0de (patch) | |
| tree | 1a6d1e12611c2b3a341f3293af95c8575edc3c4e /classes/package_deb.bbclass | |
| parent | fe6f8c336429aa31e9b3a74ecd9f1e8a320a8a07 (diff) | |
| parent | 1e4b78b265763e2b2d0d430f62b86aab5826a48e (diff) | |
merge of 'a694034ad4f05ead506bab01c8f41ffa116d5f5d'
and 'e1563879f370dd02713e036ee932bb571cce4bc4'
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'))) |