marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 22:33:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Source environment variables from droid-hal before ours

Browse source 
This way we only care about Green Island specific variables or changes
to droid-hal defaults in our configuration file.
This commit is contained in:
Pier Luigi Fiorini 2014-11-02 11:59:12 +01:00
parent b0d828331e
commit 6182366010
2 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
packaging/plasma-phone-components.spec
View file

@ -80,18 +80,12 @@ chmod 755 %{buildroot}%{_bindir}/plasma-phone
# File with environment variables, used by compositor systemd unit # File with environment variables, used by compositor systemd unit
mkdir -p %{buildroot}%{_sharedstatedir}/environment/greenisland mkdir -p %{buildroot}%{_sharedstatedir}/environment/greenisland
cat > %{buildroot}%{_sharedstatedir}/environment/greenisland/greenisland.conf <<EOF cat > %{buildroot}%{_sharedstatedir}/environment/greenisland/greenisland.conf <<EOF
# From hammerhead configuration # Use QScreen backend
QT_QPA_PLATFORM=hwcomposer
EGL_PLATFORM=hwcomposer
QT_QPA_EGLFS_DEPTH=32
QT_QPA_EGLFS_HIDECURSOR=1
LIPSTICK_OPTIONS=-plugin evdevtouch:/dev/input/event1 -plugin evdevkeyboard:keymap=/usr/share/qt5/keymaps/droid.qmap
# This one was set to 1 in hammerhead configuration,
# but it's just wrong
QT_COMPOSITOR_NEGATE_INVERTED_Y=0
KSCREEN_BACKEND=QScreen KSCREEN_BACKEND=QScreen
# This one is often set to 1 but, at least for hammerhead, we need it set to 0
# TODO: Check whether this is always the case when we'll support more devices
QT_COMPOSITOR_NEGATE_INVERTED_Y=0
EOF EOF
# File with environment variables, used by shell systemd unit # File with environment variables, used by shell systemd unit

1
services/plasma-phone-compositor.service
View file

@ -11,6 +11,7 @@ After=pre-user-session.target
[Service] [Service]
Type=notify Type=notify
EnvironmentFile=-/var/lib/environment/compositor/*.conf
EnvironmentFile=-/var/lib/environment/greenisland/*.conf EnvironmentFile=-/var/lib/environment/greenisland/*.conf
ExecStart=/usr/bin/greenisland $LIPSTICK_OPTIONS -p org.kde.satellite.compositor.phone ExecStart=/usr/bin/greenisland $LIPSTICK_OPTIONS -p org.kde.satellite.compositor.phone
Restart=always Restart=always