apt: Fix case where ${B} != ${S}

Need to reference objects from ${B}.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-devtools/apt/apt-native.inc b/meta/recipes-devtools/apt/apt-native.inc
index a29e98633df1ff2b4aa81461679d4f56efcdb191..294ca94096f9fdf1a2ad4b6fd210b859161f6645 100644 (file)
--- a/meta/recipes-devtools/apt/apt-native.inc
+++ b/meta/recipes-devtools/apt/apt-native.inc
@@ -51,11 +51,11 @@ do_install_base () {
        install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/
 
        install -d ${D}${libdir}/dpkg/methods/apt
-       install -m 0644 dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/ 
-       install -m 0644 dselect/names ${D}${libdir}/dpkg/methods/apt/ 
-       install -m 0755 dselect/install ${D}${libdir}/dpkg/methods/apt/ 
-       install -m 0755 dselect/setup ${D}${libdir}/dpkg/methods/apt/ 
-       install -m 0755 dselect/update ${D}${libdir}/dpkg/methods/apt/ 
+       install -m 0644 ${S}/dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/ 
+       install -m 0644 ${S}/dselect/names ${D}${libdir}/dpkg/methods/apt/ 
+       install -m 0755 ${S}/dselect/install ${D}${libdir}/dpkg/methods/apt/ 
+       install -m 0755 ${S}/dselect/setup ${D}${libdir}/dpkg/methods/apt/ 
+       install -m 0755 ${S}/dselect/update ${D}${libdir}/dpkg/methods/apt/ 
 
        install -d ${D}${sysconfdir}/apt
        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 b0e5056f21d83444bb1c618a92e61f56504b3374..0897d3a9fcb71276fdb076ca843fdf2c5b068ffb 100644 (file)
--- a/meta/recipes-devtools/apt/apt-package.inc
+++ b/meta/recipes-devtools/apt/apt-package.inc
@@ -57,11 +57,11 @@ do_install () {
        install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/
 
        install -d ${D}${libdir}/dpkg/methods/apt
-       install -m 0644 dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/ 
-       install -m 0644 dselect/names ${D}${libdir}/dpkg/methods/apt/ 
-       install -m 0755 dselect/install ${D}${libdir}/dpkg/methods/apt/ 
-       install -m 0755 dselect/setup ${D}${libdir}/dpkg/methods/apt/ 
-       install -m 0755 dselect/update ${D}${libdir}/dpkg/methods/apt/ 
+       install -m 0644 ${S}/dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/ 
+       install -m 0644 ${S}/dselect/names ${D}${libdir}/dpkg/methods/apt/ 
+       install -m 0755 ${S}/dselect/install ${D}${libdir}/dpkg/methods/apt/ 
+       install -m 0755 ${S}/dselect/setup ${D}${libdir}/dpkg/methods/apt/ 
+       install -m 0755 ${S}/dselect/update ${D}${libdir}/dpkg/methods/apt/ 
 
        install -d ${D}${sysconfdir}/apt
        install -d ${D}${sysconfdir}/apt/apt.conf.d
@@ -70,7 +70,7 @@ do_install () {
        install -d ${D}${localstatedir}/lib/apt/lists/partial
        install -d ${D}${localstatedir}/cache/apt/archives/partial
        install -d ${D}${docdir}/apt/examples
-       install -m 0644 doc/examples/* ${D}${docdir}/apt/examples/
+       install -m 0644 ${S}/doc/examples/* ${D}${docdir}/apt/examples/
 
        install -d ${D}${includedir}/apt-pkg/
        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 e3ca6d028d54dd7a2252df104b354f1fce8222e5..83411a968a5cd7feb7917d795478b96e21424049 100644 (file)
--- a/meta/recipes-devtools/apt/apt.inc
+++ b/meta/recipes-devtools/apt/apt.inc
@@ -18,8 +18,8 @@ inherit autotools gettext
 EXTRA_AUTORECONF = "--exclude=autopoint,autoheader"
 
 do_configure_prepend() {
-    rm -rf buildlib/config.sub
-    rm -rf buildlib/config.guess
+    rm -rf ${S}/buildlib/config.sub
+    rm -rf ${S}/buildlib/config.guess
 }
 
 # Apt wants to know the glibc version by running a binary file, which will