[oe-commits] org.oe.dev apt: sync apt.conf with Poky

[koen commit]

apt: sync apt.conf with Poky

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 851b7587e1fa45e2c94b76c9b276389109102904
ViewMTN: http://monotone.openembedded.org/revision.psp?id=851b7587e1fa45e2c94b76c9b276389109102904
Files:
1
packages/apt/apt_0.6.46.2.bb
packages/apt/files/apt.conf
Diffs:

#
# mt diff -r96c89697a31faf6f30771ae8ae482326a4daf0c7 -r851b7587e1fa45e2c94b76c9b276389109102904
#
# 
# 
# patch "packages/apt/apt_0.6.46.2.bb"
#  from [ef36cfeb12b1c71655baec7da011e9a3354a12a6]
#    to [385fd9a20abac5dfb1c4419a595bb5eedb71885b]
# 
# patch "packages/apt/files/apt.conf"
#  from [7b2848cac0bb01a55a7135209cfd9cb9d669e16d]
#    to [a11cde2c27f3b4a221c40eeca244e9a87cdf1a09]
# 
============================================================
--- packages/apt/apt_0.6.46.2.bb	ef36cfeb12b1c71655baec7da011e9a3354a12a6
+++ packages/apt/apt_0.6.46.2.bb	385fd9a20abac5dfb1c4419a595bb5eedb71885b
@@ -1,7 +1,6 @@ require apt.inc
 require apt.inc
 
-SRC_URI += "file://autofoo.patch;patch=1 \
-            file://nodoc.patch;patch=1"
+SRC_URI += "file://nodoc.patch;patch=1"
 
 require apt-package.inc
 
============================================================
--- packages/apt/files/apt.conf	7b2848cac0bb01a55a7135209cfd9cb9d669e16d
+++ packages/apt/files/apt.conf	a11cde2c27f3b4a221c40eeca244e9a87cdf1a09
@@ -21,6 +21,10 @@ Dir "${STAGING_DIR}/"
       apt-get "apt-get";
       apt-cache "apt-cache";
    };
+   Etc "etc/apt/"
+   {
+      Preferences "preferences";
+   };
 };
 
 APT