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.

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

weston.service : rather handle --idle-time from /etc/xdg/weston/weston.ini #59

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ mmdebstrap:
- 'upload target/weston/weston /etc/default/weston'
- '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
- 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
- 'chroot "$1" mkdir -p /etc/xdg/weston/'
- 'upload target/etc/xdg/weston/weston.ini /etc/xdg/weston/weston.ini'
# Enable ssh to root user without password
- 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
- 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'
Expand Down
2 changes: 2 additions & 0 deletions configs/bdebstrap_configs/bookworm/bookworm-am62xx-evm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ mmdebstrap:
- 'upload target/weston/weston /etc/default/weston'
- '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
- 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
- 'chroot "$1" mkdir -p /etc/xdg/weston/'
- 'upload target/etc/xdg/weston/weston.ini /etc/xdg/weston/weston.ini'
# Enable ssh to root user without password
- 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
- 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ mmdebstrap:
- 'upload target/weston/weston /etc/default/weston'
- '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
- 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
- 'chroot "$1" mkdir -p /etc/xdg/weston/'
- 'upload target/etc/xdg/weston/weston.ini /etc/xdg/weston/weston.ini'
# Enable ssh to root user without password
- 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
- 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ mmdebstrap:
- 'upload target/weston/weston /etc/default/weston'
- '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
- 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
- 'chroot "$1" mkdir -p /etc/xdg/weston/'
- 'upload target/etc/xdg/weston/weston.ini /etc/xdg/weston/weston.ini'
# Enable ssh to root user without password
- 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
- 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ mmdebstrap:
- 'upload target/weston/weston /etc/default/weston'
- '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
- 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
- 'chroot "$1" mkdir -p /etc/xdg/weston/'
- 'upload target/etc/xdg/weston/weston.ini /etc/xdg/weston/weston.ini'
# Enable ssh to root user without password
- 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
- 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ mmdebstrap:
- 'upload target/weston/weston /etc/default/weston'
- '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
- 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
- 'chroot "$1" mkdir -p /etc/xdg/weston/'
- 'upload target/etc/xdg/weston/weston.ini /etc/xdg/weston/weston.ini'
# Enable ssh to root user without password
- 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
- 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,8 @@ mmdebstrap:
- 'upload target/weston/weston /etc/default/weston'
- '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
- 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
- 'chroot "$1" mkdir -p /etc/xdg/weston/'
- 'upload target/etc/xdg/weston/weston.ini /etc/xdg/weston/weston.ini'
# Enable ssh to root user without password
- 'chroot "$1" echo "PermitRootLogin yes" >> $1/etc/ssh/sshd_config'
- 'chroot "$1" echo "PermitEmptyPasswords yes" >> $1/etc/ssh/sshd_config'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ mmdebstrap:
- 'upload target/weston/weston.socket /etc/systemd/system/weston.socket'
- 'chroot "$1" mkdir -p /etc/default/'
- 'upload target/weston/weston /etc/default/weston'
- 'chroot "$1" mkdir -p /etc/xdg/weston/'
- 'upload target/etc/xdg/weston/weston.ini /etc/xdg/weston/weston.ini'
- '$BDEBSTRAP_HOOKS/enable-units "$1" weston'
- 'chroot "$1" echo "export WAYLAND_DISPLAY=wayland-1" >> $1/etc/profile'
# Enable ssh to root user without password
Expand Down
2 changes: 2 additions & 0 deletions target/etc/xdg/weston/weston.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[core]
idle-time=0
2 changes: 1 addition & 1 deletion target/weston/weston.service
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ ConditionPathExists=/dev/tty0
# Requires systemd-notify.so Weston plugin.
Type=simple
EnvironmentFile=/etc/default/weston
ExecStart=/usr/bin/weston --backend=drm-backend.so --continue-without-input --idle-time=0
ExecStart=/usr/bin/weston --backend=drm-backend.so --continue-without-input

# Optional watchdog setup
#TimeoutStartSec=60
Expand Down