summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/writing-config.xml.html14
-rw-r--r--doc/writing-config.xml.md6
2 files changed, 10 insertions, 10 deletions
diff --git a/doc/writing-config.xml.html b/doc/writing-config.xml.html
index 152b68e..2024b94 100644
--- a/doc/writing-config.xml.html
+++ b/doc/writing-config.xml.html
@@ -53,7 +53,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
<header>
<h1 class="title">Writing the configuration file &quot;config.xml&quot;</h1>
<h2 class="author">José Bollo</h2>
-<h3 class="date">12 septembre 2016</h3>
+<h3 class="date">19 septembre 2016</h3>
</header>
<nav id="TOC">
<ul>
@@ -68,9 +68,9 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
<li><a href="#known-widget-types-and-content">Known widget types and content</a></li>
<li><a href="#agl-features">AGL features</a><ul>
<li><a href="#feature-nameurnaglrequired-binding">feature name=&quot;urn:AGL:required-binding&quot;</a></li>
-<li><a href="#feature-nameurnaglrequired-permissions">feature name=&quot;urn:AGL:required-permissions&quot;</a></li>
-<li><a href="#feature-nameurnaglprovides-binding">feature name=&quot;urn:AGL:provides-binding&quot;</a></li>
-<li><a href="#feature-nameurnagldefined-permissions">feature name=&quot;urn:AGL:defined-permissions&quot;</a></li>
+<li><a href="#feature-nameurnaglrequired-permission">feature name=&quot;urn:AGL:required-permission&quot;</a></li>
+<li><a href="#feature-nameurnaglprovided-binding">feature name=&quot;urn:AGL:provided-binding&quot;</a></li>
+<li><a href="#feature-nameurnagldefined-permission">feature name=&quot;urn:AGL:defined-permission&quot;</a></li>
</ul></li>
</ul></li>
</ul>
@@ -144,7 +144,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
<li>required: the binding is mandatorily needed except if the feature isn't required (required=&quot;false&quot;) and in that case it is optional.</li>
<li>optional: the binding is optional</li>
</ul>
-<h3 id="feature-nameurnaglrequired-permissions">feature name=&quot;urn:AGL:required-permissions&quot;</h3>
+<h3 id="feature-nameurnaglrequired-permission">feature name=&quot;urn:AGL:required-permission&quot;</h3>
<p>List of the permissions required by the widget.</p>
<p>Each required permission must be explicited using a <param> entry.</p>
<h4 id="param-namerequired-permission-name">param name=[required permission name]</h4>
@@ -153,7 +153,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
<li>required: the permission is mandatorily needed except if the feature isn't required (required=&quot;false&quot;) and in that case it is optional.</li>
<li>optional: the permission is optional</li>
</ul>
-<h3 id="feature-nameurnaglprovides-binding">feature name=&quot;urn:AGL:provides-binding&quot;</h3>
+<h3 id="feature-nameurnaglprovided-binding">feature name=&quot;urn:AGL:provided-binding&quot;</h3>
<p>Use this feature for each provided binding of the widget. The parameters are:</p>
<h4 id="param-namename">param name=&quot;name&quot;</h4>
<p>REQUIRED</p>
@@ -175,7 +175,7 @@ code > span.in { color: #60a0b0; font-weight: bold; font-style: italic; } /* Inf
<h4 id="param-nameneeded-binding">param name=&quot;needed-binding&quot;</h4>
<p>OPTIONAL</p>
<p>The value is a space separated list of binding's names that the binding needs.</p>
-<h3 id="feature-nameurnagldefined-permissions">feature name=&quot;urn:AGL:defined-permissions&quot;</h3>
+<h3 id="feature-nameurnagldefined-permission">feature name=&quot;urn:AGL:defined-permission&quot;</h3>
<p>Each required permission must be explicited using a <param> entry.</p>
<h4 id="param-namedefined-permission-name">param name=[defined permission name]</h4>
<p>The value is the level of the defined permission. Standard levels are:</p>
diff --git a/doc/writing-config.xml.md b/doc/writing-config.xml.md
index 0c0a1ac..f74f8bc 100644
--- a/doc/writing-config.xml.md
+++ b/doc/writing-config.xml.md
@@ -153,7 +153,7 @@ The value is either:
isn't required (required="false") and in that case it is optional.
- optional: the binding is optional
-### feature name="urn:AGL:required-permissions"
+### feature name="urn:AGL:required-permission"
List of the permissions required by the widget.
@@ -167,7 +167,7 @@ The value is either:
isn't required (required="false") and in that case it is optional.
- optional: the permission is optional
-### feature name="urn:AGL:provides-binding"
+### feature name="urn:AGL:provided-binding"
Use this feature for each provided binding of the widget.
The parameters are:
@@ -208,7 +208,7 @@ OPTIONAL
The value is a space separated list of binding's names that the binding needs.
-### feature name="urn:AGL:defined-permissions"
+### feature name="urn:AGL:defined-permission"
Each required permission must be explicited using a <param> entry.
/* Literal.String.Other */ .highlight .sr { color: #008800; background-color: #fff0ff } /* Literal.String.Regex */ .highlight .s1 { color: #dd2200; background-color: #fff0f0 } /* Literal.String.Single */ .highlight .ss { color: #aa6600; background-color: #fff0f0 } /* Literal.String.Symbol */ .highlight .bp { color: #003388 } /* Name.Builtin.Pseudo */ .highlight .fm { color: #0066bb; font-weight: bold } /* Name.Function.Magic */ .highlight .vc { color: #336699 } /* Name.Variable.Class */ .highlight .vg { color: #dd7700 } /* Name.Variable.Global */ .highlight .vi { color: #3333bb } /* Name.Variable.Instance */ .highlight .vm { color: #336699 } /* Name.Variable.Magic */ .highlight .il { color: #0000DD; font-weight: bold } /* Literal.Number.Integer.Long */ } 
# Recent ConnMan releases started limiting the capabilities of
# ConnMan. When running on a Smack-enabled system, that change has the
# effect that connmand can no longer change network settings under
# /proc/net because the Smack label of /proc is "_", and connmand
# running with label "System" has no write access to that.
#
# It works when running as normal root with unrestricted capabilities
# because then CAP_MAC_OVERRIDE (a Smack-specific capability) allows
# the process to ignore Smack rules.
#
# We need to ensure that connmand still has that capability.
#
# The alternative would be to set up fine-grained labelling of
# /proc with corresponding rules, which is considerably more work
# and also may depend on kernel changes (like supporting smackfsroot
# for procfs, which seems to be missing at the moment).
#
# Because the solution is to some extend specific to the environment
# in which connmand runs, this change is not submitted upstream
# and it can be overridden by a distro via FIX_CONNMAN_CAPABILITIES.

FILESEXTRAPATHS:prepend := "${THISDIR}/files:"

SRC_URI:append:with-lsm-smack = "\
  file://connman.service.conf \
"

RDEPENDS:${PN}:append:with-lsm-smack = " smack"

FILES:${PN}:append = " ${systemd_unitdir}"

do_install:append:with-lsm-smack() {
  install -Dm0644 ${WORKDIR}/connman.service.conf ${D}${systemd_unitdir}/system/connman.service.d/smack.conf
}