diff mbox series

[v1,1/1] package/conmon: new package

Message ID 20220821050119.578342-1-christian@paral.in
State Changes Requested, archived
Headers show
Series [v1,1/1] package/conmon: new package | expand

Commit Message

Christian Stewart Aug. 21, 2022, 5:01 a.m. UTC 
Conmon is an OCI container runtime monitor.

https://github.com/containers/conmon

Dependency of podman.

Signed-off-by: Christian Stewart <christian@paral.in>
---
 DEVELOPERS                 |  1 +
 package/Config.in          |  1 +
 package/conmon/Config.in   | 11 +++++++++++
 package/conmon/conmon.hash |  3 +++
 package/conmon/conmon.mk   | 34 ++++++++++++++++++++++++++++++++++
 5 files changed, 50 insertions(+)
 create mode 100644 package/conmon/Config.in
 create mode 100644 package/conmon/conmon.hash
 create mode 100644 package/conmon/conmon.mk

Comments

Christian Stewart Sept. 18, 2022, 9:04 p.m. UTC | #1 
Hi All,

On Sat, Aug 20, 2022 at 10:01 PM Christian Stewart <christian@paral.in> wrote:
>
> Conmon is an OCI container runtime monitor.
>
> https://github.com/containers/conmon
>
> Dependency of podman.
>
> Signed-off-by: Christian Stewart <christian@paral.in>

This package requires a dependency on host-pkgconf and libglib2

I will include this in the next revision.

Best regards,
Christian Stewart
Thomas Petazzoni Oct. 31, 2022, 10:38 a.m. UTC | #2 
On Sun, 18 Sep 2022 14:04:08 -0700
Christian Stewart via buildroot <buildroot@buildroot.org> wrote:

> This package requires a dependency on host-pkgconf and libglib2
> 
> I will include this in the next revision.

ACK, patch marked as Changes Requested then.

Thanks!

Thomas
diff mbox series

Patch

diff --git a/DEVELOPERS b/DEVELOPERS
index d2bd0d809a..1914da041d 100644
--- a/DEVELOPERS
+++ b/DEVELOPERS
@@ -529,6 +529,7 @@  F:	package/python-pylibftdi/
 
 N:	Christian Stewart <christian@paral.in>
 F:	package/batman-adv/
+F:	package/conmon/
 F:	package/containerd/
 F:	package/delve/
 F:	package/docker-cli/
diff --git a/package/Config.in b/package/Config.in
index d1c098c48f..5c71fc1d57 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -2564,6 +2564,7 @@  menu "System tools"
 	source "package/cgroupfs-mount/Config.in"
 	source "package/circus/Config.in"
 	source "package/containerd/Config.in"
+	source "package/conmon/Config.in"
 	source "package/coreutils/Config.in"
 	source "package/cpulimit/Config.in"
 	source "package/cpuload/Config.in"
diff --git a/package/conmon/Config.in b/package/conmon/Config.in
new file mode 100644
index 0000000000..80caf46a59
--- /dev/null
+++ b/package/conmon/Config.in
@@ -0,0 +1,11 @@ 
+config BR2_PACKAGE_CONMON
+	bool "conmon"
+	depends on BR2_TOOLCHAIN_HAS_THREADS
+	depends on !BR2_TOOLCHAIN_USES_UCLIBC # no fexecve
+	help
+	  Conmon is an OCI container runtime monitor.
+
+	  https://github.com/containers/conmon
+
+comment "conmon needs a glibc or musl toolchain w/ threads"
+	depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_TOOLCHAIN_USES_UCLIBC
diff --git a/package/conmon/conmon.hash b/package/conmon/conmon.hash
new file mode 100644
index 0000000000..70ddb2a495
--- /dev/null
+++ b/package/conmon/conmon.hash
@@ -0,0 +1,3 @@ 
+# Locally computed
+sha256  145b5aa1c5d1d9977ad0d15a53c11aad1e65e8233f7e0fd176ac85f67d6d6fbe  conmon-2.1.3.tar.gz
+sha256  9c9d771d4004725237a31ada889fe06c85a24fd0a29e41825181ab4cde54f016  LICENSE
diff --git a/package/conmon/conmon.mk b/package/conmon/conmon.mk
new file mode 100644
index 0000000000..b629b0089e
--- /dev/null
+++ b/package/conmon/conmon.mk
@@ -0,0 +1,34 @@ 
+################################################################################
+#
+# conmon
+#
+################################################################################
+
+CONMON_VERSION = 2.1.3
+CONMON_SITE = $(call github,containers,conmon,v$(CONMON_VERSION))
+CONMON_LICENSE = Apache-2.0
+CONMON_LICENSE_FILES = LICENSE
+
+ifeq ($(BR2_PACKAGE_LIBSECCOMP),y)
+CONMON_ENABLE_SECCOMP = 1
+CONMON_DEPENDENCIES += libseccomp
+else
+CONMON_ENABLE_SECCOMP = 0
+endif
+
+define CONMON_CONFIGURE_CMDS
+	printf '#!/bin/bash\necho "$(CONMON_ENABLE_SECCOMP)"\n' > \
+		$(@D)/hack/seccomp-notify.sh
+	chmod +x $(@D)/hack/seccomp-notify.sh
+endef
+
+define CONMON_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" CFLAGS="$(TARGET_CFLAGS)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) bin/conmon
+endef
+
+define CONMON_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 755 $(@D)/bin/conmon $(TARGET_DIR)/usr/bin/conmon
+endef
+
+$(eval $(generic-package))