Revert "Add socket for ffs socket activation"

This reverts commit cbfe04927443d0f91a28615890594460f89fe07f.

Change-Id: I00e4ba798f5ffa0c7119a3c54f4f26b42e10b701

diff --git a/packaging/sdbd.service b/packaging/sdbd.service
index 8f65db9..70b5139 100644 (file)
--- a/packaging/sdbd.service
+++ b/packaging/sdbd.service
@@ -8,5 +8,3 @@ Type=forking
 PIDFile=/tmp/.sdbd.pid
 RemainAfterExit=yes
 ExecStart=/usr/sbin/sdbd
-USBFunctionDescriptors=/etc/sdbd/descs
-USBFunctionStrings=/etc/sdbd/strs

diff --git a/packaging/sdbd.socket b/packaging/sdbd.socket
deleted file mode 100644 (file)
index 486b377..0000000
--- a/packaging/sdbd.socket
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=sdbd Socket for sdb
-
-[Socket]
-ListenUSBFunction=/dev/usb-funcs/sdb
-Service=sdbd.service

diff --git a/packaging/sdbd.spec b/packaging/sdbd.spec
index b026aef..8cd9879 100644 (file)
--- a/packaging/sdbd.spec
+++ b/packaging/sdbd.spec
@@ -14,7 +14,6 @@ Source1003:    %{name}.manifest
 Source1004:    sdbd_tcp.service
 Source1005:    sdbd_device_tv.service
 Source1006:    sdbd_emulator_tv.service
-Source1007:    sdbd.socket
 
 BuildRequires: capi-system-info-devel >= 0.2.0
 BuildRequires: cmake >= 2.8.3
@@ -95,7 +94,6 @@ ln -s %{_unitdir}/sdbd.service %{buildroot}/%{_unitdir}/multi-user.target.wants/
 
 mkdir -p %{buildroot}%{_prefix}/lib/udev/rules.d/
 install -m 644 rules/99-sdbd.rules %{buildroot}%{_prefix}/lib/udev/rules.d/
-install -m 0644 %SOURCE1007 %{buildroot}%{_unitdir}/sdbd.socket
 
 mkdir -p %{buildroot}%{_prefix}/sbin
 install -m 755 script/sdk_launch %{buildroot}%{_prefix}/sbin/
@@ -132,7 +130,6 @@ chsmack -e "User::Shell" /sbin/sdbd-user
 %{_prefix}/sbin/sdk_launch
 %attr(0755, root, root) %{_sysconfdir}/init.d/sdbd
 %{_unitdir}/sdbd.service
-%{_unitdir}/sdbd.socket
 %{_unitdir}/sdbd_tcp.service
 %{_unitdir}/multi-user.target.wants/sdbd.service
 %{_prefix}/lib/udev/rules.d/99-sdbd.rules

diff --git a/packaging/sdbd@.socket b/packaging/sdbd@.socket
deleted file mode 100644 (file)
index d53479e..0000000
--- a/packaging/sdbd@.socket
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=sdbd Socket for %I
-
-[Socket]
-ListenUSBFunction=%I
-Service=sdbd.service

diff --git a/packaging/sdbd_device.service b/packaging/sdbd_device.service
index 38851a8..8fe2e4a 100644 (file)
--- a/packaging/sdbd_device.service
+++ b/packaging/sdbd_device.service
@@ -17,8 +17,6 @@ SmackProcessLabel=System
 Capabilities=cap_dac_override,cap_setgid,cap_setuid,cap_sys_admin=i
 SecureBits=keep-caps
 ExecStart=/usr/sbin/sdbd
-USBFunctionDescriptors=/etc/sdbd/descs
-USBFunctionStrings=/etc/sdbd/strs
 
 [Install]
 WantedBy=multi-user.target

diff --git a/packaging/sdbd_device_tv.service b/packaging/sdbd_device_tv.service
index 416c818..7ca53a3 100644 (file)
--- a/packaging/sdbd_device_tv.service
+++ b/packaging/sdbd_device_tv.service
@@ -16,8 +16,6 @@ Restart=on-failure
 Capabilities=cap_dac_override,cap_setgid,cap_setuid,cap_sys_admin=i
 SecureBits=keep-caps
 ExecStart=/usr/sbin/sdbd
-USBFunctionDescriptors=/etc/sdbd/descs
-USBFunctionStrings=/etc/sdbd/strs
 
 [Install]
 WantedBy=multi-user.target

diff --git a/packaging/sdbd_emulator.service b/packaging/sdbd_emulator.service
index e6a4d3e..7bf20f5 100644 (file)
--- a/packaging/sdbd_emulator.service
+++ b/packaging/sdbd_emulator.service
@@ -18,8 +18,6 @@ SmackProcessLabel=System
 Capabilities=cap_dac_override,cap_setgid,cap_setuid,cap_sys_admin=i
 SecureBits=keep-caps
 ExecStart=/bin/sh -c "/usr/sbin/sdbd `/usr/bin/awk '{match($0, /sdb_port=([0-9]+)/,port_match); match($0, /vm_name=([^, ]*)/,vm_match); print \"--emulator=\" vm_match[1] \":\" port_match[1] \" --connect-to=10.0.2.2:26099\" \" --sensors=10.0.2.2:\"port_match[1]+3 }' /proc/cmdline`"
-USBFunctionDescriptors=/etc/sdbd/descs
-USBFunctionStrings=/etc/sdbd/strs
 
 [Install]
 WantedBy=emulator_preinit.target