* [meta-virtualization][PATCH 1/2] conmon: bump to version 2.0.9
@ 2020-01-15 23:29 Stefan Agner
2020-01-15 23:29 ` [meta-virtualization][PATCH 2/2] podman: bump to latest release 1.7.0 Stefan Agner
2020-01-17 21:27 ` [meta-virtualization][PATCH 1/2] conmon: bump to version 2.0.9 Bruce Ashfield
0 siblings, 2 replies; 4+ messages in thread
From: Stefan Agner @ 2020-01-15 23:29 UTC (permalink / raw)
To: meta-virtualization; +Cc: stefan, timothy.t.orling, Stefan Agner
From: Stefan Agner <stefan.agner@toradex.com>
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>
---
.../{conmon_2.0.0.bb => conmon_2.0.9.bb} | 3 +-
...ail-if-clean-is-called-without-a-bui.patch | 31 -------------------
2 files changed, 1 insertion(+), 33 deletions(-)
rename recipes-containers/conmon/{conmon_2.0.0.bb => conmon_2.0.9.bb} (83%)
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.9.bb
similarity index 83%
rename from recipes-containers/conmon/conmon_2.0.0.bb
rename to recipes-containers/conmon/conmon_2.0.9.bb
index f4e2cd6..fc76f15 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"
DEPENDS = "glib-2.0"
-SRCREV = "e217fdff82e0b1a6184a28c43043a4065083407f"
+SRCREV = "60b42f20f222df9da07a01ee444327348b9f54ee"
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"
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 8d2b473..0000000
--- 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
-
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [meta-virtualization][PATCH 2/2] podman: bump to latest release 1.7.0
2020-01-15 23:29 [meta-virtualization][PATCH 1/2] conmon: bump to version 2.0.9 Stefan Agner
@ 2020-01-15 23:29 ` Stefan Agner
2020-01-17 21:27 ` [meta-virtualization][PATCH 1/2] conmon: bump to version 2.0.9 Bruce Ashfield
1 sibling, 0 replies; 4+ messages in thread
From: Stefan Agner @ 2020-01-15 23:29 UTC (permalink / raw)
To: meta-virtualization; +Cc: stefan, timothy.t.orling, Stefan Agner
From: Stefan Agner <stefan.agner@toradex.com>
Bump to latest podman release 1.7.0. It features improvements to
networking, podman play kube, and systemd unit file integration.
They have also added the podman system reset command, to remove all
existing containers, pods, images, and volumes and reset the system
to its initial state.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
---
recipes-containers/podman/podman_git.bb | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
index e73c028..5db9ed2 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -24,7 +24,7 @@ python __anonymous() {
raise bb.parse.SkipRecipe(msg)
}
-SRCREV = "f3ffda1e08f19e9a6a88484136b5eed76533f21a"
+SRCREV = "b7ce1157b00af09f4a09e39b377aa3abff46ee05"
SRC_URI = " \
git://github.com/containers/libpod.git;branch=master \
"
@@ -36,15 +36,14 @@ GO_IMPORT = "import"
S = "${WORKDIR}/git"
-PV = "1.6.2+git${SRCREV}"
+PV = "1.7.0+git${SRCREV}"
PACKAGES =+ "${PN}-contrib"
PODMAN_PKG = "github.com/containers/libpod"
-BUILDTAGS ?= "seccomp varlink remoteclient \
+BUILDTAGS ?= "seccomp varlink \
${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \
-exclude_graphdriver_btrfs exclude_graphdriver_devicemapper \
-containers_image_ostree_stub"
+exclude_graphdriver_btrfs exclude_graphdriver_devicemapper"
# overide LDFLAGS to allow podman to build without: "flag provided but not # defined: -Wl,-O1
export LDFLAGS=""
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [meta-virtualization][PATCH 1/2] conmon: bump to version 2.0.9
2020-01-15 23:29 [meta-virtualization][PATCH 1/2] conmon: bump to version 2.0.9 Stefan Agner
2020-01-15 23:29 ` [meta-virtualization][PATCH 2/2] podman: bump to latest release 1.7.0 Stefan Agner
@ 2020-01-17 21:27 ` Bruce Ashfield
2020-01-17 22:47 ` Stefan Agner
1 sibling, 1 reply; 4+ messages in thread
From: Bruce Ashfield @ 2020-01-17 21:27 UTC (permalink / raw)
To: Stefan Agner; +Cc: meta-virtualization, Tim Orling, Stefan Agner
I've merged the version bumps to master.
But I'm still undecided on bringing them to Zeus. Although they are
largely bug fix releases .. they aren't entirely bug fixes.
I'd rather not increment versions on the older branches unless we are
fixing a CVE, or individual patches are difficult to backport.
Thoughts ? I'm open to being convinced to do the version bumps on the
released branch, but didn't see anything really compelling in the
shortlogs.
Bruce
On Wed, Jan 15, 2020 at 6:29 PM Stefan Agner <stefan@agner.ch> wrote:
>
> From: Stefan Agner <stefan.agner@toradex.com>
>
> 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>
> ---
> .../{conmon_2.0.0.bb => conmon_2.0.9.bb} | 3 +-
> ...ail-if-clean-is-called-without-a-bui.patch | 31 -------------------
> 2 files changed, 1 insertion(+), 33 deletions(-)
> rename recipes-containers/conmon/{conmon_2.0.0.bb => conmon_2.0.9.bb} (83%)
> 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.9.bb
> similarity index 83%
> rename from recipes-containers/conmon/conmon_2.0.0.bb
> rename to recipes-containers/conmon/conmon_2.0.9.bb
> index f4e2cd6..fc76f15 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"
>
> DEPENDS = "glib-2.0"
>
> -SRCREV = "e217fdff82e0b1a6184a28c43043a4065083407f"
> +SRCREV = "60b42f20f222df9da07a01ee444327348b9f54ee"
> 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"
> 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 8d2b473..0000000
> --- 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
> -
> --
> 2.17.1
>
>
--
- Thou shalt not follow the NULL pointer, for chaos and madness await
thee at its end
- "Use the force Harry" - Gandalf, Star Trek II
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [meta-virtualization][PATCH 1/2] conmon: bump to version 2.0.9
2020-01-17 21:27 ` [meta-virtualization][PATCH 1/2] conmon: bump to version 2.0.9 Bruce Ashfield
@ 2020-01-17 22:47 ` Stefan Agner
0 siblings, 0 replies; 4+ messages in thread
From: Stefan Agner @ 2020-01-17 22:47 UTC (permalink / raw)
To: Bruce Ashfield; +Cc: meta-virtualization, Tim Orling, Stefan Agner
On 2020-01-17 22:27, Bruce Ashfield wrote:
> I've merged the version bumps to master.
>
> But I'm still undecided on bringing them to Zeus. Although they are
> largely bug fix releases .. they aren't entirely bug fixes.
I cannot say much about this since I (unfortunately) do not use podman a
lot yet. It seems like a lot of bug fixes though :-)
>
> I'd rather not increment versions on the older branches unless we are
> fixing a CVE, or individual patches are difficult to backport.
>
> Thoughts ? I'm open to being convinced to do the version bumps on the
> released branch, but didn't see anything really compelling in the
> shortlogs.
It probably would be good if we at least bump conmon as the release
notes say "Version 2.0.1 or greater of Conmon is strongly recommended".
--
Stefan
>
> Bruce
>
> On Wed, Jan 15, 2020 at 6:29 PM Stefan Agner <stefan@agner.ch> wrote:
>>
>> From: Stefan Agner <stefan.agner@toradex.com>
>>
>> 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>
>> ---
>> .../{conmon_2.0.0.bb => conmon_2.0.9.bb} | 3 +-
>> ...ail-if-clean-is-called-without-a-bui.patch | 31 -------------------
>> 2 files changed, 1 insertion(+), 33 deletions(-)
>> rename recipes-containers/conmon/{conmon_2.0.0.bb => conmon_2.0.9.bb} (83%)
>> 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.9.bb
>> similarity index 83%
>> rename from recipes-containers/conmon/conmon_2.0.0.bb
>> rename to recipes-containers/conmon/conmon_2.0.9.bb
>> index f4e2cd6..fc76f15 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"
>>
>> DEPENDS = "glib-2.0"
>>
>> -SRCREV = "e217fdff82e0b1a6184a28c43043a4065083407f"
>> +SRCREV = "60b42f20f222df9da07a01ee444327348b9f54ee"
>> 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"
>> 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 8d2b473..0000000
>> --- 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
>> -
>> --
>> 2.17.1
>>
>>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-01-17 22:47 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-15 23:29 [meta-virtualization][PATCH 1/2] conmon: bump to version 2.0.9 Stefan Agner
2020-01-15 23:29 ` [meta-virtualization][PATCH 2/2] podman: bump to latest release 1.7.0 Stefan Agner
2020-01-17 21:27 ` [meta-virtualization][PATCH 1/2] conmon: bump to version 2.0.9 Bruce Ashfield
2020-01-17 22:47 ` Stefan Agner
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.