summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWootak Jung <wootak.jung@samsung.com>2018-06-15 07:08:30 +0000
committerWootak Jung <wootak.jung@samsung.com>2018-06-15 07:08:30 +0000
commit222168510221617b327dfd63a73123bafa03ad3d (patch)
treea661dc42358473c05de12019c46e4e2ac6fa5ccb
parent898ce717458c140ff0d086b33de14d3a8ae5e57e (diff)
downloadbluetooth-firmware-marvell-222168510221617b327dfd63a73123bafa03ad3d.tar.gz
bluetooth-firmware-marvell-222168510221617b327dfd63a73123bafa03ad3d.tar.bz2
bluetooth-firmware-marvell-222168510221617b327dfd63a73123bafa03ad3d.zip
This reverts commit 898ce717458c140ff0d086b33de14d3a8ae5e57e. Change-Id: Ibc18f7a0e3c2a71dce4d270857b601f25825dae3
-rw-r--r--packaging/bluetooth-firmware-marvell.spec7
-rw-r--r--packaging/bt-driver-insmod.path5
-rw-r--r--packaging/bt-driver-insmod.service1
3 files changed, 11 insertions, 2 deletions
diff --git a/packaging/bluetooth-firmware-marvell.spec b/packaging/bluetooth-firmware-marvell.spec
index 722be7f..0eee6b5 100644
--- a/packaging/bluetooth-firmware-marvell.spec
+++ b/packaging/bluetooth-firmware-marvell.spec
@@ -36,10 +36,14 @@ rm -rf %{buildroot}
%make_install
install -D -m 0644 packaging/bt-driver-insmod.service %{buildroot}%{_libdir}/systemd/system/bt-driver-insmod.service
+install -D -m 0644 packaging/bt-driver-insmod.path %{buildroot}%{_libdir}/systemd/system/bt-driver-insmod.path
%post artik530
+mkdir -p %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/
mkdir -p %{_libdir}/systemd/system/multi-user.target.wants/
-ln -sf %{_libdir}/systemd/system/bt-driver-insmod.service %{_libdir}/systemd/system/multi-user.target.wants/
+ln -sf %{_libdir}/systemd/system/bt-driver-insmod.service %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/
+ln -sf %{_libdir}/systemd/system/bt-driver-insmod.path %{_sysconfdir}/systemd/default-extra-dependencies/ignore-units.d/
+ln -sf %{_libdir}/systemd/system/bt-driver-insmod.path %{_libdir}/systemd/system/multi-user.target.wants/
%files
%manifest %{name}.manifest
@@ -53,3 +57,4 @@ ln -sf %{_libdir}/systemd/system/bt-driver-insmod.service %{_libdir}/systemd/sys
%attr(755,-,-) %{_prefix}/etc/bluetooth/bt-dev-start.sh
%attr(755,-,-) %{_prefix}/etc/bluetooth/bt-set-addr.sh
%{_libdir}/systemd/system/bt-driver-insmod.service
+%{_libdir}/systemd/system/bt-driver-insmod.path
diff --git a/packaging/bt-driver-insmod.path b/packaging/bt-driver-insmod.path
new file mode 100644
index 0000000..2418979
--- /dev/null
+++ b/packaging/bt-driver-insmod.path
@@ -0,0 +1,5 @@
+[Unit]
+Description=Path activation for the bt-driver-insmod
+
+[Path]
+PathExists=/run/.bt_driver_insmod
diff --git a/packaging/bt-driver-insmod.service b/packaging/bt-driver-insmod.service
index 5c15560..ba2d5d6 100644
--- a/packaging/bt-driver-insmod.service
+++ b/packaging/bt-driver-insmod.service
@@ -5,7 +5,6 @@ Description=Bluetooth driver insmod
Type=oneshot
ExecStartPre=/bin/sh -c "/bin/systemctl set-environment BT_KERNEL_DIR=$(uname -a | cut -d' ' -f3); /bin/systemctl set-environment BT_DRIVER_PRE=/usr/lib/modules/; /bin/systemctl set-environment BT_DRIVER_APPEND=/kernel/drivers/net/wireless/sd8977/mbt_src/bt8xxx.ko;"
ExecStart=/usr/sbin/insmod ${BT_DRIVER_PRE}/${BT_KERNEL_DIR}/${BT_DRIVER_APPEND}
-ExecStartPost=/usr/bin/sh -c "/bin/echo 2 > /sys/devices/platform/sd8x-rfkill/pwr_ctrl"
[Install]
WantedBy=multi-user.target