diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-02-29 15:59:47 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-02-29 15:59:47 +0000 |
| commit | d8618d0ce0ee1bf7ad72efac9cbf5626a2897698 (patch) | |
| tree | fc29126a2695526378cef852bc57bf7b6d219df5 /classes/package_deb.bbclass | |
| parent | 5a362b4bb805986fbb4a5e0aee08d23b62d84b05 (diff) | |
| parent | 5e33f4db5f153d6b3e3cc9c75523e9ce9288e396 (diff) | |
merge of '7ebcf65940382b7ebea258189704cb0e4a77dc70'
and 'ae9980c1d055e682beb2fea6cfddb080c495b43b'
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'))) |