summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-21 22:45:44 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-22 16:54:37 +0000
commit0b679927feee2ecfd77a32df0d29dec83ae0a32f (patch)
treeee080f6c8d9bba4e741f010fe6dbc53c3bbdf31c
parent659441212688bc6eb23b8506f2eca4346748cc10 (diff)
downloadpoky-0b679927feee2ecfd77a32df0d29dec83ae0a32f.tar.gz
apt: Fix case where ${B} != ${S}
Need to reference objects from ${B}. (From OE-Core rev: 0610cf3ef864acc9ca98498b9810bcce0fbb935a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/apt/apt-native.inc10
-rw-r--r--meta/recipes-devtools/apt/apt-package.inc12
-rw-r--r--meta/recipes-devtools/apt/apt.inc4
3 files changed, 13 insertions, 13 deletions
diff --git a/meta/recipes-devtools/apt/apt-native.inc b/meta/recipes-devtools/apt/apt-native.inc
index a29e98633d..294ca94096 100644
--- a/meta/recipes-devtools/apt/apt-native.inc
+++ b/meta/recipes-devtools/apt/apt-native.inc
@@ -51,11 +51,11 @@ do_install_base () {
51 install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/ 51 install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/
52 52
53 install -d ${D}${libdir}/dpkg/methods/apt 53 install -d ${D}${libdir}/dpkg/methods/apt
54 install -m 0644 dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/ 54 install -m 0644 ${S}/dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/
55 install -m 0644 dselect/names ${D}${libdir}/dpkg/methods/apt/ 55 install -m 0644 ${S}/dselect/names ${D}${libdir}/dpkg/methods/apt/
56 install -m 0755 dselect/install ${D}${libdir}/dpkg/methods/apt/ 56 install -m 0755 ${S}/dselect/install ${D}${libdir}/dpkg/methods/apt/
57 install -m 0755 dselect/setup ${D}${libdir}/dpkg/methods/apt/ 57 install -m 0755 ${S}/dselect/setup ${D}${libdir}/dpkg/methods/apt/
58 install -m 0755 dselect/update ${D}${libdir}/dpkg/methods/apt/ 58 install -m 0755 ${S}/dselect/update ${D}${libdir}/dpkg/methods/apt/
59 59
60 install -d ${D}${sysconfdir}/apt 60 install -d ${D}${sysconfdir}/apt
61 install -d ${D}${sysconfdir}/apt/apt.conf.d 61 install -d ${D}${sysconfdir}/apt/apt.conf.d
diff --git a/meta/recipes-devtools/apt/apt-package.inc b/meta/recipes-devtools/apt/apt-package.inc
index b0e5056f21..0897d3a9fc 100644
--- a/meta/recipes-devtools/apt/apt-package.inc
+++ b/meta/recipes-devtools/apt/apt-package.inc
@@ -57,11 +57,11 @@ do_install () {
57 install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/ 57 install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/
58 58
59 install -d ${D}${libdir}/dpkg/methods/apt 59 install -d ${D}${libdir}/dpkg/methods/apt
60 install -m 0644 dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/ 60 install -m 0644 ${S}/dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/
61 install -m 0644 dselect/names ${D}${libdir}/dpkg/methods/apt/ 61 install -m 0644 ${S}/dselect/names ${D}${libdir}/dpkg/methods/apt/
62 install -m 0755 dselect/install ${D}${libdir}/dpkg/methods/apt/ 62 install -m 0755 ${S}/dselect/install ${D}${libdir}/dpkg/methods/apt/
63 install -m 0755 dselect/setup ${D}${libdir}/dpkg/methods/apt/ 63 install -m 0755 ${S}/dselect/setup ${D}${libdir}/dpkg/methods/apt/
64 install -m 0755 dselect/update ${D}${libdir}/dpkg/methods/apt/ 64 install -m 0755 ${S}/dselect/update ${D}${libdir}/dpkg/methods/apt/
65 65
66 install -d ${D}${sysconfdir}/apt 66 install -d ${D}${sysconfdir}/apt
67 install -d ${D}${sysconfdir}/apt/apt.conf.d 67 install -d ${D}${sysconfdir}/apt/apt.conf.d
@@ -70,7 +70,7 @@ do_install () {
70 install -d ${D}${localstatedir}/lib/apt/lists/partial 70 install -d ${D}${localstatedir}/lib/apt/lists/partial
71 install -d ${D}${localstatedir}/cache/apt/archives/partial 71 install -d ${D}${localstatedir}/cache/apt/archives/partial
72 install -d ${D}${docdir}/apt/examples 72 install -d ${D}${docdir}/apt/examples
73 install -m 0644 doc/examples/* ${D}${docdir}/apt/examples/ 73 install -m 0644 ${S}/doc/examples/* ${D}${docdir}/apt/examples/
74 74
75 install -d ${D}${includedir}/apt-pkg/ 75 install -d ${D}${includedir}/apt-pkg/
76 install -m 0644 include/apt-pkg/*.h ${D}${includedir}/apt-pkg/ 76 install -m 0644 include/apt-pkg/*.h ${D}${includedir}/apt-pkg/
diff --git a/meta/recipes-devtools/apt/apt.inc b/meta/recipes-devtools/apt/apt.inc
index e3ca6d028d..83411a968a 100644
--- a/meta/recipes-devtools/apt/apt.inc
+++ b/meta/recipes-devtools/apt/apt.inc
@@ -18,8 +18,8 @@ inherit autotools gettext
18EXTRA_AUTORECONF = "--exclude=autopoint,autoheader" 18EXTRA_AUTORECONF = "--exclude=autopoint,autoheader"
19 19
20do_configure_prepend() { 20do_configure_prepend() {
21 rm -rf buildlib/config.sub 21 rm -rf ${S}/buildlib/config.sub
22 rm -rf buildlib/config.guess 22 rm -rf ${S}/buildlib/config.guess
23} 23}
24 24
25# Apt wants to know the glibc version by running a binary file, which will 25# Apt wants to know the glibc version by running a binary file, which will