From 179046584f3bf49c974409d91a5950ed226968a5 Mon Sep 17 00:00:00 2001
From: Stefan Agner <stefan.agner@toradex.com>
Date: Wed, 15 Jan 2020 23:29:35 +0000
Subject: conmon: bump to version 2.0.9

Bump to latest version 2.0.9. This also makes our Makefile fix obsolete
as the fix has been aplied upstream.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
---
 recipes-containers/conmon/conmon_2.0.0.bb          | 30 ---------------------
 recipes-containers/conmon/conmon_2.0.9.bb          | 29 ++++++++++++++++++++
 ...n-t-fail-if-clean-is-called-without-a-bui.patch | 31 ----------------------
 3 files changed, 29 insertions(+), 61 deletions(-)
 delete mode 100644 recipes-containers/conmon/conmon_2.0.0.bb
 create mode 100644 recipes-containers/conmon/conmon_2.0.9.bb
 delete 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
deleted file mode 100644
index f4e2cd62..00000000
--- a/recipes-containers/conmon/conmon_2.0.0.bb
+++ /dev/null
@@ -1,30 +0,0 @@
-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/conmon_2.0.9.bb b/recipes-containers/conmon/conmon_2.0.9.bb
new file mode 100644
index 00000000..fc76f15b
--- /dev/null
+++ b/recipes-containers/conmon/conmon_2.0.9.bb
@@ -0,0 +1,29 @@
+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 = "60b42f20f222df9da07a01ee444327348b9f54ee"
+SRC_URI = "\
+    git://github.com/containers/conmon.git \
+"
+
+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
deleted file mode 100644
index 8d2b473d..00000000
--- a/recipes-containers/conmon/files/0001-Makefile-don-t-fail-if-clean-is-called-without-a-bui.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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
-
-- 
cgit v1.2.3-54-g00ecf