Skip to contentSkip to conversation

docker-containerd: add missing binary symlink

PATCH New Sam Lancia 3 participants 3 messages Jun 7, 2018 – Jul 17, 2018

lore
Share & tools
lore

Sam Lancia

author
#0 lore raw

PATCH 1/1 docker-containerd: add missing binary symlink

In 2dccb4f2fefd8a0dbda65dd0f7537f811e920b13, "/usr/bin/docker-containerd" was removed without replacing it with a symlink

https://bugs.busybox.net/show_bug.cgi?id=11076

---
 package/docker-containerd/docker-containerd.mk | 1 +
 1 file changed, 1 insertion(+)
(quoted diff) +0 -0

b/package/docker-containerd/docker-containerd.mk
index 88e27b5ed4..09e89f1aba 100644

package/docker-containerd/docker-containerd.mk +1 -0
@@ -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

Signature · 1 line
2.14.1
#1 lore raw

PATCH 1/1 docker-containerd: add missing binary symlink

Hello,

Thanks for this contribution!

Quoted 10 lines · Sam Lancia

In 2dccb4f2fefd8a0dbda65dd0f7537f811e920b13, "/usr/bin/docker-containerd" was removed without replacing it with a symlink

https://bugs.busybox.net/show_bug.cgi?id=11076

---
 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

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com
#2 lore raw

PATCH 1/1 docker-containerd: add missing binary symlink

In reply to Sam Lancia
Quoted 9 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Sam" == Sam Lancia <[email protected]> writes:

In 2dccb4f2fefd8a0dbda65dd0f7537f811e920b13, "/usr/bin/docker-containerd" was removed without replacing it with a symlink

https://bugs.busybox.net/show_bug.cgi?id=11076

Committed to 2018.05.x, thanks.

Signature · 1 line
Bye, Peter Korsgaard