summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-11-12 11:11:48 +0000
committerRichard Purdie <richard@openedhand.com>2007-11-12 11:11:48 +0000
commit19c7b21fbcb513391b78d14596ccae5a67775c68 (patch)
tree380aba662f26dca95eee15467ad7c06041429d0c /meta
parentb17670211a86799c101394dcaa7f1ed88758ddde (diff)
downloadpoky-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.bbclass12
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 @@
4 4
5inherit package 5inherit package
6 6
7BOOTSTRAP_EXTRA_RDEPENDS += "dpkg" 7BOOTSTRAP_EXTRA_RDEPENDS += "dpkg run-postinsts"
8DISTRO_EXTRA_RDEPENDS += "dpkg" 8DISTRO_EXTRA_RDEPENDS += "dpkg run-postinsts"
9IMAGE_PKGTYPE ?= "deb" 9IMAGE_PKGTYPE ?= "deb"
10 10
11# Map TARGET_ARCH to Debian's ideas about architectures 11# Map TARGET_ARCH to Debian's ideas about architectures
@@ -28,7 +28,7 @@ python do_package_deb_install () {
28 pkgfn = bb.data.getVar('PKGFN', d, 1) 28 pkgfn = bb.data.getVar('PKGFN', d, 1)
29 rootfs = bb.data.getVar('IMAGE_ROOTFS', d, 1) 29 rootfs = bb.data.getVar('IMAGE_ROOTFS', d, 1)
30 debdir = bb.data.getVar('DEPLOY_DIR_DEB', d, 1) 30 debdir = bb.data.getVar('DEPLOY_DIR_DEB', d, 1)
31 stagingdir = bb.data.getVar('STAGING_DIR', d, 1) 31 apt_config = bb.data.expand('${STAGING_ETCDIR_NATIVE}/apt/apt.conf', d)
32 stagingbindir = bb.data.getVar('STAGING_BINDIR_NATIVE', d, 1) 32 stagingbindir = bb.data.getVar('STAGING_BINDIR_NATIVE', d, 1)
33 tmpdir = bb.data.getVar('TMPDIR', d, 1) 33 tmpdir = bb.data.getVar('TMPDIR', d, 1)
34 34
@@ -54,8 +54,8 @@ python do_package_deb_install () {
54 # env of the fork+execve'd processs 54 # env of the fork+execve'd processs
55 55
56 # Set up environment 56 # Set up environment
57 apt_config = os.getenv('APT_CONFIG') 57 apt_config_backup = os.getenv('APT_CONFIG')
58 os.putenv('APT_CONFIG', os.path.join(stagingdir, 'etc', 'apt', 'apt.conf')) 58 os.putenv('APT_CONFIG', apt_config)
59 path = os.getenv('PATH') 59 path = os.getenv('PATH')
60 os.putenv('PATH', '%s:%s' % (stagingbindir, os.getenv('PATH'))) 60 os.putenv('PATH', '%s:%s' % (stagingbindir, os.getenv('PATH')))
61 61
@@ -64,7 +64,7 @@ python do_package_deb_install () {
64 commands.getstatusoutput('apt-get install -y %s' % pkgfn) 64 commands.getstatusoutput('apt-get install -y %s' % pkgfn)
65 65
66 # revert environment 66 # revert environment
67 os.putenv('APT_CONFIG', apt_config) 67 os.putenv('APT_CONFIG', apt_config_backup)
68 os.putenv('PATH', path) 68 os.putenv('PATH', path)
69} 69}
70 70