All of lore.kernel.org
 help / color / mirror / Atom feed
From: Stefan Agner <stefan@agner.ch>
To: meta-virtualization@yoctoproject.org
Cc: Stefan Agner <stefan.agner@toradex.com>
Subject: [PATCH 1/6] conmon: initial add
Date: Sun,  1 Sep 2019 22:33:33 +0200	[thread overview]
Message-ID: <20190901203338.38768-2-stefan@agner.ch> (raw)
In-Reply-To: <20190901203338.38768-1-stefan@agner.ch>

From: Stefan Agner <stefan.agner@toradex.com>

Add conmon, a OCI container runtime monitor.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
---
 recipes-containers/conmon/conmon_2.0.0.bb     | 30 ++++++++++++++++++
 ...ail-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 0000000..f4e2cd6
--- /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 0000000..8d2b473
--- /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 <stefan@agner.ch>
+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 <stefan@agner.ch>
+---
+ 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
+
-- 
2.20.1



  reply	other threads:[~2019-09-01 20:33 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-09-01 20:33 [PATCH 0/6] podman: add initial recipe Stefan Agner
2019-09-01 20:33 ` Stefan Agner [this message]
2019-09-01 20:33 ` [PATCH 2/6] go-metalinter: add recipe for gometalinter Stefan Agner
2019-09-01 20:33 ` [PATCH 3/6] go-md2man: add md2man Stefan Agner
2019-09-01 20:33 ` [PATCH 4/6] skopeo: add skopeo Stefan Agner
2019-09-03 17:18   ` Bruce Ashfield
2019-09-03 20:41     ` Mark Asselstine
2019-09-03 21:00       ` Bruce Ashfield
2019-09-03 21:05         ` Mark Asselstine
2019-09-03 21:13           ` Bruce Ashfield
2019-09-03 21:29             ` Mark Asselstine
2019-09-04  6:55             ` Stefan Agner
2019-09-04 12:40               ` Bruce Ashfield
2019-09-01 20:33 ` [PATCH 5/6] cni: move cni tools to /usr/lib/cni Stefan Agner
2019-09-02  1:45   ` ChenQi
2019-09-03 17:28     ` Bruce Ashfield
2019-09-06 12:06       ` Stefan Agner
2019-09-06 12:42         ` Bruce Ashfield
2019-09-09 21:36           ` Stefan Agner
2019-09-01 20:33 ` [PATCH 6/6] podmon: add the Pod Manager tool Stefan Agner
2019-09-03 17:26   ` Bruce Ashfield
2019-09-09 21:30     ` Stefan Agner
2019-09-10 23:13       ` akuster
2019-09-03 17:20 ` [PATCH 0/6] podman: add initial recipe Bruce Ashfield
2019-09-04  6:44   ` Stefan Agner
2019-09-04 12:35     ` Bruce Ashfield

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190901203338.38768-2-stefan@agner.ch \
    --to=stefan@agner.ch \
    --cc=meta-virtualization@yoctoproject.org \
    --cc=stefan.agner@toradex.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.