changeset 134:4549cf265131

flatpak: install D-Bus .service on each frontend: work around lack of dependency handling in Flatpak by installing D-Bus .service on each frontend. This works because all backend is included in the runtime, but we have to add backend permissions to all frontend, and set --own-name=org.salutatoi.SAT. Furthermore, if one frontend is removed, the symbolic link is removed and the backend will not be launched automatically anymore, even if other frontends are still there. The benefict of this method is that backend has not to be installed manually to use a frontend.
author Goffi <goffi@goffi.org>
date Sun, 15 Jul 2018 16:56:55 +0200
parents a68fc8159071
children 7272eafd0fad
files flatpak/org.salutatoi.Cagou.json flatpak/org.salutatoi.Jp.json flatpak/org.salutatoi.Libervia.json flatpak/org.salutatoi.Primitivus.json flatpak/org.salutatoi.SAT.json
diffstat 5 files changed, 23 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/flatpak/org.salutatoi.Cagou.json	Sun Jul 15 14:41:04 2018 +0200
+++ b/flatpak/org.salutatoi.Cagou.json	Sun Jul 15 16:56:55 2018 +0200
@@ -11,7 +11,9 @@
         "--share=ipc",
         "--socket=wayland",
         "--share=network",
-        "--filesystem=home"
+        "--filesystem=home",
+        "--socket=session-bus",
+        "--own-name=org.salutatoi.SAT"
     ],
     "modules": [
         {
@@ -204,7 +206,8 @@
             "name": "cagou",
             "buildsystem": "simple",
             "build-commands": [
-                "python2 setup.py install --prefix=/app"
+                "python2 setup.py install --prefix=/app",
+                "install -D /usr/lib/python2.7/site-packages/sat-0.7.0a2-py2.7.egg/share/dbus-1/services/org.salutatoi.SAT.service /app/share/dbus-1/services/org.salutatoi.SAT.service"
             ],
             "sources": [
                 {
--- a/flatpak/org.salutatoi.Jp.json	Sun Jul 15 14:41:04 2018 +0200
+++ b/flatpak/org.salutatoi.Jp.json	Sun Jul 15 16:56:55 2018 +0200
@@ -6,16 +6,18 @@
     "sdk": "org.salutatoi.Sdk",
     "command": "jp",
     "finish-args": [
+        "--share=network",
+        "--filesystem=home",
         "--socket=session-bus",
-        "--share=network",
-        "--filesystem=home"
+        "--own-name=org.salutatoi.SAT"
     ],
     "modules": [
         {
             "name": "jp",
             "buildsystem": "simple",
             "build-commands": [
-                "install -D /usr/bin/jp /app/bin/jp"
+                "install -D /usr/bin/jp /app/bin/jp",
+                "install -D /usr/lib/python2.7/site-packages/sat-0.7.0a2-py2.7.egg/share/dbus-1/services/org.salutatoi.SAT.service /app/share/dbus-1/services/org.salutatoi.SAT.service"
             ]
         }
     ]
--- a/flatpak/org.salutatoi.Libervia.json	Sun Jul 15 14:41:04 2018 +0200
+++ b/flatpak/org.salutatoi.Libervia.json	Sun Jul 15 16:56:55 2018 +0200
@@ -5,9 +5,10 @@
     "sdk": "org.salutatoi.Sdk",
     "command": "libervia",
     "finish-args": [
+        "--share=network",
+        "--filesystem=home",
         "--socket=session-bus",
-        "--share=network",
-        "--filesystem=home"
+        "--own-name=org.salutatoi.SAT"
     ],
     "modules": [
         {
@@ -79,7 +80,8 @@
             "buildsystem": "simple",
             "build-commands": [
                 "python2 bootstrap.py",
-                "cd /app/lib/python2.7/site-packages/libervia/browser && /run/build/python2-pyjamas/bin/pyjsbuild libervia_main.py --no-compile-inplace -o /app/share/libervia/html"
+                "cd /app/lib/python2.7/site-packages/libervia/browser && /run/build/python2-pyjamas/bin/pyjsbuild libervia_main.py --no-compile-inplace -o /app/share/libervia/html",
+                "install -D /usr/lib/python2.7/site-packages/sat-0.7.0a2-py2.7.egg/share/dbus-1/services/org.salutatoi.SAT.service /app/share/dbus-1/services/org.salutatoi.SAT.service"
             ],
             "sources": [
                 {
--- a/flatpak/org.salutatoi.Primitivus.json	Sun Jul 15 14:41:04 2018 +0200
+++ b/flatpak/org.salutatoi.Primitivus.json	Sun Jul 15 16:56:55 2018 +0200
@@ -6,14 +6,18 @@
     "sdk": "org.salutatoi.Sdk",
     "command": "primitivus",
     "finish-args": [
-        "--socket=session-bus"
+        "--share=network",
+        "--filesystem=home",
+        "--socket=session-bus",
+        "--own-name=org.salutatoi.SAT"
     ],
     "modules": [
         {
             "name": "primitivus",
             "buildsystem": "simple",
             "build-commands": [
-                "install -D /usr/bin/primitivus /app/bin/primitivus"
+                "install -D /usr/bin/primitivus /app/bin/primitivus",
+                "install -D /usr/lib/python2.7/site-packages/sat-0.7.0a2-py2.7.egg/share/dbus-1/services/org.salutatoi.SAT.service /app/share/dbus-1/services/org.salutatoi.SAT.service"
             ]
         }
     ]
--- a/flatpak/org.salutatoi.SAT.json	Sun Jul 15 14:41:04 2018 +0200
+++ b/flatpak/org.salutatoi.SAT.json	Sun Jul 15 16:56:55 2018 +0200
@@ -7,7 +7,8 @@
     "command": "sat",
     "finish-args": [
         "--share=network",
-        "--filesystem=home"
+        "--filesystem=home",
+        "--socket=session-bus"
     ],
     "modules": [
         {