diff options
author | Stefan Agner <stefan.agner@toradex.com> | 2019-09-20 09:18:01 +0200 |
---|---|---|
committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2019-10-02 14:13:35 -0400 |
commit | 467ce521e71e462f4f74ab965c110bad50885c67 (patch) | |
tree | 754552d176155e8172f8f73dc95da66a4505cec2 | |
parent | 6f55c61b5b215287ec2c2146983443660388ce79 (diff) | |
download | meta-virtualization-467ce521e71e462f4f74ab965c110bad50885c67.tar.gz |
conmon: initial add
Add conmon, a OCI container runtime monitor.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
-rw-r--r-- | recipes-containers/conmon/conmon_2.0.0.bb | 30 | ||||
-rw-r--r-- | recipes-containers/conmon/files/0001-Makefile-don-t-fail-if-clean-is-called-without-a-bui.patch | 31 |
2 files changed, 61 insertions, 0 deletions
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 @@ | |||
1 | SUMMARY = "An OCI container runtime monitor" | ||
2 | SECTION = "console/utils" | ||
3 | HOMEPAGE = "https://github.com/containers/conmon" | ||
4 | LICENSE = "Apache-2.0" | ||
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=61af0b6932ea7b12fb9142721043bc77" | ||
6 | |||
7 | DEPENDS = "glib-2.0" | ||
8 | |||
9 | SRCREV = "e217fdff82e0b1a6184a28c43043a4065083407f" | ||
10 | SRC_URI = "\ | ||
11 | git://github.com/containers/conmon.git \ | ||
12 | file://0001-Makefile-don-t-fail-if-clean-is-called-without-a-bui.patch \ | ||
13 | " | ||
14 | |||
15 | SRC_URI[md5sum] = "5c711911d766d76813333c3812277574" | ||
16 | SRC_URI[sha256sum] = "4c31278b2c03e5be5a696c3088bc86cf2557a70e00f697799c163aba18e3c40e" | ||
17 | |||
18 | S = "${WORKDIR}/git" | ||
19 | |||
20 | inherit pkgconfig | ||
21 | |||
22 | EXTRA_OEMAKE = "PREFIX=${prefix} BINDIR=${bindir} LIBEXECDIR=${libexecdir}" | ||
23 | |||
24 | do_install() { | ||
25 | oe_runmake 'DESTDIR=${D}' install | ||
26 | } | ||
27 | |||
28 | FILES_${PN} += " \ | ||
29 | ${bindir}/conmon \ | ||
30 | " | ||
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 @@ | |||
1 | From 6ef63dfcc65d5401bc7cc7170d569cefcdadcb38 Mon Sep 17 00:00:00 2001 | ||
2 | From: Stefan Agner <stefan@agner.ch> | ||
3 | Date: Fri, 30 Aug 2019 17:49:22 +0200 | ||
4 | Subject: [PATCH] Makefile: don't fail if clean is called without a build | ||
5 | |||
6 | Do not fail when calling the clean target without building first. | ||
7 | |||
8 | Upstream-Status: Backport | ||
9 | |||
10 | Signed-off-by: Stefan Agner <stefan@agner.ch> | ||
11 | --- | ||
12 | Makefile | 3 +-- | ||
13 | 1 file changed, 1 insertion(+), 2 deletions(-) | ||
14 | |||
15 | diff --git a/Makefile b/Makefile | ||
16 | index fb0e4fb..b525595 100644 | ||
17 | --- a/Makefile | ||
18 | +++ b/Makefile | ||
19 | @@ -66,8 +66,7 @@ bin: | ||
20 | |||
21 | .PHONY: clean | ||
22 | clean: | ||
23 | - rm -f bin/conmon src/*.o | ||
24 | - rmdir bin | ||
25 | + rm -rf bin/ src/*.o | ||
26 | |||
27 | .PHONY: install install.bin install.crio install.podman podman crio | ||
28 | install: install.bin | ||
29 | -- | ||
30 | 2.23.0 | ||
31 | |||