diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-21 22:45:44 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-22 16:20:55 +0000 |
| commit | 0610cf3ef864acc9ca98498b9810bcce0fbb935a (patch) | |
| tree | 8a66ad52a78c55831a76a3780ef61bde6aca0542 | |
| parent | 2b58618406195aa53df2335c354d7e45ad08f4d5 (diff) | |
| download | openembedded-core-0610cf3ef864acc9ca98498b9810bcce0fbb935a.tar.gz openembedded-core-0610cf3ef864acc9ca98498b9810bcce0fbb935a.tar.bz2 openembedded-core-0610cf3ef864acc9ca98498b9810bcce0fbb935a.zip | |
apt: Fix case where ${B} != ${S}
Need to reference objects from ${B}.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/apt/apt-native.inc | 10 | ||||
| -rw-r--r-- | meta/recipes-devtools/apt/apt-package.inc | 12 | ||||
| -rw-r--r-- | meta/recipes-devtools/apt/apt.inc | 4 |
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 () { 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 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 () { 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 e3ca6d028d..83411a968a 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 |