summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
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 /meta/recipes-devtools
parent659441212688bc6eb23b8506f2eca4346748cc10 (diff)
downloadast2050-yocto-poky-0b679927feee2ecfd77a32df0d29dec83ae0a32f.zip
ast2050-yocto-poky-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>
Diffstat (limited to 'meta/recipes-devtools')
-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 a29e986..294ca94 100644
--- 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 b0e5056..0897d3a 100644
--- 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 e3ca6d0..83411a9 100644
--- 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
OpenPOWER on IntegriCloud