diff options
| author | Stefan Agner <stefan.agner@toradex.com> | 2020-01-15 23:29:35 +0000 |
|---|---|---|
| committer | Bruce Ashfield <bruce.ashfield@gmail.com> | 2020-01-17 16:24:59 -0500 |
| commit | 179046584f3bf49c974409d91a5950ed226968a5 (patch) | |
| tree | 6ba401420ce664524f76d6f3cfb7c1be2853dd72 | |
| parent | b4c43fd51fa8fe02e0c72005bd31e281a199788f (diff) | |
| download | meta-virtualization-179046584f3bf49c974409d91a5950ed226968a5.tar.gz | |
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>
| -rw-r--r-- | recipes-containers/conmon/conmon_2.0.9.bb (renamed from recipes-containers/conmon/conmon_2.0.0.bb) | 3 | ||||
| -rw-r--r-- | recipes-containers/conmon/files/0001-Makefile-don-t-fail-if-clean-is-called-without-a-bui.patch | 31 |
2 files changed, 1 insertions, 33 deletions
diff --git a/recipes-containers/conmon/conmon_2.0.0.bb b/recipes-containers/conmon/conmon_2.0.9.bb index f4e2cd62..fc76f15b 100644 --- a/recipes-containers/conmon/conmon_2.0.0.bb +++ b/recipes-containers/conmon/conmon_2.0.9.bb | |||
| @@ -6,10 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=61af0b6932ea7b12fb9142721043bc77" | |||
| 6 | 6 | ||
| 7 | DEPENDS = "glib-2.0" | 7 | DEPENDS = "glib-2.0" |
| 8 | 8 | ||
| 9 | SRCREV = "e217fdff82e0b1a6184a28c43043a4065083407f" | 9 | SRCREV = "60b42f20f222df9da07a01ee444327348b9f54ee" |
| 10 | SRC_URI = "\ | 10 | SRC_URI = "\ |
| 11 | git://github.com/containers/conmon.git \ | 11 | git://github.com/containers/conmon.git \ |
| 12 | file://0001-Makefile-don-t-fail-if-clean-is-called-without-a-bui.patch \ | ||
| 13 | " | 12 | " |
| 14 | 13 | ||
| 15 | SRC_URI[md5sum] = "5c711911d766d76813333c3812277574" | 14 | SRC_URI[md5sum] = "5c711911d766d76813333c3812277574" |
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 @@ | |||
| 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 | |||
