diff options
| author |   Richard Purdie <rpurdie@rpsys.net> | 2008-02-28 13:30:58 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2008-02-28 13:30:58 +0000 |
| commit | ae34dd31f15536b14493dcb91eba0209f3e18bd0 (patch) | |
| tree | d9088513117e17e81ed5a400122f4d1ab66d455a /classes/package_deb.bbclass | |
| parent | def428fe2497719bd7dd6405df2fe8c5f1f63bca (diff) | |
| download | openembedded-ae34dd31f15536b14493dcb91eba0209f3e18bd0.tar.gz | |
package_deb.bbclass: Update apt.conf location (from poky)
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'))) |