Skip to contentSkip to conversation

conmon: bump to version 2.0.2

PATCH In review Stefan Agner 3 participants 8 messages Jan 15, 2020 – Feb 3, 2020 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 conmon: bump to version 2.0.2

From: Stefan Agner <[email protected]>

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.

---
 .../{conmon_2.0.0.bb => conmon_2.0.2.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.2.bb} (83%)
 delete mode 100644 recipes-containers/conmon/files/0001-Makefile-don-t-fail-if-clean-is-called-without-a-bui.patch
recipes-containers/conmon/conmon_2.0.2.bb renamed from recipes-containers/conmon/conmon_2.0.0.bb +1 -2
similarity index 83%
rename from recipes-containers/conmon/conmon_2.0.0.bb
rename to recipes-containers/conmon/conmon_2.0.2.bb
index f4e2cd6..378c309 100644
@@ -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"
recipes-containers/conmon/files/0001-Makefile-don-t-fail-if-clean-is-called-without-a-bui.patch deleted +0 -31
deleted file mode 100644
index 8d2b473..0000000
@@ -1,31 +0,0 @@
-From 6ef63dfcc65d5401bc7cc7170d569cefcdadcb38 Mon Sep 17 00:00:00 2001
-From: Stefan Agner <[email protected]>
-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 <[email protected]>
----
- 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
-
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 podman: bump to latest release 1.6.4

From: Stefan Agner <[email protected]>

Bump to latest podman release 1.6.4. The changelog lists some new features but mostly bugfixes between 1.6.1 and 1.6.4.

---
 ...ker-documentation-install-and-genera.patch | 43 +++++++++++++++++++
 recipes-containers/podman/podman_git.bb       |  7 +--
 2 files changed, 47 insertions(+), 3 deletions(-)
 create mode 100644 recipes-containers/podman/files/0001-Makefile-Fix-docker-documentation-install-and-genera.patch
