From: "Yann E. MORIN" <yann.morin.1998@free.fr>
To: TIAN Yuanhao <tianyuanhao3@163.com>
Cc: buildroot@buildroot.org
Subject: Re: [Buildroot] [PATCH 1/1] package/crun: support crun as runtime in containerd
Date: Sun, 8 Jan 2023 17:12:19 +0100 [thread overview]
Message-ID: <20230108161219.GF151997@scaer> (raw)
In-Reply-To: <20221006140754.46144-1-tianyuanhao3@163.com>
Yuanhao, All,
On 2022-10-06 07:07 -0700, TIAN Yuanhao spake thusly:
> Create runc symlink to crun when runc is missing.
I've split this patch in two, as they are semantically separate:
1. have crun impersonate runc if the latter is not enabled,
2. do not force runc in containerd if crun is enabled
Indeed, one may very well want to use crun as an anternative to runc,
even without using containerd.
> See: https://github.com/containerd/containerd/discussions/6162
>
> Signed-off-by: TIAN Yuanhao <tianyuanhao3@163.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> package/containerd/Config.in | 2 +-
> package/crun/crun.mk | 7 +++++++
> 2 files changed, 8 insertions(+), 1 deletion(-)
>
> diff --git a/package/containerd/Config.in b/package/containerd/Config.in
> index 0e3a55ef39..e69dd6768a 100644
> --- a/package/containerd/Config.in
> +++ b/package/containerd/Config.in
> @@ -5,7 +5,7 @@ config BR2_PACKAGE_CONTAINERD
> depends on BR2_TOOLCHAIN_HAS_THREADS
> depends on !BR2_TOOLCHAIN_USES_UCLIBC # runc
> depends on BR2_USE_MMU # util-linux
> - select BR2_PACKAGE_RUNC # runtime dependency
> + select BR2_PACKAGE_RUNC if !BR2_PACKAGE_CRUN # runtime dependency
> select BR2_PACKAGE_UTIL_LINUX # runtime dependency
> select BR2_PACKAGE_UTIL_LINUX_BINARIES
> select BR2_PACKAGE_UTIL_LINUX_PIVOT_ROOT
> diff --git a/package/crun/crun.mk b/package/crun/crun.mk
> index 4a0c150594..19dda71a9f 100644
> --- a/package/crun/crun.mk
> +++ b/package/crun/crun.mk
> @@ -36,4 +36,11 @@ else
> CRUN_CONF_OPTS += --disable-systemd
> endif
>
> +ifeq ($(BR2_PACKAGE_RUNC),)
> +define CRUN_CREATE_SYMLINK
> + ln -sf crun $(TARGET_DIR)/usr/bin/runc
> +endef
> +CRUN_POST_INSTALL_TARGET_HOOKS += CRUN_CREATE_SYMLINK
> +endif
> +
> $(eval $(autotools-package))
> --
> 2.25.1
>
> _______________________________________________
> buildroot mailing list
> buildroot@buildroot.org
> https://lists.buildroot.org/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
_______________________________________________
buildroot mailing list
buildroot@buildroot.org
https://lists.buildroot.org/mailman/listinfo/buildroot
prev parent reply other threads:[~2023-01-08 16:12 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-06 14:07 [Buildroot] [PATCH 1/1] package/crun: support crun as runtime in containerd TIAN Yuanhao
2022-11-21 15:08 ` Christian Stewart via buildroot
2022-12-21 1:23 ` tianyuanhao3
2023-01-08 2:40 ` Christian Stewart via buildroot
2023-01-08 16:12 ` Yann E. MORIN [this message]
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=20230108161219.GF151997@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@buildroot.org \
--cc=tianyuanhao3@163.com \
/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