Merge PR #192: Add a kiosk dpkg package
This commit is contained in:
commit
2a992f96e6
@ -147,8 +147,3 @@ HEADERS += \
|
||||
configuration/mqttpolicies.h \
|
||||
models/devicemodel.h \
|
||||
system/systemcontroller.h
|
||||
|
||||
unix {
|
||||
target.path = /usr/lib
|
||||
INSTALLS += target
|
||||
}
|
||||
|
||||
4
packaging/linux-common/lightdm/40-nymea-app-kiosk.conf
Normal file
4
packaging/linux-common/lightdm/40-nymea-app-kiosk.conf
Normal file
@ -0,0 +1,4 @@
|
||||
[Seat:*]
|
||||
autologin-user=nymea
|
||||
user-session=nymea-app-kiosk
|
||||
|
||||
2
packaging/linux-common/nymea-app-kiosk-wrapper
Executable file
2
packaging/linux-common/nymea-app-kiosk-wrapper
Executable file
@ -0,0 +1,2 @@
|
||||
#!/bin/sh
|
||||
/usr/bin/nymea-app --kiosk
|
||||
5
packaging/linux-common/nymea-app-kiosk.desktop
Normal file
5
packaging/linux-common/nymea-app-kiosk.desktop
Normal file
@ -0,0 +1,5 @@
|
||||
[Desktop Entry]
|
||||
Type=XSession
|
||||
Exec=/usr/bin/openbox --startup /usr/bin/nymea-app-kiosk-wrapper
|
||||
DesktopNames=nymea:app
|
||||
|
||||
@ -1,18 +0,0 @@
|
||||
[Unit]
|
||||
Description=nymea frontend app
|
||||
Documentation=https://github.com/guh/mea
|
||||
After=network.target
|
||||
Wants=network-online.target
|
||||
|
||||
[Service]
|
||||
User = nymea
|
||||
Group = nymea
|
||||
ExecStart = /usr/bin/xinit /usr/bin/nymea-app --kiosk -- :0 -nolisten tcp vt7
|
||||
StandardOutput=journal
|
||||
StandardError=journal
|
||||
Restart=on-failure
|
||||
Type=simple
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
[Unit]
|
||||
Description=nymea frontend app
|
||||
Documentation=https://github.com/guh/mea
|
||||
After=network.target
|
||||
Wants=network-online.target
|
||||
|
||||
[Service]
|
||||
ExecStart=/usr/bin/mea -platform webgl
|
||||
StandardOutput=journal
|
||||
StandardError=journal
|
||||
Restart=on-failure
|
||||
Type=simple
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 9.0.0),
|
||||
|
||||
Package: nymea-app
|
||||
Architecture: any
|
||||
Section: tools
|
||||
Section: x11
|
||||
Multi-Arch: same
|
||||
Depends: ${shlibs:Depends},
|
||||
${misc:Depends},
|
||||
@ -44,3 +44,11 @@ Description: An open source IoT server - daemon
|
||||
.
|
||||
This package will install nymea:app.
|
||||
|
||||
Package: nymea-app-kiosk
|
||||
Architecture: any
|
||||
Section: shells
|
||||
Multi-Arch: same
|
||||
Depends: nymea-app,
|
||||
openbox,
|
||||
Description: Run nymea:app in kiosk mode
|
||||
This package will install nymea:app in kiosk mode on your machine.
|
||||
|
||||
3
packaging/ubuntu/debian/nymea-app-kiosk.install
Normal file
3
packaging/ubuntu/debian/nymea-app-kiosk.install
Normal file
@ -0,0 +1,3 @@
|
||||
packaging/linux-common/nymea-app-kiosk.desktop /usr/share/xsessions/
|
||||
packaging/linux-common/lightdm/40-nymea-app-kiosk.conf /usr/share/lightdm/lightdm.conf.d/
|
||||
packaging/linux-common/nymea-app-kiosk-wrapper /usr/bin/
|
||||
@ -1 +1,3 @@
|
||||
packaging/linux-common/nymea-app-kiosk.service /lib/systemd/system/
|
||||
usr/bin/nymea-app
|
||||
usr/share/applications/nymea-app.desktop
|
||||
usr/share/icons/*
|
||||
|
||||
@ -3,23 +3,8 @@
|
||||
|
||||
export DH_VERBOSE=1
|
||||
|
||||
#DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
|
||||
|
||||
#PREPROCESS_FILES := $(wildcard debian/*.in)
|
||||
|
||||
#$(PREPROCESS_FILES:.in=): %: %.in
|
||||
# sed 's,/@DEB_HOST_MULTIARCH@,$(DEB_HOST_MULTIARCH:%=/%),g' $< > $@
|
||||
|
||||
|
||||
#override_dh_install: $(PREPROCESS_FILES:.in=)
|
||||
# dh_install
|
||||
|
||||
#override_dh_auto_test:
|
||||
# LD_LIBRARY_PATH=`pwd`/libnymea-mqtt/ dh_auto_test
|
||||
|
||||
#override_dh_auto_clean:
|
||||
# dh_auto_clean
|
||||
# rm -rf $(PREPROCESS_FILES:.in=)
|
||||
override_dh_missing:
|
||||
dh_missing --fail-missing
|
||||
|
||||
%:
|
||||
dh $@ --buildsystem=qmake --parallel
|
||||
|
||||
Reference in New Issue
Block a user