recipes-containers/podman/files/0001-Makefile-Fix-docker-documentation-install-and-genera.patch new file +43 -0
new file mode 100644
index 0000000..59224af
@@ -0,0 +1,43 @@
+From 9558797fb7bb019810d18f7acdde93adc35d02cc Mon Sep 17 00:00:00 2001
+From: Morten Linderud <[email protected]>
+Date: Sat, 2 Nov 2019 12:58:38 +0100
+Subject: [PATCH] [Makefile] Fix docker documentation install and generation
+
+The final versions of the documentation has been shifted from `docs/` to
+`docs/build/man`. Most of the Makefile has been changed accordingly, but
+the docker documentation generation was not.
+
+Introduced by #4354
+
+Signed-off-by: Morten Linderud <[email protected]>
+Upstream-Status: Backport
+Signed-off-by: Stefan Agner <[email protected]>
+---
+ Makefile | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 98b7bbdf..feb8e0ca 100644
+--- a/src/import/Makefile
++++ b/src/import/Makefile
+@@ -376,7 +376,7 @@ podman-remote-%-release:
+ 	$(MAKE) podman-remote-v$(RELEASE_NUMBER)-$*.zip
+ 
+ docker-docs: docs
+-	(cd docs; ./dckrman.sh *.1)
++	(cd docs; ./dckrman.sh ./build/man/*.1)
+ 
+ changelog: ## Generate changelog
+ 	@echo "Creating changelog from $(CHANGELOG_BASE) to $(CHANGELOG_TARGET)"
+@@ -425,7 +425,7 @@ install.cni:
+ install.docker: docker-docs
+ 	install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
+ 	install ${SELINUXOPT} -m 755 docker $(DESTDIR)$(BINDIR)/docker
+-	install ${SELINUXOPT} -m 644 docs/docker*.1 -t $(DESTDIR)$(MANDIR)/man1
++	install ${SELINUXOPT} -m 644 docs/build/man/docker*.1 -t $(DESTDIR)$(MANDIR)/man1
+ 
+ install.systemd:
+ 	install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR}  ${DESTDIR}${USERSYSTEMDDIR} ${DESTDIR}${TMPFILESDIR}
+-- 
+2.17.1
+
recipes-containers/podman/podman_git.bb +4 -3
index 50d07ea..8a5a13a 100644
@@ -24,9 +24,10 @@ python __anonymous() {
         raise bb.parse.SkipRecipe(msg)
 }
 
-SRCREV = "233d95f4f0a815f11d1c1ae9aba16781c4eb2700"
+SRCREV = "5cc92849f7fc9dd734ca2fd8f3ae8830b9a7eb26"
 SRC_URI = " \
-    git://github.com/containers/libpod.git;branch=master \
+    git://github.com/containers/libpod.git;branch=v1.6 \
+    file://0001-Makefile-Fix-docker-documentation-install-and-genera.patch \
 "
 
 LICENSE = "Apache-2.0"
@@ -36,7 +37,7 @@ GO_IMPORT = "import"
 
 S = "${WORKDIR}/git"
 
-PV = "1.6.1+git${SRCREV}"
+PV = "1.6.4+git${SRCREV}"
 
 PACKAGES =+ "${PN}-contrib"
 
Signature · 1 line
2.17.1
#2 lore raw

Re: [meta-virtualization][zeus][PATCH 2/2] podman: bump to latest release 1.6.4

On Jan 15, 2020, at 1:54 PM, Stefan Agner <[email protected]> wrote:

From: Stefan Agner <[email protected]>

Bump to latest podman release 1.6.4. The changelog lists some new features but mostly bugfixes between 1.6.1 and 1.6.4.

---
...ker-documentation-install-and-genera.patch | 43 +++++++++++++++++++ recipes-containers/podman/podman_git.bb       |  7 +--

2 files changed, 47 insertions(+), 3 deletions(-)

create mode 100644 recipes-containers/podman/files/0001-Makefile-Fix-docker-documentation-install-and-genera.patch

<snip>

Whitespace errors:

Applying: podman: bump to latest release 1.6.4
.git/rebase-apply/patch:36: space before tab in indent.
       $(MAKE) podman-remote-v$(RELEASE_NUMBER)-$*.zip
.git/rebase-apply/patch:43: space before tab in indent.
       @echo "Creating changelog from $(CHANGELOG_BASE) to $(CHANGELOG_TARGET)" .git/rebase-apply/patch:46: space before tab in indent.
       install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 .git/rebase-apply/patch:47: space before tab in indent.
       install ${SELINUXOPT} -m 755 docker $(DESTDIR)$(BINDIR)/docker
.git/rebase-apply/patch:52: space before tab in indent.
       install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR}  ${DESTDIR}${USERSYSTEMDDIR} ${DESTDIR}${TMPFILESDIR}
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.

--
2.17.1

#3 lore raw

Re: [meta-virtualization][zeus][PATCH 2/2] podman: bump to latest release 1.6.4

Hi Tim,

Quoted 18 lines · Tim Orling
Quoted 7 lines · Stefan Agner

From: Stefan Agner <[email protected]>

Bump to latest podman release 1.6.4. The changelog lists some new features but mostly bugfixes between 1.6.1 and 1.6.4.

Quoted 6 lines

---
...ker-documentation-install-and-genera.patch | 43 +++++++++++++++++++
recipes-containers/podman/podman_git.bb | 7 +--

2 files changed, 47 insertions(+), 3 deletions(-)

create mode 100644 recipes-containers/podman/files/0001-Makefile-Fix-docker-documentation-install-and-genera.patch

<snip>

Whitespace errors:

Quoted 13 lines

Applying: podman: bump to latest release 1.6.4
.git/rebase-apply/patch:36: space before tab in indent.
$(MAKE) podman-remote-v$(RELEASE_NUMBER)-$*.zip
.git/rebase-apply/patch:43: space before tab in indent.
@echo "Creating changelog from $(CHANGELOG_BASE) to $(CHANGELOG_TARGET)" .git/rebase-apply/patch:46: space before tab in indent.
install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 .git/rebase-apply/patch:47: space before tab in indent.
install ${SELINUXOPT} -m 755 docker $(DESTDIR)$(BINDIR)/docker
.git/rebase-apply/patch:52: space before tab in indent.
install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR} ${DESTDIR}${USERSYSTEMDDIR} ${DESTDIR}${TMPFILESDIR}
warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.

From what I understand this is in the patch file, where a space is expected (or actually required...).

Best regards,
Stefan

Signature · 1 line
2.17.1

A message that is not in the archive (sent off-list or not yet received): [email protected]

Acked-by Tested-by
#5 lore raw

Re: [meta-virtualization][zeus][PATCH 2/2] podman: bump to latest release 1.6.4

Quoted 14 lines · Tim Orling
Quoted 11 lines · Stefan Agner

From: Stefan Agner <[email protected]>

Bump to latest podman release 1.6.4. The changelog lists some new features but mostly bugfixes between 1.6.1 and 1.6.4.

Aside from the whitespace errors…
Thank you for fixing this build, this version was not previously buildable for me probably because of the needed patch.

Quoted 30 lines
Quoted 5 lines

---
...ker-documentation-install-and-genera.patch | 43 +++++++++++++++++++
recipes-containers/podman/podman_git.bb | 7 +--

2 files changed, 47 insertions(+), 3 deletions(-)

create mode 100644 recipes-containers/podman/files/0001-Makefile-Fix-docker-documentation-install-and-genera.patch

<snip>

Whitespace errors:

Applying: podman: bump to latest release 1.6.4 .git/rebase-apply/patch:36: space before tab in indent.

       $(MAKE) podman-remote-v$(RELEASE_NUMBER)-$*.zip
.git/rebase-apply/patch:43: space before tab in indent.
       @echo "Creating changelog from $(CHANGELOG_BASE) to $(CHANGELOG_TARGET)"
.git/rebase-apply/patch:46: space before tab in indent.
       install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
.git/rebase-apply/patch:47: space before tab in indent.
       install ${SELINUXOPT} -m 755 docker $(DESTDIR)$(BINDIR)/docker
.git/rebase-apply/patch:52: space before tab in indent.
       install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR}  ${DESTDIR}${USERSYSTEMDDIR} ${DESTDIR}${TMPFILESDIR}

warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.

Quoted 4 lines
Signature · 2 lines
-- 
2.17.1
#6 lore raw

Re: [meta-virtualization][zeus][PATCH 2/2] podman: bump to latest release 1.6.4

Quoted 6 lines · Tim Orling
Quoted 6 lines · Tim Orling
Quoted 5 lines · Stefan Agner
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines

From: Stefan Agner <[email protected]>

Bump to latest podman release 1.6.4. The changelog lists some new features but mostly bugfixes between 1.6.1 and 1.6.4.

Aside from the whitespace errors…

See comment in reply to the other email.

Quoted 6 lines

Thank you for fixing this build, this version was not previously buildable for me probably because of the needed patch.

Yes, after the patch things started to work here. FWIW, I also tested this on actual hardware, that is where I realized I also have to update conman...

Thanks for testing!

--
Stefan

Quoted 30 lines
Quoted 30 lines
Quoted 5 lines

---
...ker-documentation-install-and-genera.patch | 43 +++++++++++++++++++
recipes-containers/podman/podman_git.bb | 7 +--

2 files changed, 47 insertions(+), 3 deletions(-)

create mode 100644 recipes-containers/podman/files/0001-Makefile-Fix-docker-documentation-install-and-genera.patch

<snip>

Whitespace errors:

Applying: podman: bump to latest release 1.6.4 .git/rebase-apply/patch:36: space before tab in indent.

       $(MAKE) podman-remote-v$(RELEASE_NUMBER)-$*.zip
.git/rebase-apply/patch:43: space before tab in indent.
       @echo "Creating changelog from $(CHANGELOG_BASE) to $(CHANGELOG_TARGET)"
.git/rebase-apply/patch:46: space before tab in indent.
       install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
.git/rebase-apply/patch:47: space before tab in indent.
       install ${SELINUXOPT} -m 755 docker $(DESTDIR)$(BINDIR)/docker
.git/rebase-apply/patch:52: space before tab in indent.
       install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR}  ${DESTDIR}${USERSYSTEMDDIR} ${DESTDIR}${TMPFILESDIR}

warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.

Quoted 4 lines

--
2.17.1

#7 lore raw

Re: [meta-virtualization][zeus][PATCH 2/2] podman: bump to latest release 1.6.4

In message: Re: [meta-virtualization][zeus][PATCH 2/2] podman: bump to latest release 1.6.4

Quoted 21 lines · on 16/01/2020 Stefan Agner wrote:
Quoted 6 lines · Tim Orling
Quoted 6 lines · Tim Orling
Quoted 5 lines · Stefan Agner
Quoted 8 lines
Quoted 6 lines
Quoted 6 lines

From: Stefan Agner <[email protected]>

Bump to latest podman release 1.6.4. The changelog lists some new features but mostly bugfixes between 1.6.1 and 1.6.4.

Aside from the whitespace errors…

See comment in reply to the other email.

Quoted 3 lines

Thank you for fixing this build, this version was not previously buildable for me probably because of the needed patch.

Quoted 7 lines
Quoted 3 lines

Yes, after the patch things started to work here. FWIW, I also tested this on actual hardware, that is where I realized I also have to update conman...

As I mentioned in my first replies, i don't normally want to do version bumps in the -stable branches.

But since this is mainly bugfixes, stays on the same release branch of the packages AND most importantly .. makes them build/work, i've gone ahead and done the merge.

Bruce

Quoted 39 lines

Thanks for testing!

--
Stefan

Quoted 30 lines
Quoted 30 lines
Quoted 5 lines

---
...ker-documentation-install-and-genera.patch | 43 +++++++++++++++++++
recipes-containers/podman/podman_git.bb | 7 +--

2 files changed, 47 insertions(+), 3 deletions(-)

create mode 100644 recipes-containers/podman/files/0001-Makefile-Fix-docker-documentation-install-and-genera.patch

<snip>

Whitespace errors:

Applying: podman: bump to latest release 1.6.4 .git/rebase-apply/patch:36: space before tab in indent.

       $(MAKE) podman-remote-v$(RELEASE_NUMBER)-$*.zip
.git/rebase-apply/patch:43: space before tab in indent.
       @echo "Creating changelog from $(CHANGELOG_BASE) to $(CHANGELOG_TARGET)"
.git/rebase-apply/patch:46: space before tab in indent.
       install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
.git/rebase-apply/patch:47: space before tab in indent.
       install ${SELINUXOPT} -m 755 docker $(DESTDIR)$(BINDIR)/docker
.git/rebase-apply/patch:52: space before tab in indent.
       install ${SELINUXOPT} -m 755 -d ${DESTDIR}${SYSTEMDDIR}  ${DESTDIR}${USERSYSTEMDDIR} ${DESTDIR}${TMPFILESDIR}

warning: squelched 1 whitespace error
warning: 6 lines add whitespace errors.

Quoted 4 lines

--
2.17.1

Acked-by Tested-by on v1 1/2
#8 lore raw
In reply to Stefan Agner
Quoted 14 lines · Stefan Agner

From: Stefan Agner <[email protected]>

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.

Quoted 67 lines

---
.../{conmon_2.0.0.bb => conmon_2.0.2.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.2.bb} (83%)
delete mode 100644 recipes-containers/conmon/files/0001-Makefile-don-t-fail-if-clean-is-called-without-a-bui.patch

recipes-containers/conmon/conmon_2.0.2.bb renamed from recipes-containers/conmon/conmon_2.0.0.bb +0 -0
similarity index 83%
rename from recipes-containers/conmon/conmon_2.0.0.bb
rename to recipes-containers/conmon/conmon_2.0.2.bb
index f4e2cd6..378c309 100644
@@ -6,10 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=61af0b6932ea7b12fb9142721043bc77"
 

DEPENDS = "glib-2.0"

recipes-containers/conmon/conmon_2.0.2.bb renamed from recipes-containers/conmon/conmon_2.0.0.bb +1 -1
-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"

recipes-containers/conmon/files/0001-Makefile-don-t-fail-if-clean-is-called-without-a-bui.patch deleted +0 -31
deleted file mode 100644
index 8d2b473..0000000
@@ -1,31 +0,0 @@
-From 6ef63dfcc65d5401bc7cc7170d569cefcdadcb38 Mon Sep 17 00:00:00 2001
-From: Stefan Agner <[email protected]>
-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 <[email protected]>
----
- 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
-
Signature · 1 line
2.17.1