From 717587a90d9050c4b652806f46f015f26da9ceab Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Tue, 21 May 2019 21:54:36 +0200 Subject: [PATCH 1/2] Add a kiosk dpkg package --- libnymea-app-core/libnymea-app-core.pro | 5 ----- .../lightdm/40-nymea-app-kiosk.conf | 4 ++++ packaging/linux-common/nymea-app-kiosk-wrapper | 2 ++ packaging/linux-common/nymea-app-kiosk.desktop | 5 +++++ packaging/linux-common/nymea-app-kiosk.service | 18 ------------------ packaging/linux-common/nymea-app.service | 15 --------------- packaging/ubuntu/debian/control | 10 +++++++++- .../ubuntu/debian/nymea-app-kiosk.install | 3 +++ packaging/ubuntu/debian/nymea-app.install | 4 +++- packaging/ubuntu/debian/rules | 7 +++++-- 10 files changed, 31 insertions(+), 42 deletions(-) create mode 100644 packaging/linux-common/lightdm/40-nymea-app-kiosk.conf create mode 100755 packaging/linux-common/nymea-app-kiosk-wrapper create mode 100644 packaging/linux-common/nymea-app-kiosk.desktop delete mode 100644 packaging/linux-common/nymea-app-kiosk.service delete mode 100644 packaging/linux-common/nymea-app.service create mode 100644 packaging/ubuntu/debian/nymea-app-kiosk.install diff --git a/libnymea-app-core/libnymea-app-core.pro b/libnymea-app-core/libnymea-app-core.pro index 42ab8401..c548e068 100644 --- a/libnymea-app-core/libnymea-app-core.pro +++ b/libnymea-app-core/libnymea-app-core.pro @@ -147,8 +147,3 @@ HEADERS += \ configuration/mqttpolicies.h \ models/devicemodel.h \ system/systemcontroller.h - -unix { - target.path = /usr/lib - INSTALLS += target -} diff --git a/packaging/linux-common/lightdm/40-nymea-app-kiosk.conf b/packaging/linux-common/lightdm/40-nymea-app-kiosk.conf new file mode 100644 index 00000000..779b2d31 --- /dev/null +++ b/packaging/linux-common/lightdm/40-nymea-app-kiosk.conf @@ -0,0 +1,4 @@ +[Seat:*] +autologin-user=nymea +user-session=nymea-app-kiosk + diff --git a/packaging/linux-common/nymea-app-kiosk-wrapper b/packaging/linux-common/nymea-app-kiosk-wrapper new file mode 100755 index 00000000..a0526ff0 --- /dev/null +++ b/packaging/linux-common/nymea-app-kiosk-wrapper @@ -0,0 +1,2 @@ +#!/bin/sh +nymea-app --kiosk diff --git a/packaging/linux-common/nymea-app-kiosk.desktop b/packaging/linux-common/nymea-app-kiosk.desktop new file mode 100644 index 00000000..23817b2b --- /dev/null +++ b/packaging/linux-common/nymea-app-kiosk.desktop @@ -0,0 +1,5 @@ +[Desktop Entry] +Type=XSession +Exec=/usr/bin/openbox --startup /usr/bin/nymea-app-kiosk-wrapper +DesktopNames=nymea:app + diff --git a/packaging/linux-common/nymea-app-kiosk.service b/packaging/linux-common/nymea-app-kiosk.service deleted file mode 100644 index c2ec3f24..00000000 --- a/packaging/linux-common/nymea-app-kiosk.service +++ /dev/null @@ -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 - diff --git a/packaging/linux-common/nymea-app.service b/packaging/linux-common/nymea-app.service deleted file mode 100644 index 94c46853..00000000 --- a/packaging/linux-common/nymea-app.service +++ /dev/null @@ -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 diff --git a/packaging/ubuntu/debian/control b/packaging/ubuntu/debian/control index 60b3b44b..54df5ba7 100644 --- a/packaging/ubuntu/debian/control +++ b/packaging/ubuntu/debian/control @@ -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. diff --git a/packaging/ubuntu/debian/nymea-app-kiosk.install b/packaging/ubuntu/debian/nymea-app-kiosk.install new file mode 100644 index 00000000..187a18da --- /dev/null +++ b/packaging/ubuntu/debian/nymea-app-kiosk.install @@ -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/ diff --git a/packaging/ubuntu/debian/nymea-app.install b/packaging/ubuntu/debian/nymea-app.install index d025cfe1..a08b219e 100644 --- a/packaging/ubuntu/debian/nymea-app.install +++ b/packaging/ubuntu/debian/nymea-app.install @@ -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/* diff --git a/packaging/ubuntu/debian/rules b/packaging/ubuntu/debian/rules index 5522e76a..2732fc43 100755 --- a/packaging/ubuntu/debian/rules +++ b/packaging/ubuntu/debian/rules @@ -11,8 +11,11 @@ export DH_VERBOSE=1 # sed 's,/@DEB_HOST_MULTIARCH@,$(DEB_HOST_MULTIARCH:%=/%),g' $< > $@ -#override_dh_install: $(PREPROCESS_FILES:.in=) -# dh_install +#override_dh_install: +# dh_install --fail-missing + +override_dh_missing: + dh_missing --fail-missing #override_dh_auto_test: # LD_LIBRARY_PATH=`pwd`/libnymea-mqtt/ dh_auto_test From 5e05947ee42b51daa0b649113b498ecfe2122d4a Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Tue, 21 May 2019 21:57:40 +0200 Subject: [PATCH 2/2] fixes/cleanup --- packaging/linux-common/nymea-app-kiosk-wrapper | 2 +- packaging/ubuntu/debian/rules | 18 ------------------ 2 files changed, 1 insertion(+), 19 deletions(-) diff --git a/packaging/linux-common/nymea-app-kiosk-wrapper b/packaging/linux-common/nymea-app-kiosk-wrapper index a0526ff0..094bd8c6 100755 --- a/packaging/linux-common/nymea-app-kiosk-wrapper +++ b/packaging/linux-common/nymea-app-kiosk-wrapper @@ -1,2 +1,2 @@ #!/bin/sh -nymea-app --kiosk +/usr/bin/nymea-app --kiosk diff --git a/packaging/ubuntu/debian/rules b/packaging/ubuntu/debian/rules index 2732fc43..41d42f22 100755 --- a/packaging/ubuntu/debian/rules +++ b/packaging/ubuntu/debian/rules @@ -3,26 +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: -# dh_install --fail-missing - override_dh_missing: dh_missing --fail-missing -#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=) - %: dh $@ --buildsystem=qmake --parallel