From 467ce521e71e462f4f74ab965c110bad50885c67 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Fri, 20 Sep 2019 09:18:01 +0200 Subject: conmon: initial add Add conmon, a OCI container runtime monitor. Signed-off-by: Stefan Agner Signed-off-by: Bruce Ashfield --- recipes-containers/conmon/conmon_2.0.0.bb | 30 +++++++++++++++++++++ ...n-t-fail-if-clean-is-called-without-a-bui.patch | 31 ++++++++++++++++++++++ 2 files changed, 61 insertions(+) create mode 100644 recipes-containers/conmon/conmon_2.0.0.bb create mode 100644 recipes-containers/conmon/files/0001-Makefile-don-t-fail-if-clean-is-called-without-a-bui.patch diff --git a/recipes-containers/conmon/conmon_2.0.0.bb b/recipes-containers/conmon/conmon_2.0.0.bb new file mode 100644 index 00000000..f4e2cd62 --- /dev/null +++ b/recipes-containers/conmon/conmon_2.0.0.bb @@ -0,0 +1,30 @@ +SUMMARY = "An OCI container runtime monitor" +SECTION = "console/utils" +HOMEPAGE = "https://github.com/containers/conmon" +LICENSE = "Apache-2.0" +LIC_FILES_CHKSUM = "file://LICENSE;md5=61af0b6932ea7b12fb9142721043bc77" + +DEPENDS = "glib-2.0" + +SRCREV = "e217fdff82e0b1a6184a28c43043a4065083407f" +SRC_URI = "\ + git://github.com/containers/conmon.git \ + file://0001-Makefile-don-t-fail-if-clean-is-called-without-a-bui.patch \ +" + +SRC_URI[md5sum] = "5c711911d766d76813333c3812277574" +SRC_URI[sha256sum] = "4c31278b2c03e5be5a696c3088bc86cf2557a70e00f697799c163aba18e3c40e" + +S = "${WORKDIR}/git" + +inherit pkgconfig + +EXTRA_OEMAKE = "PREFIX=${prefix} BINDIR=${bindir} LIBEXECDIR=${libexecdir}" + +do_install() { + oe_runmake 'DESTDIR=${D}' install +} + +FILES_${PN} += " \ + ${bindir}/conmon \ +" diff --git a/recipes-containers/conmon/files/0001-Makefile-don-t-fail-if-clean-is-called-without-a-bui.patch b/recipes-containers/conmon/files/0001-Makefile-don-t-fail-if-clean-is-called-without-a-bui.patch new file mode 100644 index 00000000..8d2b473d --- /dev/null +++ b/recipes-containers/conmon/files/0001-Makefile-don-t-fail-if-clean-is-called-without-a-bui.patch @@ -0,0 +1,31 @@ +From 6ef63dfcc65d5401bc7cc7170d569cefcdadcb38 Mon Sep 17 00:00:00 2001 +From: Stefan Agner +Date: Fri, 30 Aug 2019 17:49:22 +0200 +Subject: [PATCH] Makefile: don't fail if clean is called without a build + +Do not fail when calling the clean target without building first. + +Upstream-Status: Backport + +Signed-off-by: Stefan Agner +--- + Makefile | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index fb0e4fb..b525595 100644 +--- a/Makefile ++++ b/Makefile +@@ -66,8 +66,7 @@ bin: + + .PHONY: clean + clean: +- rm -f bin/conmon src/*.o +- rmdir bin ++ rm -rf bin/ src/*.o + + .PHONY: install install.bin install.crio install.podman podman crio + install: install.bin +-- +2.23.0 + -- cgit v1.2.3-54-g00ecf