diff options
| author |   Richard Purdie <richard@openedhand.com> | 2007-11-12 11:11:48 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-11-12 11:11:48 +0000 |
| commit | 19c7b21fbcb513391b78d14596ccae5a67775c68 (patch) | |
| tree | 380aba662f26dca95eee15467ad7c06041429d0c /meta | |
| parent | b17670211a86799c101394dcaa7f1ed88758ddde (diff) | |
| download | openembedded-core-19c7b21fbcb513391b78d14596ccae5a67775c68.tar.gz | |
package_deb.bbclass: Fix hardcoded apt.conf path, add depends on run-postinsts package for deb images
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3118 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/package_deb.bbclass | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index b85ffe254f..ce4d5c914c 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass @@ -4,8 +4,8 @@ inherit package -BOOTSTRAP_EXTRA_RDEPENDS += "dpkg" -DISTRO_EXTRA_RDEPENDS += "dpkg" +BOOTSTRAP_EXTRA_RDEPENDS += "dpkg run-postinsts" +DISTRO_EXTRA_RDEPENDS += "dpkg run-postinsts" IMAGE_PKGTYPE ?= "deb" # Map TARGET_ARCH to Debian's ideas about architectures @@ -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) @@ -54,8 +54,8 @@ python do_package_deb_install () { # env of the fork+execve'd processs # Set up environment - apt_config = os.getenv('APT_CONFIG') - os.putenv('APT_CONFIG', os.path.join(stagingdir, 'etc', 'apt', 'apt.conf')) + apt_config_backup = os.getenv('APT_CONFIG') + os.putenv('APT_CONFIG', apt_config) 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) } |