* [meta-virtualization][zeus][PATCH 1/2] conmon: bump to version 2.0.2
@ 2020-01-15 21:54 Stefan Agner
2020-01-15 21:54 ` [meta-virtualization][zeus][PATCH 2/2] podman: bump to latest release 1.6.4 Stefan Agner
2020-01-16 2:17 ` [meta-virtualization][zeus][PATCH 1/2] conmon: bump to version 2.0.2 Tim Orling
0 siblings, 2 replies; 8+ messages in thread
From: Stefan Agner @ 2020-01-15 21:54 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.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>
---
.../{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
diff --git a/recipes-containers/conmon/conmon_2.0.0.bb b/recipes-containers/conmon/conmon_2.0.2.bb
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
--- a/recipes-containers/conmon/conmon_2.0.0.bb
+++ b/recipes-containers/conmon/conmon_2.0.2.bb
@@ -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"
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] 8+ messages in thread* [meta-virtualization][zeus][PATCH 2/2] podman: bump to latest release 1.6.4
2020-01-15 21:54 [meta-virtualization][zeus][PATCH 1/2] conmon: bump to version 2.0.2 Stefan Agner
@ 2020-01-15 21:54 ` Stefan Agner
2020-01-16 0:47 ` Tim Orling
[not found] ` <15EA3791FF24F7E5.21921@lists.yoctoproject.org>
2020-01-16 2:17 ` [meta-virtualization][zeus][PATCH 1/2] conmon: bump to version 2.0.2 Tim Orling
1 sibling, 2 replies; 8+ messages in thread
From: Stefan Agner @ 2020-01-15 21:54 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.6.4. The changelog lists some new
features but mostly bugfixes between 1.6.1 and 1.6.4.
Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
---
...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
diff --git a/recipes-containers/podman/files/0001-Makefile-Fix-docker-documentation-install-and-genera.patch b/recipes-containers/podman/files/0001-Makefile-Fix-docker-documentation-install-and-genera.patch
new file mode 100644
index 0000000..59224af
--- /dev/null
+++ b/recipes-containers/podman/files/0001-Makefile-Fix-docker-documentation-install-and-genera.patch
@@ -0,0 +1,43 @@
+From 9558797fb7bb019810d18f7acdde93adc35d02cc Mon Sep 17 00:00:00 2001
+From: Morten Linderud <morten@linderud.pw>
+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 <morten@linderud.pw>
+Upstream-Status: Backport
+Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
+---
+ 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
+
diff --git a/recipes-containers/podman/podman_git.bb b/recipes-containers/podman/podman_git.bb
index 50d07ea..8a5a13a 100644
--- a/recipes-containers/podman/podman_git.bb
+++ b/recipes-containers/podman/podman_git.bb
@@ -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"
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [meta-virtualization][zeus][PATCH 2/2] podman: bump to latest release 1.6.4
2020-01-15 21:54 ` [meta-virtualization][zeus][PATCH 2/2] podman: bump to latest release 1.6.4 Stefan Agner
@ 2020-01-16 0:47 ` Tim Orling
2020-01-16 7:23 ` Stefan Agner
[not found] ` <15EA3791FF24F7E5.21921@lists.yoctoproject.org>
1 sibling, 1 reply; 8+ messages in thread
From: Tim Orling @ 2020-01-16 0:47 UTC (permalink / raw)
To: Stefan Agner; +Cc: meta-virtualization, Stefan Agner
[-- Attachment #1: Type: text/html, Size: 2054 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [meta-virtualization][zeus][PATCH 2/2] podman: bump to latest release 1.6.4
2020-01-16 0:47 ` Tim Orling
@ 2020-01-16 7:23 ` Stefan Agner
0 siblings, 0 replies; 8+ messages in thread
From: Stefan Agner @ 2020-01-16 7:23 UTC (permalink / raw)
To: Tim Orling; +Cc: meta-virtualization, Stefan Agner
[-- Attachment #1: Type: text/plain, Size: 1702 bytes --]
Hi Tim,
On 2020-01-16 01:47, Tim Orling wrote:
>> On Jan 15, 2020, at 1:54 PM, Stefan Agner <stefan@agner.ch> wrote:
>>
>> From: Stefan Agner <stefan.agner@toradex.com>
>>
>> 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.
>>
>> Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
>> ---
>> ...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.
From what I understand this is in the patch file, where a space is
expected (or actually required...).
Best regards,
Stefan
--
2.17.1
[-- Attachment #2: Type: text/html, Size: 3057 bytes --]
^ permalink raw reply [flat|nested] 8+ messages in thread
[parent not found: <15EA3791FF24F7E5.21921@lists.yoctoproject.org>]
* Re: [meta-virtualization][zeus][PATCH 2/2] podman: bump to latest release 1.6.4
[not found] ` <15EA3791FF24F7E5.21921@lists.yoctoproject.org>
@ 2020-01-16 2:21 ` Tim Orling
2020-01-16 7:25 ` Stefan Agner
0 siblings, 1 reply; 8+ messages in thread
From: Tim Orling @ 2020-01-16 2:21 UTC (permalink / raw)
To: Stefan Agner; +Cc: meta-virtualization, Stefan Agner
> On Jan 15, 2020, at 4:47 PM, Tim Orling <timothy.t.orling@linux.intel.com> wrote:
>
>
>
>> On Jan 15, 2020, at 1:54 PM, Stefan Agner <stefan@agner.ch> wrote:
>>
>> From: Stefan Agner <stefan.agner@toradex.com>
>>
>> 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.
>>
>> Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
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.
Acked-by: Tim Orling <timothy.t.orling@linux.intel.com>
Tested-by: Tim Orling <timothy.t.orling@linux.intel.com>
>> ---
>> ...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
>>
>
>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [meta-virtualization][zeus][PATCH 2/2] podman: bump to latest release 1.6.4
2020-01-16 2:21 ` Tim Orling
@ 2020-01-16 7:25 ` Stefan Agner
2020-02-03 22:14 ` Bruce Ashfield
0 siblings, 1 reply; 8+ messages in thread
From: Stefan Agner @ 2020-01-16 7:25 UTC (permalink / raw)
To: Tim Orling; +Cc: meta-virtualization, Stefan Agner
On 2020-01-16 03:21, Tim Orling wrote:
>> On Jan 15, 2020, at 4:47 PM, Tim Orling <timothy.t.orling@linux.intel.com> wrote:
>>
>>
>>
>>> On Jan 15, 2020, at 1:54 PM, Stefan Agner <stefan@agner.ch> wrote:
>>>
>>> From: Stefan Agner <stefan.agner@toradex.com>
>>>
>>> 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.
>>>
>>> Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
>
> Aside from the whitespace errors…
See comment in reply to the other email.
> Thank you for fixing this build, this version was not previously
> buildable for me probably because of the needed patch.
>
> Acked-by: Tim Orling <timothy.t.orling@linux.intel.com>
> Tested-by: Tim Orling <timothy.t.orling@linux.intel.com>
>
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
>>> ---
>>> ...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
>>>
>>
>>
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [meta-virtualization][zeus][PATCH 2/2] podman: bump to latest release 1.6.4
2020-01-16 7:25 ` Stefan Agner
@ 2020-02-03 22:14 ` Bruce Ashfield
0 siblings, 0 replies; 8+ messages in thread
From: Bruce Ashfield @ 2020-02-03 22:14 UTC (permalink / raw)
To: Stefan Agner; +Cc: Tim Orling, meta-virtualization, Stefan Agner
In message: Re: [meta-virtualization][zeus][PATCH 2/2] podman: bump to latest release 1.6.4
on 16/01/2020 Stefan Agner wrote:
> On 2020-01-16 03:21, Tim Orling wrote:
> >> On Jan 15, 2020, at 4:47 PM, Tim Orling <timothy.t.orling@linux.intel.com> wrote:
> >>
> >>
> >>
> >>> On Jan 15, 2020, at 1:54 PM, Stefan Agner <stefan@agner.ch> wrote:
> >>>
> >>> From: Stefan Agner <stefan.agner@toradex.com>
> >>>
> >>> 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.
> >>>
> >>> Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
> >
> > Aside from the whitespace errors…
>
> See comment in reply to the other email.
>
> > Thank you for fixing this build, this version was not previously
> > buildable for me probably because of the needed patch.
> >
> > Acked-by: Tim Orling <timothy.t.orling@linux.intel.com>
> > Tested-by: Tim Orling <timothy.t.orling@linux.intel.com>
> >
>
> 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
>
> Thanks for testing!
>
> --
> Stefan
>
>
> >>> ---
> >>> ...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
> >>>
> >>
> >>
>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [meta-virtualization][zeus][PATCH 1/2] conmon: bump to version 2.0.2
2020-01-15 21:54 [meta-virtualization][zeus][PATCH 1/2] conmon: bump to version 2.0.2 Stefan Agner
2020-01-15 21:54 ` [meta-virtualization][zeus][PATCH 2/2] podman: bump to latest release 1.6.4 Stefan Agner
@ 2020-01-16 2:17 ` Tim Orling
1 sibling, 0 replies; 8+ messages in thread
From: Tim Orling @ 2020-01-16 2:17 UTC (permalink / raw)
To: Stefan Agner; +Cc: meta-virtualization, Stefan Agner
> On Jan 15, 2020, at 1:54 PM, Stefan Agner <stefan@agner.ch> wrote:
>
> From: Stefan Agner <stefan.agner@toradex.com>
>
> 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>
Acked-by: Tim Orling <timothy.t.orling@linux.intel.com>
Tested-by: Tim Orling <timothy.t.orling@linux.intel.com>
> ---
> .../{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
>
> diff --git a/recipes-containers/conmon/conmon_2.0.0.bb b/recipes-containers/conmon/conmon_2.0.2.bb
> 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
> --- a/recipes-containers/conmon/conmon_2.0.0.bb
> +++ b/recipes-containers/conmon/conmon_2.0.2.bb
> @@ -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"
> 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] 8+ messages in thread
end of thread, other threads:[~2020-02-03 22:14 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-01-15 21:54 [meta-virtualization][zeus][PATCH 1/2] conmon: bump to version 2.0.2 Stefan Agner
2020-01-15 21:54 ` [meta-virtualization][zeus][PATCH 2/2] podman: bump to latest release 1.6.4 Stefan Agner
2020-01-16 0:47 ` Tim Orling
2020-01-16 7:23 ` Stefan Agner
[not found] ` <15EA3791FF24F7E5.21921@lists.yoctoproject.org>
2020-01-16 2:21 ` Tim Orling
2020-01-16 7:25 ` Stefan Agner
2020-02-03 22:14 ` Bruce Ashfield
2020-01-16 2:17 ` [meta-virtualization][zeus][PATCH 1/2] conmon: bump to version 2.0.2 Tim Orling
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox