summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChen Qi <Qi.Chen@windriver.com>2023-09-06 23:11:14 -0700
committerBruce Ashfield <bruce.ashfield@gmail.com>2023-09-15 17:30:40 +0000
commit03085cfb540ba7495f5a841e89f1258dc3693833 (patch)
treecc78d2ea04ed9e6b8dc9480bfd0a7d4d52572685
parentae22af84a0c90318a2192dceabef9a71d8d2544e (diff)
downloadmeta-virtualization-03085cfb540ba7495f5a841e89f1258dc3693833.tar.gz
docker-compose: fix installation location for multilib
In case of multilib, the location is /usr/lib64/docker/cli-plugins, which cannot be recognized by docker. We should use nonarch_libdir instead. Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r--recipes-containers/docker-compose/docker-compose_git.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-containers/docker-compose/docker-compose_git.bb b/recipes-containers/docker-compose/docker-compose_git.bb
index 274fb520..86f4be27 100644
--- a/recipes-containers/docker-compose/docker-compose_git.bb
+++ b/recipes-containers/docker-compose/docker-compose_git.bb
@@ -70,14 +70,14 @@ do_install() {
70 #install -m 755 "${S}/src/import/bin/docker-compose" "${D}${BIN_PREFIX}/bin" 70 #install -m 755 "${S}/src/import/bin/docker-compose" "${D}${BIN_PREFIX}/bin"
71 71
72 # commonly installed to: /usr/lib/docker/cli-plugins/ 72 # commonly installed to: /usr/lib/docker/cli-plugins/
73 install -d "${D}${libdir}/docker/cli-plugins/" 73 install -d "${D}${nonarch_libdir}/docker/cli-plugins/"
74 install -m 755 "${S}/src/import/bin/docker-compose" "${D}${libdir}/docker/cli-plugins/" 74 install -m 755 "${S}/src/import/bin/docker-compose" "${D}${nonarch_libdir}/docker/cli-plugins/"
75 75
76} 76}
77 77
78RDEPENDS:${PN} += " docker" 78RDEPENDS:${PN} += " docker"
79 79
80FILES:${PN} += " ${libdir}/docker/cli-plugins/" 80FILES:${PN} += " ${nonarch_libdir}/docker/cli-plugins/"
81 81
82INHIBIT_PACKAGE_STRIP = "1" 82INHIBIT_PACKAGE_STRIP = "1"
83INSANE_SKIP:${PN} += "ldflags already-stripped" 83INSANE_SKIP:${PN} += "ldflags already-stripped"