From dafda9104a0ed4f5eaf50a82ce9b78e89050f897 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Wed, 27 Dec 2017 01:05:03 +0200 Subject: [PATCH 1/3] unselect dbus and glib from defconfigs --- configs/bananapi_defconfig | 6 ++++-- configs/odroidc1_defconfig | 2 +- configs/odroidc2_defconfig | 6 ++++-- configs/odroidxu4_defconfig | 6 ++++-- configs/pine64_defconfig | 6 ++++-- configs/raspberrypi2_defconfig | 6 ++++-- configs/raspberrypi3_defconfig | 6 ++++-- configs/raspberrypi_defconfig | 6 ++++-- 8 files changed, 29 insertions(+), 15 deletions(-) diff --git a/configs/bananapi_defconfig b/configs/bananapi_defconfig index 29cb6a8fae..1b1ac134c4 100644 --- a/configs/bananapi_defconfig +++ b/configs/bananapi_defconfig @@ -48,16 +48,18 @@ 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_CA_CERTIFICATES=y BR2_PACKAGE_LIBSSH2=y BR2_PACKAGE_NETTLE=y BR2_PACKAGE_LIBFUSE=y +BR2_PACKAGE_EXPAT=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_CURL=y BR2_PACKAGE_LIBCAP=y -BR2_PACKAGE_LIBGLIB2=y +BR2_PACKAGE_LIBFFI=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 624194072a..4ad968c463 100644 --- a/configs/odroidc1_defconfig +++ b/configs/odroidc1_defconfig @@ -53,12 +53,12 @@ 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_CA_CERTIFICATES=y BR2_PACKAGE_LIBSSH2=y BR2_PACKAGE_NETTLE=y BR2_PACKAGE_LIBFUSE=y +BR2_PACKAGE_EXPAT=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_CURL=y BR2_PACKAGE_LIBCAP=y diff --git a/configs/odroidc2_defconfig b/configs/odroidc2_defconfig index 5c114d0650..008e3d0cdb 100644 --- a/configs/odroidc2_defconfig +++ b/configs/odroidc2_defconfig @@ -40,16 +40,18 @@ 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_CA_CERTIFICATES=y BR2_PACKAGE_LIBSSH2=y BR2_PACKAGE_NETTLE=y BR2_PACKAGE_LIBFUSE=y +BR2_PACKAGE_EXPAT=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_CURL=y BR2_PACKAGE_LIBCAP=y -BR2_PACKAGE_LIBGLIB2=y +BR2_PACKAGE_LIBFFI=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 85c1153194..486db36282 100644 --- a/configs/odroidxu4_defconfig +++ b/configs/odroidxu4_defconfig @@ -42,16 +42,18 @@ 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_CA_CERTIFICATES=y BR2_PACKAGE_LIBSSH2=y BR2_PACKAGE_NETTLE=y BR2_PACKAGE_LIBFUSE=y +BR2_PACKAGE_EXPAT=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_CURL=y BR2_PACKAGE_LIBCAP=y -BR2_PACKAGE_LIBGLIB2=y +BR2_PACKAGE_LIBFFI=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 e55644d62d..ec3aea2ba7 100644 --- a/configs/pine64_defconfig +++ b/configs/pine64_defconfig @@ -39,16 +39,18 @@ 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_CA_CERTIFICATES=y BR2_PACKAGE_LIBSSH2=y BR2_PACKAGE_NETTLE=y BR2_PACKAGE_LIBFUSE=y +BR2_PACKAGE_EXPAT=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_CURL=y BR2_PACKAGE_LIBCAP=y -BR2_PACKAGE_LIBGLIB2=y +BR2_PACKAGE_LIBFFI=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 4b2fee04d9..4a2d89bbc1 100644 --- a/configs/raspberrypi2_defconfig +++ b/configs/raspberrypi2_defconfig @@ -44,17 +44,19 @@ 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_CA_CERTIFICATES=y BR2_PACKAGE_LIBSSH2=y BR2_PACKAGE_NETTLE=y BR2_PACKAGE_LIBFUSE=y +BR2_PACKAGE_EXPAT=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_CURL=y BR2_PACKAGE_LIBCAP=y -BR2_PACKAGE_LIBGLIB2=y +BR2_PACKAGE_LIBFFI=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 8d62b93e29..107136597b 100644 --- a/configs/raspberrypi3_defconfig +++ b/configs/raspberrypi3_defconfig @@ -44,17 +44,19 @@ 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_CA_CERTIFICATES=y BR2_PACKAGE_LIBSSH2=y BR2_PACKAGE_NETTLE=y BR2_PACKAGE_LIBFUSE=y +BR2_PACKAGE_EXPAT=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_CURL=y BR2_PACKAGE_LIBCAP=y -BR2_PACKAGE_LIBGLIB2=y +BR2_PACKAGE_LIBFFI=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 ab02c74cbf..b9a91a9c04 100644 --- a/configs/raspberrypi_defconfig +++ b/configs/raspberrypi_defconfig @@ -46,7 +46,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 @@ -54,10 +53,13 @@ BR2_PACKAGE_CA_CERTIFICATES=y BR2_PACKAGE_LIBSSH2=y BR2_PACKAGE_NETTLE=y BR2_PACKAGE_LIBFUSE=y +BR2_PACKAGE_EXPAT=y BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_CURL=y BR2_PACKAGE_LIBCAP=y -BR2_PACKAGE_LIBGLIB2=y +BR2_PACKAGE_LIBFFI=y +BR2_PACKAGE_PCRE=y +BR2_PACKAGE_PCRE_UCP=y BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_CRDA=y BR2_PACKAGE_DHCP=y From 012dbbd69386675b54d5bf5e913077f89d55c34c Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Wed, 27 Dec 2017 01:06:48 +0200 Subject: [PATCH 2/3] don't start bluetooth service unless bluetoothd present --- board/common/overlay/etc/init.d/S37bluetooth | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) 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 From 74be0d6378c1b99eec8b02dc147a73b36908389f Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Wed, 27 Dec 2017 01:08:41 +0200 Subject: [PATCH 3/3] don't start dbus service unless dbus-daemon present --- board/common/overlay/etc/init.d/S30dbus | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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() {