mirror of
https://git.yoctoproject.org/poky
synced 2026-05-30 12:29:55 +00:00
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>
This commit is contained in:
@@ -51,11 +51,11 @@ do_install_base () {
|
|||||||
install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/
|
install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/
|
||||||
|
|
||||||
install -d ${D}${libdir}/dpkg/methods/apt
|
install -d ${D}${libdir}/dpkg/methods/apt
|
||||||
install -m 0644 dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/
|
install -m 0644 ${S}/dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/
|
||||||
install -m 0644 dselect/names ${D}${libdir}/dpkg/methods/apt/
|
install -m 0644 ${S}/dselect/names ${D}${libdir}/dpkg/methods/apt/
|
||||||
install -m 0755 dselect/install ${D}${libdir}/dpkg/methods/apt/
|
install -m 0755 ${S}/dselect/install ${D}${libdir}/dpkg/methods/apt/
|
||||||
install -m 0755 dselect/setup ${D}${libdir}/dpkg/methods/apt/
|
install -m 0755 ${S}/dselect/setup ${D}${libdir}/dpkg/methods/apt/
|
||||||
install -m 0755 dselect/update ${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
|
||||||
install -d ${D}${sysconfdir}/apt/apt.conf.d
|
install -d ${D}${sysconfdir}/apt/apt.conf.d
|
||||||
|
|||||||
@@ -57,11 +57,11 @@ do_install () {
|
|||||||
install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/
|
install -m 0755 bin/methods/* ${D}${libdir}/apt/methods/
|
||||||
|
|
||||||
install -d ${D}${libdir}/dpkg/methods/apt
|
install -d ${D}${libdir}/dpkg/methods/apt
|
||||||
install -m 0644 dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/
|
install -m 0644 ${S}/dselect/desc.apt ${D}${libdir}/dpkg/methods/apt/
|
||||||
install -m 0644 dselect/names ${D}${libdir}/dpkg/methods/apt/
|
install -m 0644 ${S}/dselect/names ${D}${libdir}/dpkg/methods/apt/
|
||||||
install -m 0755 dselect/install ${D}${libdir}/dpkg/methods/apt/
|
install -m 0755 ${S}/dselect/install ${D}${libdir}/dpkg/methods/apt/
|
||||||
install -m 0755 dselect/setup ${D}${libdir}/dpkg/methods/apt/
|
install -m 0755 ${S}/dselect/setup ${D}${libdir}/dpkg/methods/apt/
|
||||||
install -m 0755 dselect/update ${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
|
||||||
install -d ${D}${sysconfdir}/apt/apt.conf.d
|
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}/lib/apt/lists/partial
|
||||||
install -d ${D}${localstatedir}/cache/apt/archives/partial
|
install -d ${D}${localstatedir}/cache/apt/archives/partial
|
||||||
install -d ${D}${docdir}/apt/examples
|
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 -d ${D}${includedir}/apt-pkg/
|
||||||
install -m 0644 include/apt-pkg/*.h ${D}${includedir}/apt-pkg/
|
install -m 0644 include/apt-pkg/*.h ${D}${includedir}/apt-pkg/
|
||||||
|
|||||||
@@ -18,8 +18,8 @@ inherit autotools gettext
|
|||||||
EXTRA_AUTORECONF = "--exclude=autopoint,autoheader"
|
EXTRA_AUTORECONF = "--exclude=autopoint,autoheader"
|
||||||
|
|
||||||
do_configure_prepend() {
|
do_configure_prepend() {
|
||||||
rm -rf buildlib/config.sub
|
rm -rf ${S}/buildlib/config.sub
|
||||||
rm -rf buildlib/config.guess
|
rm -rf ${S}/buildlib/config.guess
|
||||||
}
|
}
|
||||||
|
|
||||||
# Apt wants to know the glibc version by running a binary file, which will
|
# Apt wants to know the glibc version by running a binary file, which will
|
||||||
|
|||||||
Reference in New Issue
Block a user