merged to master-next.
Bruce
On Thu, Sep 7, 2023 at 2:11 AM Chen Qi via lists.yoctoproject.org
<Qi.Chen=windriver....@lists.yoctoproject.org> wrote:
>
> From: Chen Qi <qi.c...@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.c...@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
>
>
>
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8289):
https://lists.yoctoproject.org/g/meta-virtualization/message/8289
Mute This Topic: https://lists.yoctoproject.org/mt/101209753/21656
Group Owner: meta-virtualization+ow...@lists.yoctoproject.org
Unsubscribe:
https://lists.yoctoproject.org/g/meta-virtualization/leave/6693005/21656/1014668956/xyzzy
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
