summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Moeller <jsmoeller@linuxfoundation.org>2018-12-20 20:07:09 +0000
committerGerrit Code Review <gerrit@automotivelinux.org>2018-12-20 20:07:09 +0000
commit80c20308d798433be6f59ce927da4a1920ecf3b9 (patch)
treee430a9697034c39965f6a9b1f106b46f96708839
parentf2a2f1357a5268b614528feeba0a91f4ea04a7aa (diff)
parent2b6e13bd5812dc1d7efe338a163f6dd253bbe15b (diff)
Merge "afm-unit: add autoapi in required-api feature"
-rw-r--r--conf/unit/afm-unit-debug.conf.in1
-rw-r--r--conf/unit/afm-unit.conf.in1
-rw-r--r--conf/unit/generate-unit-conf/binder.inc1
3 files changed, 3 insertions, 0 deletions
diff --git a/conf/unit/afm-unit-debug.conf.in b/conf/unit/afm-unit-debug.conf.in
index 6955fa2..093975d 100644
--- a/conf/unit/afm-unit-debug.conf.in
+++ b/conf/unit/afm-unit-debug.conf.in
@@ -183,6 +183,7 @@ ExecStart=/usr/bin/afb-daemon \
{{#required-permission.urn:AGL:permission::public:applications:read}}--alias=/icons:{{:#metadata.icons-dir}}{{/required-permission.urn:AGL:permission::public:applications:read}} \
{{#required-api}} \
{{#value=auto|ws}}--ws-client=unix:@afm_users_rundir@/%i/apis/ws/{{name}}{{/value=auto|ws}} \
+ {{#value=autoapi}}--auto-api=@afm_users_rundir@/%i/apis/ws{{/value=autoapi}} \
{{#value=dbus}}--dbus-client={{name}}{{/value=dbus}} \
{{#value=cloud}}--cloud-client={{name}}{{/value=cloud}} \
{{#value=local}}--binding={{:#metadata.install-dir}}/{{name}}{{/value=local}} \
diff --git a/conf/unit/afm-unit.conf.in b/conf/unit/afm-unit.conf.in
index 353d83b..8067840 100644
--- a/conf/unit/afm-unit.conf.in
+++ b/conf/unit/afm-unit.conf.in
@@ -184,6 +184,7 @@ ExecStart=/usr/bin/afb-daemon \
{{#required-permission.urn:AGL:permission::public:applications:read}}--alias=/icons:{{:#metadata.icons-dir}}{{/required-permission.urn:AGL:permission::public:applications:read}} \
{{#required-api}} \
{{#value=auto|ws}}--ws-client=unix:@afm_users_rundir@/%i/apis/ws/{{name}}{{/value=auto|ws}} \
+ {{#value=autoapi}}--auto-api=@afm_users_rundir@/%i/apis/ws{{/value=autoapi}} \
{{#value=dbus}}--dbus-client={{name}}{{/value=dbus}} \
{{#value=cloud}}--cloud-client={{name}}{{/value=cloud}} \
{{#value=local}}--binding={{:#metadata.install-dir}}/{{name}}{{/value=local}} \
diff --git a/conf/unit/generate-unit-conf/binder.inc b/conf/unit/generate-unit-conf/binder.inc
index 30c25d5..37643ad 100644
--- a/conf/unit/generate-unit-conf/binder.inc
+++ b/conf/unit/generate-unit-conf/binder.inc
@@ -32,6 +32,7 @@ ENDIF \
ON_PERM(:public:applications:read, --alias=/icons:{{:#metadata.icons-dir}}) \
{{#required-api}} \
ON_VALUE(auto|ws, --ws-client=unix:API_PATH_WS/{{name}}) \
+ ON_VALUE(autoapi, --api-auto=API_PATH_WS) \
ON_VALUE(dbus, --dbus-client={{name}}) \
ON_VALUE(cloud, --cloud-client={{name}}) \
ON_VALUE(local, --binding={{:#metadata.install-dir}}/{{name}}) \