diff options
author | Wootak Jung <wootak.jung@samsung.com> | 2018-11-05 17:17:22 +0900 |
---|---|---|
committer | Wootak Jung <wootak.jung@samsung.com> | 2018-11-05 17:17:22 +0900 |
commit | 880f7e50d2d6476545e7da96effeef3ac6ffda43 (patch) | |
tree | 00139ed9289f5a83cae6c8c437c6d209a3fa2c64 | |
parent | 222168510221617b327dfd63a73123bafa03ad3d (diff) | |
download | bluetooth-firmware-marvell-880f7e50d2d6476545e7da96effeef3ac6ffda43.tar.gz bluetooth-firmware-marvell-880f7e50d2d6476545e7da96effeef3ac6ffda43.tar.bz2 bluetooth-firmware-marvell-880f7e50d2d6476545e7da96effeef3ac6ffda43.zip |
Remove bt-driver-insmod.servicesubmit/tizen/20181108.070422submit/tizen/20181108.005303submit/tizen/20181106.081159accepted/tizen/unified/20181109.062825
insmod logic will be migrated into bt-stack-up.service
No need bt-driver-insmod.service anymore.
Change-Id: I3ddbdc905d563551585966cecb959c01645327a9
-rw-r--r-- | packaging/bluetooth-firmware-marvell.spec | 12 | ||||
-rw-r--r-- | packaging/bt-driver-insmod.path | 5 | ||||
-rw-r--r-- | packaging/bt-driver-insmod.service | 10 | ||||
-rw-r--r-- | packaging/bt-stack-up.path | 5 | ||||
-rw-r--r-- | packaging/bt-stack-up.service | 9 | ||||
-rwxr-xr-x | scripts/bt-dev-start.sh | 10 |
6 files changed, 19 insertions, 32 deletions
diff --git a/packaging/bluetooth-firmware-marvell.spec b/packaging/bluetooth-firmware-marvell.spec index 0eee6b5..587f182 100644 --- 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 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 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 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 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 c480b86..b45e0ab 100755 --- 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} |