[master/zeus/thud][PATCH] docker: install init script if sysvinit

[master/zeus/thud][PATCH] docker: install init script if sysvinit

[Jacob Stiffler]

The docker recipe in meta-virtualization has conflicting logic for
when to install and when to enable the docker initscript. When both
systemd and sysvinit are in DISTRO_FEATURES, this causes the docker
postinst to fail, which now fails the rootfs task.

Here we install the initscript only based on if sysvinit is in the
DISTRO_FEATURES.

Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
---
 meta-arago-distro/recipes-containers/docker/docker_git.bbappend | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 meta-arago-distro/recipes-containers/docker/docker_git.bbappend

diff --git a/meta-arago-distro/recipes-containers/docker/docker_git.bbappend b/meta-arago-distro/recipes-containers/docker/docker_git.bbappend
new file mode 100644
index 0000000..dbb7b04
--- /dev/null
+++ b/meta-arago-distro/recipes-containers/docker/docker_git.bbappend
@@ -0,0 +1,8 @@
+PR_append = ".tisdk0"
+
+do_install_append() {
+	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
+}
-- 
1.9.1

Re: [master/zeus/thud][PATCH] docker: install init script if sysvinit

[Stiffler, Jacob]

I checked again, and this is only applicable for thud.

Based on inspection, the issue has persisted into zeus and master, but the recipe names have changed.

- Jake

> -----Original Message-----
> From: Stiffler, Jacob
> Sent: Monday, February 10, 2020 8:02 AM
> To: meta-arago@arago-project.org
> Cc: Stiffler, Jacob
> Subject: [master/zeus/thud][PATCH] docker: install init script if sysvinit
> 
> The docker recipe in meta-virtualization has conflicting logic for
> when to install and when to enable the docker initscript. When both
> systemd and sysvinit are in DISTRO_FEATURES, this causes the docker
> postinst to fail, which now fails the rootfs task.
> 
> Here we install the initscript only based on if sysvinit is in the
> DISTRO_FEATURES.
> 
> Signed-off-by: Jacob Stiffler <j-stiffler@ti.com>
> ---
>  meta-arago-distro/recipes-containers/docker/docker_git.bbappend | 8
> ++++++++
>  1 file changed, 8 insertions(+)
>  create mode 100644 meta-arago-distro/recipes-
> containers/docker/docker_git.bbappend
> 
> diff --git a/meta-arago-distro/recipes-
> containers/docker/docker_git.bbappend b/meta-arago-distro/recipes-
> containers/docker/docker_git.bbappend
> new file mode 100644
> index 0000000..dbb7b04
> --- /dev/null
> +++ b/meta-arago-distro/recipes-containers/docker/docker_git.bbappend
> @@ -0,0 +1,8 @@
> +PR_append = ".tisdk0"
> +
> +do_install_append() {
> +	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
> +}
> --
> 1.9.1