conmon: bump to version 2.0.2

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

Already Podman 1.6.0 actually recommended 2.0.1 and higher, with 1.6.3
this has been made mandatory. Use conmon 2.0.2 which is also used in
podmans build Dockerfile of the 1.6.4 release.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
This commit is contained in:
Stefan Agner 2020-01-15 21:54:13 +00:00 committed by Bruce Ashfield
parent f4262ab75d
commit 002acb5263
2 changed files with 1 additions and 33 deletions

View File

@ -6,10 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=61af0b6932ea7b12fb9142721043bc77"
DEPENDS = "glib-2.0"
SRCREV = "e217fdff82e0b1a6184a28c43043a4065083407f"
SRCREV = "65fe0226d85b69fc9e527e376795c9791199153d"
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"

View File

@ -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