diff --git a/board/common/overlay/etc/init.d/S30dbus b/board/common/overlay/etc/init.d/S30dbus index 82e9519ba6..3a15382d3c 100755 --- a/board/common/overlay/etc/init.d/S30dbus +++ b/board/common/overlay/etc/init.d/S30dbus @@ -4,9 +4,11 @@ sys_btconf="/etc/bluetooth.conf" boot_btconf="/boot/bluetooth.conf" btconf="/data/etc/bluetooth.conf" -# dbus is only used by bluez +# dbus is currently only used by bluez test -f $btconf || test -f $boot_btconf || test -f $sys_btconf || exit 0 +test -x /usr/bin/dbus-daemon || exit 0 + test -n "$os_version" || source /etc/init.d/base start() { diff --git a/board/common/overlay/etc/init.d/S37bluetooth b/board/common/overlay/etc/init.d/S37bluetooth index c68cd9c8d6..0e9a03c807 100755 --- a/board/common/overlay/etc/init.d/S37bluetooth +++ b/board/common/overlay/etc/init.d/S37bluetooth @@ -14,14 +14,16 @@ fi test -f $conf || exit 0 -test -n "$os_version" || source /etc/init.d/base - hci=hci0 bluetoothd=/usr/libexec/bluetooth/bluetoothd data_dir=/var/lib/bluetooth run_data_dir=/data/bluetooth run_conf=/var/lib/bluetooth.conf +test -x $bluetoothd || exit 0 + +test -n "$os_version" || source /etc/init.d/base + configure() { mkdir -p $run_data_dir ln -sf $run_data_dir $data_dir diff --git a/configs/bananapi_defconfig b/configs/bananapi_defconfig index 1ebbc538fb..94db56c457 100644 --- a/configs/bananapi_defconfig +++ b/configs/bananapi_defconfig @@ -55,7 +55,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y BR2_PACKAGE_SUNXI_BOARDS=y BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE="a20/Bananapi.fex" -BR2_PACKAGE_DBUS=y BR2_PACKAGE_USB_MODESWITCH_DATA=y BR2_PACKAGE_PYTHON_SSL=y BR2_PACKAGE_PYTHON_HASHLIB=y @@ -79,7 +78,8 @@ BR2_PACKAGE_X265=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_CURL=y BR2_PACKAGE_LIBCAP=y -BR2_PACKAGE_LIBGLIB2=y +BR2_PACKAGE_PCRE=y +BR2_PACKAGE_PCRE_UCP=y BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y diff --git a/configs/odroidc1_defconfig b/configs/odroidc1_defconfig index 63bfaa0a0f..a08ef700b2 100644 --- a/configs/odroidc1_defconfig +++ b/configs/odroidc1_defconfig @@ -59,7 +59,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y -BR2_PACKAGE_DBUS=y BR2_PACKAGE_USB_MODESWITCH_DATA=y BR2_PACKAGE_PYTHON_SSL=y BR2_PACKAGE_PYTHON_HASHLIB=y diff --git a/configs/odroidc2_defconfig b/configs/odroidc2_defconfig index 76a6a48dc1..447f5b70ed 100644 --- a/configs/odroidc2_defconfig +++ b/configs/odroidc2_defconfig @@ -47,7 +47,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y -BR2_PACKAGE_DBUS=y BR2_PACKAGE_USB_MODESWITCH_DATA=y BR2_PACKAGE_PYTHON_SSL=y BR2_PACKAGE_PYTHON_HASHLIB=y @@ -71,7 +70,8 @@ BR2_PACKAGE_X265=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_CURL=y BR2_PACKAGE_LIBCAP=y -BR2_PACKAGE_LIBGLIB2=y +BR2_PACKAGE_PCRE=y +BR2_PACKAGE_PCRE_UCP=y BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y diff --git a/configs/odroidxu4_defconfig b/configs/odroidxu4_defconfig index 7721d4b114..07ac26518b 100644 --- a/configs/odroidxu4_defconfig +++ b/configs/odroidxu4_defconfig @@ -49,7 +49,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y -BR2_PACKAGE_DBUS=y BR2_PACKAGE_USB_MODESWITCH_DATA=y BR2_PACKAGE_PYTHON_SSL=y BR2_PACKAGE_PYTHON_HASHLIB=y @@ -73,7 +72,8 @@ BR2_PACKAGE_X265=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_CURL=y BR2_PACKAGE_LIBCAP=y -BR2_PACKAGE_LIBGLIB2=y +BR2_PACKAGE_PCRE=y +BR2_PACKAGE_PCRE_UCP=y BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y diff --git a/configs/pine64_defconfig b/configs/pine64_defconfig index 5dacef5740..e148be2e31 100644 --- a/configs/pine64_defconfig +++ b/configs/pine64_defconfig @@ -46,7 +46,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y -BR2_PACKAGE_DBUS=y BR2_PACKAGE_USB_MODESWITCH_DATA=y BR2_PACKAGE_PYTHON_SSL=y BR2_PACKAGE_PYTHON_HASHLIB=y @@ -70,7 +69,8 @@ BR2_PACKAGE_X265=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_CURL=y BR2_PACKAGE_LIBCAP=y -BR2_PACKAGE_LIBGLIB2=y +BR2_PACKAGE_PCRE=y +BR2_PACKAGE_PCRE_UCP=y BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y diff --git a/configs/raspberrypi2_defconfig b/configs/raspberrypi2_defconfig index 84202709f3..1a996bf372 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -52,7 +52,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_X=y -BR2_PACKAGE_DBUS=y BR2_PACKAGE_RPI_USERLAND=y BR2_PACKAGE_USB_MODESWITCH_DATA=y BR2_PACKAGE_PYTHON_SSL=y @@ -79,7 +78,8 @@ BR2_PACKAGE_X265=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_CURL=y BR2_PACKAGE_LIBCAP=y -BR2_PACKAGE_LIBGLIB2=y +BR2_PACKAGE_PCRE=y +BR2_PACKAGE_PCRE_UCP=y BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y diff --git a/configs/raspberrypi3_defconfig b/configs/raspberrypi3_defconfig index 16b9481e1f..96c0535b5d 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -52,7 +52,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_X=y -BR2_PACKAGE_DBUS=y BR2_PACKAGE_RPI_USERLAND=y BR2_PACKAGE_USB_MODESWITCH_DATA=y BR2_PACKAGE_PYTHON_SSL=y @@ -79,7 +78,8 @@ BR2_PACKAGE_X265=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_CURL=y BR2_PACKAGE_LIBCAP=y -BR2_PACKAGE_LIBGLIB2=y +BR2_PACKAGE_PCRE=y +BR2_PACKAGE_PCRE_UCP=y BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y diff --git a/configs/raspberrypi_defconfig b/configs/raspberrypi_defconfig index 41b18aacbb..211b8c075b 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -54,7 +54,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE_X=y -BR2_PACKAGE_DBUS=y BR2_PACKAGE_RPI_ARMMEM=y BR2_PACKAGE_RPI_USERLAND=y BR2_PACKAGE_USB_MODESWITCH_DATA=y @@ -83,7 +82,8 @@ BR2_PACKAGE_X265=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_CURL=y BR2_PACKAGE_LIBCAP=y -BR2_PACKAGE_LIBGLIB2=y +BR2_PACKAGE_PCRE=y +BR2_PACKAGE_PCRE_UCP=y BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y