summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2019-11-07 00:44:35 +0100
committerAndreas Oberritter <obi@opendreambox.org>2019-11-27 23:38:32 +0100
commitc5e0f27433f091cdfc568868e422ac9dd82a1de3 (patch)
tree97d4fdb631d9e62dcec5229a6704134167362375
parent9ffb8e877dfd7c68c516099d2c758e396b30f198 (diff)
downloadopenembedded-core-contrib-obi/zeus.tar.gz
openembedded-core-contrib-obi/zeus.tar.bz2
openembedded-core-contrib-obi/zeus.zip
apt: Install methods to nonarch_libdirobi/zeus
This is where apt expects them. Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
-rw-r--r--meta/recipes-devtools/apt/apt_1.2.31.bb16
1 files changed, 8 insertions, 8 deletions
diff --git a/meta/recipes-devtools/apt/apt_1.2.31.bb b/meta/recipes-devtools/apt/apt_1.2.31.bb
index dc9d8154d0..1c2a2c1c6b 100644
--- a/meta/recipes-devtools/apt/apt_1.2.31.bb
+++ b/meta/recipes-devtools/apt/apt_1.2.31.bb
@@ -89,15 +89,15 @@ do_install () {
install -d ${D}${libdir}/apt
install -m 0755 bin/apt-helper ${D}${libdir}/apt
- install -d ${D}${libdir}/apt/methods
- install -m 0755 bin/methods/* ${D}${libdir}/apt/methods
+ install -d ${D}${nonarch_libdir}/apt/methods
+ install -m 0755 bin/methods/* ${D}${nonarch_libdir}/apt/methods
- install -d ${D}${libdir}/dpkg/methods/apt
+ install -d ${D}${nonarch_libdir}/dpkg/methods/apt
for f in desc.apt names; do
- install -m 0644 ${S}/dselect/$f ${D}${libdir}/dpkg/methods/apt
+ install -m 0644 ${S}/dselect/$f ${D}${nonarch_libdir}/dpkg/methods/apt
done
for f in install setup update; do
- install -m 0755 ${S}/dselect/$f ${D}${libdir}/dpkg/methods/apt
+ install -m 0755 ${S}/dselect/$f ${D}${nonarch_libdir}/dpkg/methods/apt
done
if ${@bb.utils.contains('PACKAGECONFIG', 'manpages', 'true', 'false', d)}; then
@@ -149,10 +149,10 @@ RRECOMMENDS_${PN}_class-native = ""
RPROVIDES_${PN}-opkg = "opkg"
-FILES_${PN} += "${libdir}/dpkg ${systemd_system_unitdir}/apt-daily.service"
-FILES_${PN}-dselect = "${libdir}/dpkg/methods/apt"
+FILES_${PN} += "${nonarch_libdir}/apt ${systemd_system_unitdir}/apt-daily.service"
+FILES_${PN}-dselect = "${nonarch_libdir}/dpkg/methods/apt"
FILES_${PN}-opkg = "${bindir}/apt-opkg"
-FILES_${PN}-transport-https = "${libdir}/apt/methods/https"
+FILES_${PN}-transport-https = "${nonarch_libdir}/apt/methods/https"
FILES_${PN}-utils = "${bindir}/apt-extracttemplates \
${bindir}/apt-ftparchive \
${bindir}/apt-sortpkgs"