From: Andreas Oberritter <obi@opendreambox.org>
Date: Wed, 6 Nov 2019 23:44:35 +0000 (+0100)
Subject: apt: Install methods to nonarch_libdir
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fheads%2Fobi%2Fzeus;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

apt: Install methods to nonarch_libdir

This is where apt expects them.

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
---

diff --git a/meta/recipes-devtools/apt/apt_1.2.31.bb b/meta/recipes-devtools/apt/apt_1.2.31.bb
index dc9d8154d03..1c2a2c1c6b0 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"