[oe-commits] org.oe.dev package_deb.bbclass: Update apt.conf location (from poky)

[rpurdie commit]

package_deb.bbclass: Update apt.conf location (from poky)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 4e11ae888ef9a24373e696b3cd581aab1009b46d
ViewMTN: http://monotone.openembedded.org/revision/info/4e11ae888ef9a24373e696b3cd581aab1009b46d
Files:
1
classes/package_deb.bbclass
Diffs:

#
# mt diff -r7389f2e99d76aac4eac93cb8bb1442c12e9d61bc -r4e11ae888ef9a24373e696b3cd581aab1009b46d
#
# 
# 
# patch "classes/package_deb.bbclass"
#  from [7d3c717409e185acf693d9654d2623edca784403]
#    to [e1c18789aa0e0ad6a1e1faafbefb41e9b69e22de]
# 
============================================================
--- classes/package_deb.bbclass	7d3c717409e185acf693d9654d2623edca784403
+++ classes/package_deb.bbclass	e1c18789aa0e0ad6a1e1faafbefb41e9b69e22de
@@ -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')))