Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix weston not starting under sysvinit #126

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix weston not starting under sysvinit #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion conf/distro/fsl-wayland.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)}"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe you should just set INIT_MANAGER directly to change to sysvinit. Then, the poky conf files will setup many variables, including DISTRO_FEATURES. See https://docs.yoctoproject.org/dev/singleindex.html#term-INIT_MANAGER.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So, in this case, there should be a ?= and let user to override that.

Another thing, think more about that, is we can set that in the base configuration file, so we avoiding repeating that.


# Remove conflicting backends
DISTRO_FEATURES:remove = "directfb x11"
Expand Down
2 changes: 1 addition & 1 deletion conf/distro/fslc-wayland.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 2 additions & 0 deletions recipes-fsl/images/fsl-image-machine-test.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)} \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is weston-sysvinit provided? I can't find it.

"
2 changes: 2 additions & 0 deletions recipes-fsl/images/fsl-image-multimedia.bb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""
Expand Down