diff options
author | Kevron Rees <kevron.m.rees@intel.com> | 2015-01-21 12:37:32 -0800 |
---|---|---|
committer | Kevron Rees <kevron.m.rees@intel.com> | 2015-01-21 12:37:32 -0800 |
commit | aba60522072120945b52ad25720a11d984030fef (patch) | |
tree | 61d655a44abb3b58e6ed8ff57e9004cae29e7dbd | |
parent | 4de2fba1f1b868ff1aabbbf9b4e51260604f2f99 (diff) | |
download | automotive-message-broker-aba60522072120945b52ad25720a11d984030fef.tar.gz |
[libamb] - configure correct path for smack label on libamb.so
-rw-r--r-- | packaging.in/CMakeLists.txt | 1 | ||||
-rw-r--r-- | packaging.in/amb.manifest | 63 | ||||
-rw-r--r-- | packaging.in/amb.manifest.in.xml | 63 | ||||
-rw-r--r-- | packaging.in/automotive-message-broker.spec.in | 2 |
4 files changed, 65 insertions, 64 deletions
diff --git a/packaging.in/CMakeLists.txt b/packaging.in/CMakeLists.txt index b4ecbcb5..628eef22 100644 --- a/packaging.in/CMakeLists.txt +++ b/packaging.in/CMakeLists.txt @@ -1,3 +1,4 @@ +configure_file (${CMAKE_CURRENT_SOURCE_DIR}/amb.manifest.in.xml ${CMAKE_SOURCE_DIR}/packaging/amb.manifest @ONLY) find_program(rpmbuild rpmbuild /usr/bin) if(rpmbuild) diff --git a/packaging.in/amb.manifest b/packaging.in/amb.manifest deleted file mode 100644 index bcb207a0..00000000 --- a/packaging.in/amb.manifest +++ /dev/null @@ -1,63 +0,0 @@ -<manifest> - <define> - <domain name="AMB" /> - <provide> - <label name="AMB::readall" /> - <label name="AMB::writeall" /> - <label name="AMB::machinegun" /> - </provide> - <request> - <smack request="_" type="rwxatl" /> - <smack request="User" type="w" /> - <smack request="System" type="wx" /> - <smack request="System::Run" type="rwxat" /> - <smack request="System::Shared" type="rx" /> - <smack request="AMB::readall" type="rw" /> - <smack request="AMB::writeall" type="rw" /> - <smack request="AMB::machinegun" type="rw" /> - </request> - <permit> - <smack permit="_" type="w" /> - <smack permit="System" type="rwx" /> - <smack permit="User" type="w" /> - </permit> - </define> - <assign> - <dbus name="org.automotive.message.broker" own="AMB" bus="system"> - <!--<node name="*/0/MachineGunTurretStatus" > - <interface name="org.freedesktop.DBus.Properties"> - <method name="Set" > - <annotation name="com.tizen.smack" value="AMB::machinegun" /> - </method> - </interface> - </node> - <node name="*" > - <interface name="org.freedesktop.DBus.Properties"> - <method name="Set" > - <annotation name="com.tizen.smack" value="AMB::writeall" /> - </method> - </interface> - </node> - --> - <!--<node name="*" > - <interface name="org.freedesktop.DBus.Properties"> - <method name="Get" > - <annotation name="com.tizen.smack" value="AMB::readall" /> - </method> - </interface> - </node> - <node name="*" > - <interface name="org.freedesktop.DBus.Properties"> - <method name="GetAll" > - <annotation name="com.tizen.smack" value="AMB::readall" /> - </method> - </interface> - </node>--> - </dbus> - <filesystem path="/usr/bin/ambd" exec_label="AMB" /> - <filesystem path="/usr/lib/*" label="_" /> - </assign> - <request> - <domain name="AMB" /> - </request> -</manifest> diff --git a/packaging.in/amb.manifest.in.xml b/packaging.in/amb.manifest.in.xml new file mode 100644 index 00000000..8db7d065 --- /dev/null +++ b/packaging.in/amb.manifest.in.xml @@ -0,0 +1,63 @@ +<manifest> + <define> + <domain name="AMB" /> + <provide> + <label name="AMB::readall" /> + <label name="AMB::writeall" /> + <label name="AMB::machinegun" /> + </provide> + <request> + <smack request="_" type="rwxatl" /> + <smack request="User" type="w" /> + <smack request="System" type="wx" /> + <smack request="System::Run" type="rwxat" /> + <smack request="System::Shared" type="rx" /> + <smack request="AMB::readall" type="rw" /> + <smack request="AMB::writeall" type="rw" /> + <smack request="AMB::machinegun" type="rw" /> + </request> + <permit> + <smack permit="_" type="w" /> + <smack permit="System" type="rwx" /> + <smack permit="User" type="w" /> + </permit> + </define> + <assign> + <dbus name="org.automotive.message.broker" own="AMB" bus="system"> + <!--<node name="*/0/MachineGunTurretStatus" > + <interface name="org.freedesktop.DBus.Properties"> + <method name="Set" > + <annotation name="com.tizen.smack" value="AMB::machinegun" /> + </method> + </interface> + </node> + <node name="*" > + <interface name="org.freedesktop.DBus.Properties"> + <method name="Set" > + <annotation name="com.tizen.smack" value="AMB::writeall" /> + </method> + </interface> + </node> + --> + <!--<node name="*" > + <interface name="org.freedesktop.DBus.Properties"> + <method name="Get" > + <annotation name="com.tizen.smack" value="AMB::readall" /> + </method> + </interface> + </node> + <node name="*" > + <interface name="org.freedesktop.DBus.Properties"> + <method name="GetAll" > + <annotation name="com.tizen.smack" value="AMB::readall" /> + </method> + </interface> + </node>--> + </dbus> + <filesystem path="/usr/bin/ambd" exec_label="AMB" /> + <filesystem path="@LIB_INSTALL_DIR@/*" label="_" /> + </assign> + <request> + <domain name="AMB" /> + </request> +</manifest> diff --git a/packaging.in/automotive-message-broker.spec.in b/packaging.in/automotive-message-broker.spec.in index 7d5e94bc..80f8c0fc 100644 --- a/packaging.in/automotive-message-broker.spec.in +++ b/packaging.in/automotive-message-broker.spec.in @@ -270,7 +270,7 @@ cp packaging/config.tizen %{buildroot}%{_sysconfdir}/ambd/ %files %defattr(-,root,root,-) -%manifest packaging.in/amb.manifest +%manifest amb.manifest %config %{_sysconfdir}/ambd/config %config %{_sysconfdir}/ambd/config.tizen %config %{_sysconfdir}/ambd/examples/* |