summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2012-08-13 20:57:20 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-08-17 18:04:22 +0100
commit0348e2c1c2b1b96b57d9f96f2f8c988dbd7fcb9a (patch)
treed27f399e90fee8d12a10a10800c74048508de583
parent54b4c50a60ad3a4ce05604c77d9b811e2fd0410b (diff)
downloadpoky-0348e2c1c2b1b96b57d9f96f2f8c988dbd7fcb9a.tar.gz
apt-native 0.7.14: remove an extra line from apt.conf
There is an additional "};" at the end of apt.conf, remove it. [YOCTO #2495] (From OE-Core rev: 2d6d2549676bb6a84a049f41d6ed31107efc28ad) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/apt/apt-native_0.7.14.bb2
-rw-r--r--meta/recipes-devtools/apt/files/apt.conf1
2 files changed, 1 insertions, 2 deletions
diff --git a/meta/recipes-devtools/apt/apt-native_0.7.14.bb b/meta/recipes-devtools/apt/apt-native_0.7.14.bb
index 46f39f5c6c..d4513cae72 100644
--- a/meta/recipes-devtools/apt/apt-native_0.7.14.bb
+++ b/meta/recipes-devtools/apt/apt-native_0.7.14.bb
@@ -1,6 +1,6 @@
1require apt-native.inc 1require apt-native.inc
2 2
3PR = "r10" 3PR = "r11"
4 4
5SRC_URI += "file://nodoc.patch \ 5SRC_URI += "file://nodoc.patch \
6 file://noconfigure.patch \ 6 file://noconfigure.patch \
diff --git a/meta/recipes-devtools/apt/files/apt.conf b/meta/recipes-devtools/apt/files/apt.conf
index ab7a5db492..5c20ea43e6 100644
--- a/meta/recipes-devtools/apt/files/apt.conf
+++ b/meta/recipes-devtools/apt/files/apt.conf
@@ -40,4 +40,3 @@ APT
40}; 40};
41 41
42DPkg::Options {"--root=#ROOTFS#";"--admindir=#ROOTFS#/var/lib/dpkg";"--force-all";"--no-debsig"}; 42DPkg::Options {"--root=#ROOTFS#";"--admindir=#ROOTFS#/var/lib/dpkg";"--force-all";"--no-debsig"};
43};