jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 06:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'thingos' into thingos-next

Browse Source
This commit is contained in:
Calin Crisan 2017-12-27 01:22:37 +02:00
commit 3c4f0873c6
10 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
board/common/overlay/etc/init.d/S30dbus
View File

@ -4,9 +4,11 @@ sys_btconf="/etc/bluetooth.conf"
boot_btconf="/boot/bluetooth.conf" boot_btconf="/boot/bluetooth.conf"
btconf="/data/etc/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 -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 test -n "$os_version" || source /etc/init.d/base
start() { start() {

6
board/common/overlay/etc/init.d/S37bluetooth
View File

@ -14,14 +14,16 @@ fi
test -f $conf || exit 0 test -f $conf || exit 0
test -n "$os_version" || source /etc/init.d/base
hci=hci0 hci=hci0
bluetoothd=/usr/libexec/bluetooth/bluetoothd bluetoothd=/usr/libexec/bluetooth/bluetoothd
data_dir=/var/lib/bluetooth data_dir=/var/lib/bluetooth
run_data_dir=/data/bluetooth run_data_dir=/data/bluetooth
run_conf=/var/lib/bluetooth.conf run_conf=/var/lib/bluetooth.conf
test -x $bluetoothd || exit 0
test -n "$os_version" || source /etc/init.d/base
configure() { configure() {
mkdir -p $run_data_dir mkdir -p $run_data_dir
ln -sf $run_data_dir $data_dir ln -sf $run_data_dir $data_dir

4
configs/bananapi_defconfig
View File

@ -55,7 +55,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
BR2_PACKAGE_SUNXI_BOARDS=y BR2_PACKAGE_SUNXI_BOARDS=y
BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE="a20/Bananapi.fex" BR2_PACKAGE_SUNXI_BOARDS_FEX_FILE="a20/Bananapi.fex"
BR2_PACKAGE_DBUS=y
BR2_PACKAGE_USB_MODESWITCH_DATA=y BR2_PACKAGE_USB_MODESWITCH_DATA=y
BR2_PACKAGE_PYTHON_SSL=y BR2_PACKAGE_PYTHON_SSL=y
BR2_PACKAGE_PYTHON_HASHLIB=y BR2_PACKAGE_PYTHON_HASHLIB=y
@ -79,7 +78,8 @@ BR2_PACKAGE_X265=y
BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_LIBCURL=y
BR2_PACKAGE_CURL=y BR2_PACKAGE_CURL=y
BR2_PACKAGE_LIBCAP=y BR2_PACKAGE_LIBCAP=y
BR2_PACKAGE_LIBGLIB2=y BR2_PACKAGE_PCRE=y
BR2_PACKAGE_PCRE_UCP=y
BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_AUTOSSH=y
BR2_PACKAGE_CRDA=y BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y

1
configs/odroidc1_defconfig
View File

@ -59,7 +59,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
BR2_PACKAGE_DBUS=y
BR2_PACKAGE_USB_MODESWITCH_DATA=y BR2_PACKAGE_USB_MODESWITCH_DATA=y
BR2_PACKAGE_PYTHON_SSL=y BR2_PACKAGE_PYTHON_SSL=y
BR2_PACKAGE_PYTHON_HASHLIB=y BR2_PACKAGE_PYTHON_HASHLIB=y

4
configs/odroidc2_defconfig
View File

@ -47,7 +47,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
BR2_PACKAGE_DBUS=y
BR2_PACKAGE_USB_MODESWITCH_DATA=y BR2_PACKAGE_USB_MODESWITCH_DATA=y
BR2_PACKAGE_PYTHON_SSL=y BR2_PACKAGE_PYTHON_SSL=y
BR2_PACKAGE_PYTHON_HASHLIB=y BR2_PACKAGE_PYTHON_HASHLIB=y
@ -71,7 +70,8 @@ BR2_PACKAGE_X265=y
BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_LIBCURL=y
BR2_PACKAGE_CURL=y BR2_PACKAGE_CURL=y
BR2_PACKAGE_LIBCAP=y BR2_PACKAGE_LIBCAP=y
BR2_PACKAGE_LIBGLIB2=y BR2_PACKAGE_PCRE=y
BR2_PACKAGE_PCRE_UCP=y
BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_AUTOSSH=y
BR2_PACKAGE_CRDA=y BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y

4
configs/odroidxu4_defconfig
View File

@ -49,7 +49,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
BR2_PACKAGE_DBUS=y
BR2_PACKAGE_USB_MODESWITCH_DATA=y BR2_PACKAGE_USB_MODESWITCH_DATA=y
BR2_PACKAGE_PYTHON_SSL=y BR2_PACKAGE_PYTHON_SSL=y
BR2_PACKAGE_PYTHON_HASHLIB=y BR2_PACKAGE_PYTHON_HASHLIB=y
@ -73,7 +72,8 @@ BR2_PACKAGE_X265=y
BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_LIBCURL=y
BR2_PACKAGE_CURL=y BR2_PACKAGE_CURL=y
BR2_PACKAGE_LIBCAP=y BR2_PACKAGE_LIBCAP=y
BR2_PACKAGE_LIBGLIB2=y BR2_PACKAGE_PCRE=y
BR2_PACKAGE_PCRE_UCP=y
BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_AUTOSSH=y
BR2_PACKAGE_CRDA=y BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y

4
configs/pine64_defconfig
View File

@ -46,7 +46,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_RALINK_RT2XX=y
BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_81XX=y
BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
BR2_PACKAGE_DBUS=y
BR2_PACKAGE_USB_MODESWITCH_DATA=y BR2_PACKAGE_USB_MODESWITCH_DATA=y
BR2_PACKAGE_PYTHON_SSL=y BR2_PACKAGE_PYTHON_SSL=y
BR2_PACKAGE_PYTHON_HASHLIB=y BR2_PACKAGE_PYTHON_HASHLIB=y
@ -70,7 +69,8 @@ BR2_PACKAGE_X265=y
BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_LIBCURL=y
BR2_PACKAGE_CURL=y BR2_PACKAGE_CURL=y
BR2_PACKAGE_LIBCAP=y BR2_PACKAGE_LIBCAP=y
BR2_PACKAGE_LIBGLIB2=y BR2_PACKAGE_PCRE=y
BR2_PACKAGE_PCRE_UCP=y
BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_AUTOSSH=y
BR2_PACKAGE_CRDA=y BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y

4
configs/raspberrypi2_defconfig
View File

@ -52,7 +52,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE=y
BR2_PACKAGE_RPI_FIRMWARE_X=y BR2_PACKAGE_RPI_FIRMWARE_X=y
BR2_PACKAGE_DBUS=y
BR2_PACKAGE_RPI_USERLAND=y BR2_PACKAGE_RPI_USERLAND=y
BR2_PACKAGE_USB_MODESWITCH_DATA=y BR2_PACKAGE_USB_MODESWITCH_DATA=y
BR2_PACKAGE_PYTHON_SSL=y BR2_PACKAGE_PYTHON_SSL=y
@ -79,7 +78,8 @@ BR2_PACKAGE_X265=y
BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_LIBCURL=y
BR2_PACKAGE_CURL=y BR2_PACKAGE_CURL=y
BR2_PACKAGE_LIBCAP=y BR2_PACKAGE_LIBCAP=y
BR2_PACKAGE_LIBGLIB2=y BR2_PACKAGE_PCRE=y
BR2_PACKAGE_PCRE_UCP=y
BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_AUTOSSH=y
BR2_PACKAGE_CRDA=y BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y

4
configs/raspberrypi3_defconfig
View File

@ -52,7 +52,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE=y
BR2_PACKAGE_RPI_FIRMWARE_X=y BR2_PACKAGE_RPI_FIRMWARE_X=y
BR2_PACKAGE_DBUS=y
BR2_PACKAGE_RPI_USERLAND=y BR2_PACKAGE_RPI_USERLAND=y
BR2_PACKAGE_USB_MODESWITCH_DATA=y BR2_PACKAGE_USB_MODESWITCH_DATA=y
BR2_PACKAGE_PYTHON_SSL=y BR2_PACKAGE_PYTHON_SSL=y
@ -79,7 +78,8 @@ BR2_PACKAGE_X265=y
BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_LIBCURL=y
BR2_PACKAGE_CURL=y BR2_PACKAGE_CURL=y
BR2_PACKAGE_LIBCAP=y BR2_PACKAGE_LIBCAP=y
BR2_PACKAGE_LIBGLIB2=y BR2_PACKAGE_PCRE=y
BR2_PACKAGE_PCRE_UCP=y
BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_AUTOSSH=y
BR2_PACKAGE_CRDA=y BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y

4
configs/raspberrypi_defconfig
View File

@ -54,7 +54,6 @@ BR2_PACKAGE_LINUX_FIRMWARE_RTL_87XX=y
BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y BR2_PACKAGE_LINUX_FIRMWARE_RTL_88XX=y
BR2_PACKAGE_RPI_FIRMWARE=y BR2_PACKAGE_RPI_FIRMWARE=y
BR2_PACKAGE_RPI_FIRMWARE_X=y BR2_PACKAGE_RPI_FIRMWARE_X=y
BR2_PACKAGE_DBUS=y
BR2_PACKAGE_RPI_ARMMEM=y BR2_PACKAGE_RPI_ARMMEM=y
BR2_PACKAGE_RPI_USERLAND=y BR2_PACKAGE_RPI_USERLAND=y
BR2_PACKAGE_USB_MODESWITCH_DATA=y BR2_PACKAGE_USB_MODESWITCH_DATA=y
@ -83,7 +82,8 @@ BR2_PACKAGE_X265=y
BR2_PACKAGE_LIBCURL=y BR2_PACKAGE_LIBCURL=y
BR2_PACKAGE_CURL=y BR2_PACKAGE_CURL=y
BR2_PACKAGE_LIBCAP=y BR2_PACKAGE_LIBCAP=y
BR2_PACKAGE_LIBGLIB2=y BR2_PACKAGE_PCRE=y
BR2_PACKAGE_PCRE_UCP=y
BR2_PACKAGE_AUTOSSH=y BR2_PACKAGE_AUTOSSH=y
BR2_PACKAGE_CRDA=y BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y