Skip to contentSkip to conversation

conmon/crun/docker-compose/nerdctl: get rid of go-md2man dependency

PATCH In review [email protected] 2 participants 2 messages Apr 18, 2024 – Apr 22, 2024

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 conmon/crun/docker-compose/nerdctl: get rid of go-md2man dependency

From: Chen Qi <[email protected]>

The go-md2man dependency is not needed for these recipes.

---
 recipes-containers/conmon/conmon_git.bb                 | 2 +-
 recipes-containers/crun/crun_git.bb                     | 2 +-
 recipes-containers/docker-compose/docker-compose_git.bb | 1 -
 recipes-containers/nerdctl/nerdctl_git.bb               | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)
recipes-containers/conmon/conmon_git.bb +1 -1
index d7047ed0..ab8a4ef2 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=61af0b6932ea7b12fb9142721043bc77"
 inherit features_check
 REQUIRED_DISTRO_FEATURES ?= "seccomp"
 
-DEPENDS = "glib-2.0 go-md2man-native libseccomp"
+DEPENDS = "glib-2.0 libseccomp"
 
 SRCREV = "affab49967eb62f75d2a47398344ab053326289f"
 SRC_URI = "\
recipes-containers/crun/crun_git.bb +1 -1
index 89ba21b4..c0f9ead6 100644
@@ -26,7 +26,7 @@ inherit autotools-brokensep pkgconfig features_check
 
 PACKAGECONFIG ??= ""
 
-DEPENDS = "yajl libcap go-md2man-native m4-native"
+DEPENDS = "yajl libcap m4-native"
 # TODO: is there a packageconfig to turn this off ?
 DEPENDS += "libseccomp"
 DEPENDS += "systemd"
recipes-containers/docker-compose/docker-compose_git.bb +0 -1
index 07650126..afb3150a 100644
@@ -3,7 +3,6 @@ SUMMARY =  "Multi-container orchestration for Docker"
 DESCRIPTION = "Docker compose v2"
 
 DEPENDS = " \
-    go-md2man \
     rsync-native \
 "
 
recipes-containers/nerdctl/nerdctl_git.bb +0 -1
index 8868274f..dce5b2cc 100644
@@ -4,7 +4,6 @@ DESCRIPTION = "nerdctl: Docker-compatible CLI for containerd \
     "
 
 DEPENDS = " \
-    go-md2man \
     rsync-native \
     ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
 "
Signature · 1 line
2.42.0
#1 lore raw

In message: [meta-virtualization][PATCH] conmon/crun/docker-compose/nerdctl: get rid of go-md2man dependency

Quoted 30 lines · on 17/04/2024 Chen Qi via lists.yoctoproject.org wrote:

From: Chen Qi <[email protected]>

The go-md2man dependency is not needed for these recipes.

---
 recipes-containers/conmon/conmon_git.bb                 | 2 +-
 recipes-containers/crun/crun_git.bb                     | 2 +-
 recipes-containers/docker-compose/docker-compose_git.bb | 1 -
 recipes-containers/nerdctl/nerdctl_git.bb               | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)
recipes-containers/conmon/conmon_git.bb +1 -1
index d7047ed0..ab8a4ef2 100644
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=61af0b6932ea7b12fb9142721043bc77"
 inherit features_check
 REQUIRED_DISTRO_FEATURES ?= "seccomp"
 
-DEPENDS = "glib-2.0 go-md2man-native libseccomp"
+DEPENDS = "glib-2.0 libseccomp"
 
 SRCREV = "affab49967eb62f75d2a47398344ab053326289f"
 SRC_URI = "\
recipes-containers/crun/crun_git.bb +0 -0
index 89ba21b4..c0f9ead6 100644

recipes-containers/crun/crun_git.bb inherit autotools-brokensep pkgconfig features_check · line 29

Quoted 5 lines
recipes-containers/crun/crun_git.bb +1 -1
@@ -26,7 +26,7 @@ inherit autotools-brokensep pkgconfig features_check
 
 PACKAGECONFIG ??= ""
 
-DEPENDS = "yajl libcap go-md2man-native m4-native"
+DEPENDS = "yajl libcap m4-native"

crun still has the capability to build man pages, so this can still be required and I don't want to remove it.

As for the others, technically it is still used, but is now typically built from the vendored source versus our dependency.

I would be ok with removing it from the packages that are now using a vendored copy or don't build man pages (in a v2)

Bruce

Quoted 40 lines
recipes-containers/crun/crun_git.bb +0 -0
 # TODO: is there a packageconfig to turn this off ?
 DEPENDS += "libseccomp"
 DEPENDS += "systemd"
recipes-containers/docker-compose/docker-compose_git.bb +0 -1
index 07650126..afb3150a 100644
@@ -3,7 +3,6 @@ SUMMARY =  "Multi-container orchestration for Docker"
 DESCRIPTION = "Docker compose v2"
 
 DEPENDS = " \
-    go-md2man \
     rsync-native \
 "
 
recipes-containers/nerdctl/nerdctl_git.bb +0 -1
index 8868274f..dce5b2cc 100644
@@ -4,7 +4,6 @@ DESCRIPTION = "nerdctl: Docker-compatible CLI for containerd \
     "
 
 DEPENDS = " \
-    go-md2man \
     rsync-native \
     ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \
 "
Signature · 11 lines
2.42.0



-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#8683): https://lists.yoctoproject.org/g/meta-virtualization/message/8683
Mute This Topic: https://lists.yoctoproject.org/mt/105591667/1050810
Group Owner: [email protected]
Unsubscribe: https://lists.yoctoproject.org/g/meta-virtualization/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-