diff --git a/conf/distro/fsl-wayland.conf b/conf/distro/fsl-wayland.conf index 6fdda98..46cb2f3 100644 --- a/conf/distro/fsl-wayland.conf +++ b/conf/distro/fsl-wayland.conf @@ -6,7 +6,7 @@ DISTRO = "fsl-wayland" DISTRO_NAME = "FSL Wayland" # Define Init System -INIT_MANAGER = "systemd" +INIT_MANAGER = "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit', 'systemd', d)}" # Remove conflicting backends DISTRO_FEATURES:remove = "directfb x11" diff --git a/conf/distro/fslc-wayland.conf b/conf/distro/fslc-wayland.conf index 95cf0ac..7b4e3f3 100644 --- a/conf/distro/fslc-wayland.conf +++ b/conf/distro/fslc-wayland.conf @@ -6,7 +6,7 @@ DISTRO = "fslc-wayland" DISTRO_NAME = "FSLC Wayland" # Define Init System -INIT_MANAGER = "systemd" +INIT_MANAGER = "${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', 'sysvinit', 'systemd', d)}" # Remove conflicting backends DISTRO_FEATURES:remove = "directfb x11" diff --git a/recipes-fsl/images/fsl-image-machine-test.bb b/recipes-fsl/images/fsl-image-machine-test.bb index c78828e..a464896 100644 --- a/recipes-fsl/images/fsl-image-machine-test.bb +++ b/recipes-fsl/images/fsl-image-machine-test.bb @@ -28,4 +28,6 @@ CORE_IMAGE_EXTRA_INSTALL += " \ 'weston weston-init', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', \ 'weston-xwayland xterm', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', \ + 'weston-sysvinit', '', d)} \ " diff --git a/recipes-fsl/images/fsl-image-multimedia.bb b/recipes-fsl/images/fsl-image-multimedia.bb index 3a3ce28..93e8e99 100644 --- a/recipes-fsl/images/fsl-image-multimedia.bb +++ b/recipes-fsl/images/fsl-image-multimedia.bb @@ -21,6 +21,8 @@ CORE_IMAGE_EXTRA_INSTALL += " \ gtk+3-demo', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', \ 'weston-xwayland xterm', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'sysvinit', \ + 'weston-sysvinit', '', d)} \ " PACKAGE_IMX_TO_REMOVE = ""