[meta-virtualization][PATCH 1/3] docker: Fix for sysvinit

[meta-virtualization][PATCH 1/3] docker: Fix for sysvinit

[Leon Anavi]

Fix for rare legacy systems which still use simultaneously both
sysvinit and systemd in DISTRO_FEATURES. This fix avoids issues
during do_rootfs with postinstall scriptlets of ['docker-ce'].

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
---
 recipes-containers/docker/docker.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/recipes-containers/docker/docker.inc b/recipes-containers/docker/docker.inc
index cd4d27b..610da56 100644
--- a/recipes-containers/docker/docker.inc
+++ b/recipes-containers/docker/docker.inc
@@ -120,7 +120,8 @@ do_install() {
 		# replaces one copied from above with one that uses the local registry for a mirror
 		install -m 644 ${S}/src/import/contrib/init/systemd/docker.service ${D}/${systemd_unitdir}/system
 		rm -f ${D}/${systemd_unitdir}/system/docker.service.rpm
-	else
+	fi
+	if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
 		install -d ${D}${sysconfdir}/init.d
 		install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init
 	fi
-- 
2.17.1

[meta-virtualization][PATCH 2/3] python3-bugsnag: Upgrade 4.0.2 -> 4.1.0

[Leon Anavi]

Upgrade to release 4.1.0:

- Add support for breadcrumbs. These are short log statements that
  are attached to error reports to help diagnose what events led
  to the error.
- Apply filtering with params_filters to bytes, not just strings

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
---
 .../{python3-bugsnag_4.0.2.bb => python3-bugsnag_4.1.0.bb}      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename recipes-devtools/python/{python3-bugsnag_4.0.2.bb => python3-bugsnag_4.1.0.bb} (87%)

diff --git a/recipes-devtools/python/python3-bugsnag_4.0.2.bb b/recipes-devtools/python/python3-bugsnag_4.1.0.bb
similarity index 87%
rename from recipes-devtools/python/python3-bugsnag_4.0.2.bb
rename to recipes-devtools/python/python3-bugsnag_4.1.0.bb
index 96550bb..595cc8c 100644
--- a/recipes-devtools/python/python3-bugsnag_4.0.2.bb
+++ b/recipes-devtools/python/python3-bugsnag_4.1.0.bb
@@ -10,7 +10,7 @@ SECTION = "devel/python"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=8227180126797a0148f94f483f3e1489"
 
-SRC_URI[sha256sum] = "7a49dacf055a8c6dda4ce714acd91fabe9546f1ad826276918a26603a8b5489a"
+SRC_URI[sha256sum] = "dcbd59cd9edea26cc92efb6518aed83a2f356f81bfd5acc730bfe202fb27c1c1"
 
 inherit pypi setuptools3
 
-- 
2.17.1

[meta-virtualization][PATCH 3/3] python3-docker-compose: Upgrade 1.29.1 -> 1.29.2

[Leon Anavi]

Upgrade to release 1.29.2:

- Remove prompt to use docker compose in the up command
- Bump py to 1.10.0 in requirements-indirect.txt

Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
---
 ...cker-compose_1.29.1.bb => python3-docker-compose_1.29.2.bb} | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
 rename recipes-containers/docker-compose/{python3-docker-compose_1.29.1.bb => python3-docker-compose_1.29.2.bb} (88%)

diff --git a/recipes-containers/docker-compose/python3-docker-compose_1.29.1.bb b/recipes-containers/docker-compose/python3-docker-compose_1.29.2.bb
similarity index 88%
rename from recipes-containers/docker-compose/python3-docker-compose_1.29.1.bb
rename to recipes-containers/docker-compose/python3-docker-compose_1.29.2.bb
index d74f742..22b7150 100644
--- a/recipes-containers/docker-compose/python3-docker-compose_1.29.1.bb
+++ b/recipes-containers/docker-compose/python3-docker-compose_1.29.2.bb
@@ -5,8 +5,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=435b266b3899aa8a959f17d41c56def8"
 
 inherit pypi setuptools3
 
-SRC_URI[md5sum] = "49c202544c7e2eadbbe45da8e838ae02"
-SRC_URI[sha256sum] = "d2064934f5084db8a0c4805e226447bf1fd0c928419be95afb6bd1866838c1f1"
+SRC_URI[sha256sum] = "4c8cd9d21d237412793d18bd33110049ee9af8dab3fe2c213bbd0733959b09b7"
 
 
 SRC_URI += "file://0001-setup.py-remove-maximum-version-requirements.patch \
-- 
2.17.1

Re: [meta-virtualization][PATCH 1/3] docker: Fix for sysvinit

[Bruce Ashfield]

merged!

Bruce

In message: [meta-virtualization][PATCH 1/3] docker: Fix for sysvinit
on 16/07/2021 Leon Anavi wrote:

> Fix for rare legacy systems which still use simultaneously both
> sysvinit and systemd in DISTRO_FEATURES. This fix avoids issues
> during do_rootfs with postinstall scriptlets of ['docker-ce'].
> 
> Signed-off-by: Leon Anavi <leon.anavi@konsulko.com>
> ---
>  recipes-containers/docker/docker.inc | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/recipes-containers/docker/docker.inc b/recipes-containers/docker/docker.inc
> index cd4d27b..610da56 100644
> --- a/recipes-containers/docker/docker.inc
> +++ b/recipes-containers/docker/docker.inc
> @@ -120,7 +120,8 @@ do_install() {
>  		# replaces one copied from above with one that uses the local registry for a mirror
>  		install -m 644 ${S}/src/import/contrib/init/systemd/docker.service ${D}/${systemd_unitdir}/system
>  		rm -f ${D}/${systemd_unitdir}/system/docker.service.rpm
> -	else
> +	fi
> +	if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
>  		install -d ${D}${sysconfdir}/init.d
>  		install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init
>  	fi
> -- 
> 2.17.1
> 

> 
> 
>