Remove bt-driver-insmod.service

insmod logic will be migrated into bt-stack-up.service
No need bt-driver-insmod.service anymore.

Change-Id: I3ddbdc905d563551585966cecb959c01645327a9

diff --git a/packaging/bluetooth-firmware-marvell.spec b/packaging/bluetooth-firmware-marvell.spec
index 0eee6b5c6fd46f857b52f0a0906c4628817b3d56..587f18206eeb9ab4ef81cd0603b64690890142e3 100644 (file)
--- a/packaging/bluetooth-firmware-marvell.spec
+++ b/packaging/bluetooth-firmware-marvell.spec
@@ -35,16 +35,6 @@ 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 %{_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
 %license LICENSE
@@ -56,5 +46,3 @@ ln -sf %{_libdir}/systemd/system/bt-driver-insmod.path %{_libdir}/systemd/system
 %attr(755,-,-) %{_prefix}/etc/bluetooth/bt-dev-end.sh
 %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
deleted file mode 100644 (file)
index 2418979..0000000
--- a/packaging/bt-driver-insmod.path
+++ /dev/null
@@ -1,5 +0,0 @@
-[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
deleted file mode 100644 (file)
index ba2d5d6..0000000
--- a/packaging/bt-driver-insmod.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Bluetooth driver insmod
-
-[Service]
-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}
-
-[Install]
-WantedBy=multi-user.target

diff --git a/packaging/bt-stack-up.path b/packaging/bt-stack-up.path
new file mode 100644 (file)
index 0000000..96aeae4
--- /dev/null
+++ b/packaging/bt-stack-up.path
@@ -0,0 +1,5 @@
+[Unit]
+Description=Path activation for the bt-stack-up
+
+[Path]
+PathExists=/run/.bt_stack_up

diff --git a/packaging/bt-stack-up.service b/packaging/bt-stack-up.service
new file mode 100644 (file)
index 0000000..307d0dd
--- /dev/null
+++ b/packaging/bt-stack-up.service
@@ -0,0 +1,9 @@
+[Unit]
+Description=Bluetooth stack up
+
+[Service]
+Type=oneshot
+ExecStart=/usr/etc/bluetooth/bt-stack-up.sh
+
+[Install]
+WantedBy=multi-user.target

diff --git a/scripts/bt-dev-start.sh b/scripts/bt-dev-start.sh
index c480b865dfe38cb209796ce5ba85d7f2010d3d68..b45e0ab92c11df6cd1dc20a25c1e252cbe485155 100755 (executable)
--- a/scripts/bt-dev-start.sh
+++ b/scripts/bt-dev-start.sh
@@ -9,14 +9,14 @@ RFKILL=/usr/sbin/rfkill
 GREP=/usr/bin/pgrep
 HCI_CONFIG=/usr/bin/hciconfig
 CP="/bin/cp"
-#KERNEL_DIR=`uname -a | awk '{print($3)}'`
-#DRV_DIR=/lib/modules/$KERNEL_DIR/kernel
-#BT_DRIVER=$DRV_DIR/drivers/net/wireless/sd8977/mbt_src/bt8xxx.ko
+KERNEL_DIR=`uname -a | awk '{print($3)}'`
+DRV_DIR=/lib/modules/$KERNEL_DIR/kernel
+BT_DRIVER=$DRV_DIR/drivers/net/wireless/sd8977/mbt_src/bt8xxx.ko
 
 echo "MARVELL89XX BT START"
 
-#echo "Insert BT driver module"
-#/usr/sbin/insmod $BT_DRIVER
+echo "Insert BT driver module"
+/usr/sbin/insmod $BT_DRIVER
 
 echo "create bd address and write bd address via /sys/module/bt8xxx/parameters/bt_mac"
 ${SETBD}