* [Buildroot] [PATCH 1/1] docker-containerd: add missing binary symlink
@ 2018-06-07 7:51 Sam Lancia
2018-06-07 13:50 ` Thomas Petazzoni
2018-07-17 7:32 ` Peter Korsgaard
0 siblings, 2 replies; 3+ messages in thread
From: Sam Lancia @ 2018-06-07 7:51 UTC (permalink / raw)
To: buildroot
In 2dccb4f2fefd8a0dbda65dd0f7537f811e920b13,
"/usr/bin/docker-containerd" was removed without replacing it with a
symlink
https://bugs.busybox.net/show_bug.cgi?id=11076
Signed-off-by: Sam Lancia <sam@gpsm.co.uk>
---
package/docker-containerd/docker-containerd.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/package/docker-containerd/docker-containerd.mk
b/package/docker-containerd/docker-containerd.mk
index 88e27b5ed4..09e89f1aba 100644
--- a/package/docker-containerd/docker-containerd.mk
+++ b/package/docker-containerd/docker-containerd.mk
@@ -21,6 +21,7 @@ DOCKER_CONTAINERD_INSTALL_BINS = containerd containerd-shim
define DOCKER_CONTAINERD_INSTALL_SYMLINKS
ln -fs runc $(TARGET_DIR)/usr/bin/docker-runc
ln -fs containerd-shim $(TARGET_DIR)/usr/bin/docker-containerd-shim
+ ln -fs containerd $(TARGET_DIR)/usr/bin/docker-containerd
endef
DOCKER_CONTAINERD_POST_INSTALL_TARGET_HOOKS +=
DOCKER_CONTAINERD_INSTALL_SYMLINKS
--
2.14.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] docker-containerd: add missing binary symlink
2018-06-07 7:51 [Buildroot] [PATCH 1/1] docker-containerd: add missing binary symlink Sam Lancia
@ 2018-06-07 13:50 ` Thomas Petazzoni
2018-07-17 7:32 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Thomas Petazzoni @ 2018-06-07 13:50 UTC (permalink / raw)
To: buildroot
Hello,
Thanks for this contribution!
On Thu, 7 Jun 2018 08:51:07 +0100, Sam Lancia wrote:
> In 2dccb4f2fefd8a0dbda65dd0f7537f811e920b13,
> "/usr/bin/docker-containerd" was removed without replacing it with a
> symlink
>
> https://bugs.busybox.net/show_bug.cgi?id=11076
>
> Signed-off-by: Sam Lancia <sam@gpsm.co.uk>
> ---
> package/docker-containerd/docker-containerd.mk | 1 +
> 1 file changed, 1 insertion(+)
Your patch was not applicable as-is, because it has been modified on
the way by your e-mail client. I've fixed this up because it was a
simple patch, but for future patches, it would be nice if you could use
"git send-email" to send the patches.
I've improved a bit the commit log, and applied your patch to master.
Thanks!
Best regards,
Thomas
--
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* [Buildroot] [PATCH 1/1] docker-containerd: add missing binary symlink
2018-06-07 7:51 [Buildroot] [PATCH 1/1] docker-containerd: add missing binary symlink Sam Lancia
2018-06-07 13:50 ` Thomas Petazzoni
@ 2018-07-17 7:32 ` Peter Korsgaard
1 sibling, 0 replies; 3+ messages in thread
From: Peter Korsgaard @ 2018-07-17 7:32 UTC (permalink / raw)
To: buildroot
>>>>> "Sam" == Sam Lancia <sam@gpsm.co.uk> writes:
> In 2dccb4f2fefd8a0dbda65dd0f7537f811e920b13,
> "/usr/bin/docker-containerd" was removed without replacing it with a
> symlink
> https://bugs.busybox.net/show_bug.cgi?id=11076
> Signed-off-by: Sam Lancia <sam@gpsm.co.uk>
Committed to 2018.05.x, thanks.
--
Bye, Peter Korsgaard
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2018-07-17 7:32 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-06-07 7:51 [Buildroot] [PATCH 1/1] docker-containerd: add missing binary symlink Sam Lancia
2018-06-07 13:50 ` Thomas Petazzoni
2018-07-17 7:32 ` Peter Korsgaard
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox