mirror of
git://soft.sys114.com/odroid-stamper
synced 2025-12-19 00:18:42 +09:00
ODROID-COMMON: remove Weston from default distro
It will be replaced by the package 'odroid-kiosk-weston'. Signed-off-by: Dongjin Kim <tobetter@gmail.com> Change-Id: Id43d37d5603931859ebb29fa673cc62b4f203da9
This commit is contained in:
Dongjin Kim
@@ -1,7 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
sed -i "s/^User=.*/User=@@DEFAULT_USER@@/g" \
|
||||
/etc/systemd/system/weston.service
|
||||
|
||||
chmod 644 /etc/systemd/system/weston.service
|
||||
systemctl enable weston
|
||||
4
distro/focal/weston/fixups/S99-weston-cleanup
Normal file
4
distro/focal/weston/fixups/S99-weston-cleanup
Normal file
@@ -0,0 +1,4 @@
|
||||
#!/bin/sh
|
||||
|
||||
rm -f /etc/xdg/weston/weston.ini
|
||||
dpkg-reconfigure odroid-kiosk-weston
|
||||
@@ -1,35 +0,0 @@
|
||||
[Unit]
|
||||
Description=Weston Wayland Compositor (on tty7)
|
||||
RequiresMountsFor=/run
|
||||
Conflicts=getty@tty7.service plymouth-quit.service
|
||||
After=systemd-user-sessions.service getty@tty7.service plymouth-quit-wait.service
|
||||
|
||||
[Service]
|
||||
User=root
|
||||
PermissionsStartOnly=true
|
||||
|
||||
# Log us in via PAM so we get our XDG & co. environment and
|
||||
# are treated as logged in so we can use the tty:
|
||||
PAMName=login
|
||||
|
||||
# Grab tty7
|
||||
UtmpIdentifier=tty7
|
||||
TTYPath=/dev/tty7
|
||||
TTYReset=yes
|
||||
TTYVHangup=yes
|
||||
TTYVTDisallocate=yes
|
||||
|
||||
# stderr to journal so our logging doesn't get thrown into /dev/null
|
||||
StandardOutput=tty
|
||||
StandardInput=tty
|
||||
StandardError=journal
|
||||
EnvironmentFile=-/etc/default/weston
|
||||
|
||||
# Weston does not successfully change VT, nor does systemd place us on
|
||||
# the VT it just activated for us. Switch manually:
|
||||
ExecStartPre=/bin/chvt 7
|
||||
ExecStart=/usr/bin/weston-launch -- --log=/var/log/weston.log --xwayland $OPTARGS
|
||||
IgnoreSIGPIPE=no
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@@ -1,7 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
sed -i "s/^User=.*/User=@@DEFAULT_USER@@/g" \
|
||||
/etc/systemd/system/weston.service
|
||||
|
||||
chmod 644 /etc/systemd/system/weston.service
|
||||
systemctl enable weston
|
||||
4
distro/jammy/weston/fixups/S99-weston-cleanup
Normal file
4
distro/jammy/weston/fixups/S99-weston-cleanup
Normal file
@@ -0,0 +1,4 @@
|
||||
#!/bin/sh
|
||||
|
||||
rm -f /etc/xdg/weston/weston.ini
|
||||
dpkg-reconfigure odroid-kiosk-weston
|
||||
@@ -1,35 +0,0 @@
|
||||
[Unit]
|
||||
Description=Weston Wayland Compositor (on tty7)
|
||||
RequiresMountsFor=/run
|
||||
Conflicts=getty@tty7.service plymouth-quit.service
|
||||
After=systemd-user-sessions.service getty@tty7.service plymouth-quit-wait.service
|
||||
|
||||
[Service]
|
||||
User=root
|
||||
PermissionsStartOnly=true
|
||||
|
||||
# Log us in via PAM so we get our XDG & co. environment and
|
||||
# are treated as logged in so we can use the tty:
|
||||
PAMName=login
|
||||
|
||||
# Grab tty7
|
||||
UtmpIdentifier=tty7
|
||||
TTYPath=/dev/tty7
|
||||
TTYReset=yes
|
||||
TTYVHangup=yes
|
||||
TTYVTDisallocate=yes
|
||||
|
||||
# stderr to journal so our logging doesn't get thrown into /dev/null
|
||||
StandardOutput=tty
|
||||
StandardInput=tty
|
||||
StandardError=journal
|
||||
EnvironmentFile=-/etc/default/weston
|
||||
|
||||
# Weston does not successfully change VT, nor does systemd place us on
|
||||
# the VT it just activated for us. Switch manually:
|
||||
ExecStartPre=/bin/chvt 7
|
||||
ExecStart=/usr/bin/weston-launch -- --log=/var/log/weston.log --xwayland $OPTARGS
|
||||
IgnoreSIGPIPE=no
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@@ -1,2 +1,2 @@
|
||||
weston
|
||||
odroid-kiosk-weston
|
||||
openssh-server
|
||||
|
||||
@@ -1,7 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
sed -i "s/^User=.*/User=@@DEFAULT_USER@@/g" \
|
||||
/etc/systemd/system/weston.service
|
||||
|
||||
chmod 644 /etc/systemd/system/weston.service
|
||||
systemctl enable weston
|
||||
@@ -1,35 +0,0 @@
|
||||
[Unit]
|
||||
Description=Weston Wayland Compositor (on tty7)
|
||||
RequiresMountsFor=/run
|
||||
Conflicts=getty@tty7.service plymouth-quit.service
|
||||
After=systemd-user-sessions.service getty@tty7.service plymouth-quit-wait.service
|
||||
|
||||
[Service]
|
||||
User=root
|
||||
PermissionsStartOnly=true
|
||||
|
||||
# Log us in via PAM so we get our XDG & co. environment and
|
||||
# are treated as logged in so we can use the tty:
|
||||
PAMName=login
|
||||
|
||||
# Grab tty7
|
||||
UtmpIdentifier=tty7
|
||||
TTYPath=/dev/tty7
|
||||
TTYReset=yes
|
||||
TTYVHangup=yes
|
||||
TTYVTDisallocate=yes
|
||||
|
||||
# stderr to journal so our logging doesn't get thrown into /dev/null
|
||||
StandardOutput=tty
|
||||
StandardInput=tty
|
||||
StandardError=journal
|
||||
EnvironmentFile=-/etc/default/weston
|
||||
|
||||
# Weston does not successfully change VT, nor does systemd place us on
|
||||
# the VT it just activated for us. Switch manually:
|
||||
ExecStartPre=/bin/chvt 7
|
||||
ExecStart=/usr/bin/weston-launch -- --log=/var/log/weston.log --xwayland $OPTARGS
|
||||
IgnoreSIGPIPE=no
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@@ -1,7 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
sed -i "s/^User=.*/User=@@DEFAULT_USER@@/g" \
|
||||
/etc/systemd/system/weston.service
|
||||
|
||||
chmod 644 /etc/systemd/system/weston.service
|
||||
systemctl enable weston
|
||||
4
distro/noble/weston/fixups/S99-weston-cleanup
Normal file
4
distro/noble/weston/fixups/S99-weston-cleanup
Normal file
@@ -0,0 +1,4 @@
|
||||
#!/bin/sh
|
||||
|
||||
rm -f /etc/xdg/weston/weston.ini
|
||||
dpkg-reconfigure odroid-kiosk-weston
|
||||
@@ -1,35 +0,0 @@
|
||||
[Unit]
|
||||
Description=Weston Wayland Compositor (on tty7)
|
||||
RequiresMountsFor=/run
|
||||
Conflicts=getty@tty7.service plymouth-quit.service
|
||||
After=systemd-user-sessions.service getty@tty7.service plymouth-quit-wait.service
|
||||
|
||||
[Service]
|
||||
User=root
|
||||
PermissionsStartOnly=true
|
||||
|
||||
# Log us in via PAM so we get our XDG & co. environment and
|
||||
# are treated as logged in so we can use the tty:
|
||||
PAMName=login
|
||||
|
||||
# Grab tty7
|
||||
UtmpIdentifier=tty7
|
||||
TTYPath=/dev/tty7
|
||||
TTYReset=yes
|
||||
TTYVHangup=yes
|
||||
TTYVTDisallocate=yes
|
||||
|
||||
# stderr to journal so our logging doesn't get thrown into /dev/null
|
||||
StandardOutput=tty
|
||||
StandardInput=tty
|
||||
StandardError=journal
|
||||
EnvironmentFile=-/etc/default/weston
|
||||
|
||||
# Weston does not successfully change VT, nor does systemd place us on
|
||||
# the VT it just activated for us. Switch manually:
|
||||
ExecStartPre=/bin/chvt 7
|
||||
ExecStart=/usr/bin/weston-launch -- --log=/var/log/weston.log --xwayland $OPTARGS
|
||||
IgnoreSIGPIPE=no
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
Reference in New Issue
Block a user