conmon: bump to version 2.0.11
PATCH 1/3 conmon: bump to version 2.0.11
From: Stefan Agner <[email protected]>
Bump to latest version 2.0.11 of conmon.
---
recipes-containers/conmon/{conmon_2.0.9.bb => conmon_2.0.11.bb} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
rename recipes-containers/conmon/{conmon_2.0.9.bb => conmon_2.0.11.bb} (93%)recipes-containers/conmon/conmon_2.0.11.bb renamed from recipes-containers/conmon/conmon_2.0.9.bb +1 -1
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=61af0b6932ea7b12fb9142721043bc77" DEPENDS = "glib-2.0" -SRCREV = "60b42f20f222df9da07a01ee444327348b9f54ee" +SRCREV = "ff9d97a08d7a4b58267ac03719786e4e7258cecf" SRC_URI = "\ git://github.com/containers/conmon.git \ "
Signature · 1 line
2.17.1
PATCH 2/3 podman: bump to the latest version 1.8.1
From: Stefan Agner <[email protected]>
Bump to the newest podman release 1.8.1. Many new networking features and a new HTTP API has been added since 1.6.1.
--- recipes-containers/podman/podman_git.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
recipes-containers/podman/podman_git.bb +2 -2
@@ -24,7 +24,7 @@ python __anonymous() { raise bb.parse.SkipRecipe(msg) } -SRCREV = "b7ce1157b00af09f4a09e39b377aa3abff46ee05" +SRCREV = "444a19cdd2e6108c75f6c1aadc1a2a9138a8bd73" SRC_URI = " \ git://github.com/containers/libpod.git;branch=master \ "
@@ -36,7 +36,7 @@ GO_IMPORT = "import" S = "${WORKDIR}/git" -PV = "1.7.0+git${SRCREV}" +PV = "1.8.1+git${SRCREV}" PACKAGES =+ "${PN}-contrib"
Signature · 1 line
2.17.1
merged.
Bruce
In message: [meta-virtualization][PATCH 1/3] conmon: bump to version 2.0.11
Quoted 31 lines · on 11/03/2020 Stefan Agner wrote:
From: Stefan Agner <[email protected]>
Bump to latest version 2.0.11 of conmon.
Signed-off-by Stefan Agner <[email protected]>--- recipes-containers/conmon/{conmon_2.0.9.bb => conmon_2.0.11.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename recipes-containers/conmon/{conmon_2.0.9.bb => conmon_2.0.11.bb} (93%)recipes-containers/conmon/conmon_2.0.11.bb renamed from recipes-containers/conmon/conmon_2.0.9.bb +1
-1@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=61af0b6932ea7b12fb9142721043bc77" DEPENDS = "glib-2.0" -SRCREV = "60b42f20f222df9da07a01ee444327348b9f54ee" +SRCREV = "ff9d97a08d7a4b58267ac03719786e4e7258cecf" SRC_URI = "\ git://github.com/containers/conmon.git \ "Signature · 1 line
2.17.1
merged.
Bruce
In message: [meta-virtualization][PATCH 1/3] conmon: bump to version 2.0.11
Quoted 31 lines · on 11/03/2020 Stefan Agner wrote:
From: Stefan Agner <[email protected]>
Bump to latest version 2.0.11 of conmon.
Signed-off-by Stefan Agner <[email protected]>--- recipes-containers/conmon/{conmon_2.0.9.bb => conmon_2.0.11.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename recipes-containers/conmon/{conmon_2.0.9.bb => conmon_2.0.11.bb} (93%)recipes-containers/conmon/conmon_2.0.11.bb renamed from recipes-containers/conmon/conmon_2.0.9.bb +1
-1@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=61af0b6932ea7b12fb9142721043bc77" DEPENDS = "glib-2.0" -SRCREV = "60b42f20f222df9da07a01ee444327348b9f54ee" +SRCREV = "ff9d97a08d7a4b58267ac03719786e4e7258cecf" SRC_URI = "\ git://github.com/containers/conmon.git \ "Signature · 1 line
2.17.1
PATCH 3/3 podman: add system service for podman
In reply to Stefan AgnerFrom: Stefan Agner <[email protected]>
Add system service for podman which starts a podman instance allow to access the new HTTP based API (apiv2).
--- recipes-containers/podman/podman_git.bb | 8 ++++++++ 1 file changed, 8 insertions(+)
recipes-containers/podman/podman_git.bb +8 -0
@@ -97,6 +97,12 @@ do_install() { if ${@bb.utils.contains('PACKAGECONFIG', 'docker', 'true', 'false', d)}; then oe_runmake install.docker DESTDIR="${D}" fi + if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + install -d ${D}${systemd_unitdir}/system + install -m 644 ${S}/src/import/contrib/systemd/system/podman.service ${D}/${systemd_unitdir}/system + install -m 644 ${S}/src/import/contrib/systemd/system/podman.socket ${D}/${systemd_unitdir}/system + rm -f ${D}/${systemd_unitdir}/system/docker.service.rpm + fi } FILES_${PN} += " \
@@ -106,6 +112,8 @@ FILES_${PN} += " \ ${sysconfdir}/cni \ " +SYSTEMD_SERVICE_${PN} = "podman.service podman.socket" + RDEPENDS_${PN} += "conmon virtual/runc iptables cni skopeo" RRECOMMENDS_${PN} += "slirp4netns" RCONFLICTS_${PN} = "${@bb.utils.contains('PACKAGECONFIG', 'docker', 'docker', '', d)}"
Signature · 1 line
2.17.1