From: Qi.Chen@windriver.com
To: meta-virtualization@lists.yoctoproject.org
Subject: [meta-virtualization][PATCH] docker-compose: fix installation location for multilib
Date: Wed, 6 Sep 2023 23:11:14 -0700 [thread overview]
Message-ID: <20230907061114.35142-1-Qi.Chen@windriver.com> (raw)
From: Chen Qi <Qi.Chen@windriver.com>
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>
---
recipes-containers/docker-compose/docker-compose_git.bb | 6 +++---
1 file 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 5777eeba..ab85a103 100644
--- a/recipes-containers/docker-compose/docker-compose_git.bb
+++ b/recipes-containers/docker-compose/docker-compose_git.bb
@@ -66,14 +66,14 @@ do_install() {
#install -m 755 "${S}/src/import/bin/docker-compose" "${D}${BIN_PREFIX}/bin"
# commonly installed to: /usr/lib/docker/cli-plugins/
- install -d "${D}${libdir}/docker/cli-plugins/"
- install -m 755 "${S}/src/import/bin/docker-compose" "${D}${libdir}/docker/cli-plugins/"
+ install -d "${D}${nonarch_libdir}/docker/cli-plugins/"
+ install -m 755 "${S}/src/import/bin/docker-compose" "${D}${nonarch_libdir}/docker/cli-plugins/"
}
RDEPENDS:${PN} += " docker"
-FILES:${PN} += " ${libdir}/docker/cli-plugins/"
+FILES:${PN} += " ${nonarch_libdir}/docker/cli-plugins/"
INHIBIT_PACKAGE_STRIP = "1"
INSANE_SKIP:${PN} += "ldflags already-stripped"
--
2.40.0
next reply other threads:[~2023-09-07 6:11 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-07 6:11 Qi.Chen [this message]
2023-09-08 20:05 ` [meta-virtualization][PATCH] docker-compose: fix installation location for multilib Bruce Ashfield
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230907061114.35142-1-Qi.Chen@windriver.com \
--to=qi.chen@windriver.com \
--cc=meta-virtualization@lists.yoctoproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).