From: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Date: Thu, 20 Dec 2018 21:17:45 +0000 (+0000)
Subject: Merge "Revert "afm-unit: add autoapi in required-api feature""
X-Git-Tag: 6.99.3^0
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fapp-framework-main.git;a=commitdiff_plain;h=9e6f77ae43af16d2af9bdb1ae8d20aed5deaac7d;hp=-c

Merge "Revert "afm-unit: add autoapi in required-api feature""
---

9e6f77ae43af16d2af9bdb1ae8d20aed5deaac7d
diff --combined conf/unit/afm-unit-debug.conf.in
index 093975d,582e723..6955fa2
--- a/conf/unit/afm-unit-debug.conf.in
+++ b/conf/unit/afm-unit-debug.conf.in
@@@ -137,13 -137,12 +137,13 @@@ SmackProcessLabel=User::App::{{:id}
  SuccessExitStatus=0 SIGKILL
  User=%i
  Slice=user-%i.slice
 -#CapabilityBoundingSet=
 +CapabilityBoundingSet=
  #AmbientCapabilities=
  {{#required-permission.urn:AGL:permission::platform:no-oom}}OOMScoreAdjust=-500{{/required-permission.urn:AGL:permission::platform:no-oom}}
  {{#required-permission.urn:AGL:permission::partner:real-time}}IOSchedulingClass=realtime{{/required-permission.urn:AGL:permission::partner:real-time}}
 -{{#required-permission.urn:AGL:permission::public:display}}SupplementaryGroups=display{{/required-permission.urn:AGL:permission::public:display}}
  {{^required-permission.urn:AGL:permission::public:syscall:clock}}SystemCallFilter=~@clock{{/required-permission.urn:AGL:permission::public:syscall:clock}}
 +#{{#required-permission.urn:AGL:permission::public:display}}SupplementaryGroups=display{{/required-permission.urn:AGL:permission::public:display}}
 +SupplementaryGroups=display
  %nl
  WorkingDirectory=-/home/%i/app-data/{{:id}}
  ExecStartPre=/bin/mkdir -p /home/%i/app-data/{{:id}}
@@@ -168,7 -167,7 +168,7 @@@ StandardError=journa
  ;----   text/html  application/vnd.agl.native  application/vnd.agl.service    ----
  ;---------------------------------------------------------------------------------
  {{#content.type=text/html|application/vnd.agl.native|application/vnd.agl.service}}
 -X-AFM-http-port={{:#metadata.http-port}}
 +X-AFM-http-port={{:#metatarget.http-port}}
  Type=notify
  ExecStart=/usr/bin/afb-daemon \
  	--name afbd-{{idaver}}{{^#target=main}}@{{:#target}}{{/#target=main}} \
@@@ -177,13 -176,12 +177,12 @@@
  	--verbose \
  	--verbose \
  	--monitoring \
 -	--port={{:#metadata.http-port}} \
 +	--port={{:#metatarget.http-port}} \
  	--token=HELLO \
  	--roothttp={{#content.type=application/vnd.agl.service}}.{{/content.type=application/vnd.agl.service}}{{^content.type=application/vnd.agl.service}}{{#required-permission.urn:AGL:permission::public:no-htdocs}}.{{/required-permission.urn:AGL:permission::public:no-htdocs}}{{^required-permission.urn:AGL:permission::public:no-htdocs}}htdocs{{/required-permission.urn:AGL:permission::public:no-htdocs}}{{/content.type=application/vnd.agl.service}} \
  	{{#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 --combined conf/unit/afm-unit.conf.in
index 8067840,7c7d36a..353d83b
--- a/conf/unit/afm-unit.conf.in
+++ b/conf/unit/afm-unit.conf.in
@@@ -137,13 -137,12 +137,13 @@@ SmackProcessLabel=User::App::{{:id}
  SuccessExitStatus=0 SIGKILL
  User=%i
  Slice=user-%i.slice
 -#CapabilityBoundingSet=
 +CapabilityBoundingSet=
  #AmbientCapabilities=
  {{#required-permission.urn:AGL:permission::platform:no-oom}}OOMScoreAdjust=-500{{/required-permission.urn:AGL:permission::platform:no-oom}}
  {{#required-permission.urn:AGL:permission::partner:real-time}}IOSchedulingClass=realtime{{/required-permission.urn:AGL:permission::partner:real-time}}
 -{{#required-permission.urn:AGL:permission::public:display}}SupplementaryGroups=display{{/required-permission.urn:AGL:permission::public:display}}
  {{^required-permission.urn:AGL:permission::public:syscall:clock}}SystemCallFilter=~@clock{{/required-permission.urn:AGL:permission::public:syscall:clock}}
 +#{{#required-permission.urn:AGL:permission::public:display}}SupplementaryGroups=display{{/required-permission.urn:AGL:permission::public:display}}
 +SupplementaryGroups=display
  %nl
  WorkingDirectory=-/home/%i/app-data/{{:id}}
  ExecStartPre=/bin/mkdir -p /home/%i/app-data/{{:id}}
@@@ -167,7 -166,7 +167,7 @@@ StandardError=journa
  ;---------------------------------------------------------------------------------
  {{#content.type=text/html|application/vnd.agl.native|application/vnd.agl.service}}
  {{^content.type=application/vnd.agl.service}}
 -X-AFM--http-port={{:#metadata.http-port}}
 +X-AFM--http-port={{:#metatarget.http-port}}
  {{/content.type=application/vnd.agl.service}}
  Type=notify
  ExecStart=/usr/bin/afb-daemon \
@@@ -177,14 -176,13 +177,13 @@@
  	{{#content.type=application/vnd.agl.service}} \
  		--no-httpd \
  	{{/content.type=application/vnd.agl.service}}{{^content.type=application/vnd.agl.service}} \
 -		--port={{:#metadata.http-port}} \
 +		--port={{:#metatarget.http-port}} \
  		--random-token \
  		--roothttp={{#required-permission.urn:AGL:permission::public:no-htdocs}}.{{/required-permission.urn:AGL:permission::public:no-htdocs}}{{^required-permission.urn:AGL:permission::public:no-htdocs}}htdocs{{/required-permission.urn:AGL:permission::public:no-htdocs}} \
  	{{/content.type=application/vnd.agl.service}} \
  	{{#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 --combined conf/unit/generate-unit-conf/binder.inc
index 37643ad,1a5e71f..30c25d5
--- a/conf/unit/generate-unit-conf/binder.inc
+++ b/conf/unit/generate-unit-conf/binder.inc
@@@ -1,10 -1,10 +1,10 @@@
  dnl vim: set filetype=sysctl.conf.m4 syntax=sysctl.conf.m4:
  
  IF_AGL_DEVEL
 -X-AFM-http-port={{:#metadata.http-port}}
 +X-AFM-http-port={{:#metatarget.http-port}}
  ELSE
  IF_NOT_CONTENT(application/vnd.agl.service)
 -X-AFM--http-port={{:#metadata.http-port}}
 +X-AFM--http-port={{:#metatarget.http-port}}
  ENDIF
  ENDIF
  
@@@ -17,14 -17,14 +17,14 @@@ IF_AGL_DEVEL 
  	--verbose \
  	--verbose \
  	--monitoring \
 -	--port={{:#metadata.http-port}} \
 +	--port={{:#metatarget.http-port}} \
  	--token=HELLO \
  	--roothttp=ON_CONTENT(application/vnd.agl.service, ., ON_PERM(:public:no-htdocs, ., htdocs)) \
  ELSE \
  	IF_CONTENT(application/vnd.agl.service) \
  		--no-httpd \
  	ELSE \
 -		--port={{:#metadata.http-port}} \
 +		--port={{:#metatarget.http-port}} \
  		--random-token \
  		--roothttp=ON_PERM(:public:no-htdocs, ., htdocs) \
  	ENDIF \
@@@ -32,7 -32,6 +32,6 @@@ 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}}) \