Merge branch 'dev' into thingos-next

This commit is contained in:
Calin Crisan 2018-03-25 18:02:07 +03:00 committed by GitHub
commit 1520d2c5fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 54 additions and 4 deletions

View File

@ -1,4 +1,4 @@
os_name="motionEyeOS" os_name="motionEyeOS"
os_short_name="motioneyeos" os_short_name="motioneyeos"
os_prefix="meye" os_prefix="meye"
os_version="20171008" os_version="20180325"

View File

@ -1,4 +1,4 @@
gpu_mem=128 gpu_mem=256
dtparam=i2c_arm=on dtparam=i2c_arm=on
dtparam=i2s=on dtparam=i2s=on

View File

@ -1,4 +1,4 @@
gpu_mem=128 gpu_mem=256
dtparam=i2c_arm=on dtparam=i2c_arm=on
dtparam=i2s=on dtparam=i2s=on

View File

@ -83,6 +83,11 @@ BR2_PACKAGE_AUTOSSH=y
BR2_PACKAGE_CRDA=y BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DNSMASQ=y
# BR2_PACKAGE_DNSMASQ_TFTP is not set
BR2_PACKAGE_HOSTAPD=y
BR2_PACKAGE_HOSTAPD_EAP=y
BR2_PACKAGE_HOSTAPD_WPS=y
BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IPTABLES=y
BR2_PACKAGE_IW=y BR2_PACKAGE_IW=y
BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NETCAT=y

View File

@ -74,6 +74,11 @@ BR2_PACKAGE_AUTOSSH=y
BR2_PACKAGE_CRDA=y BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DNSMASQ=y
# BR2_PACKAGE_DNSMASQ_TFTP is not set
BR2_PACKAGE_HOSTAPD=y
BR2_PACKAGE_HOSTAPD_EAP=y
BR2_PACKAGE_HOSTAPD_WPS=y
BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IPTABLES=y
BR2_PACKAGE_IW=y BR2_PACKAGE_IW=y
BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NETCAT=y

View File

@ -86,6 +86,11 @@ BR2_PACKAGE_AUTOSSH=y
BR2_PACKAGE_CRDA=y BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DNSMASQ=y
# BR2_PACKAGE_DNSMASQ_TFTP is not set
BR2_PACKAGE_HOSTAPD=y
BR2_PACKAGE_HOSTAPD_EAP=y
BR2_PACKAGE_HOSTAPD_WPS=y
BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IPTABLES=y
BR2_PACKAGE_IW=y BR2_PACKAGE_IW=y
BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NETCAT=y

View File

@ -75,6 +75,11 @@ BR2_PACKAGE_AUTOSSH=y
BR2_PACKAGE_CRDA=y BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DNSMASQ=y
# BR2_PACKAGE_DNSMASQ_TFTP is not set
BR2_PACKAGE_HOSTAPD=y
BR2_PACKAGE_HOSTAPD_EAP=y
BR2_PACKAGE_HOSTAPD_WPS=y
BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IPTABLES=y
BR2_PACKAGE_IW=y BR2_PACKAGE_IW=y
BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NETCAT=y

View File

@ -77,6 +77,11 @@ BR2_PACKAGE_AUTOSSH=y
BR2_PACKAGE_CRDA=y BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DNSMASQ=y
# BR2_PACKAGE_DNSMASQ_TFTP is not set
BR2_PACKAGE_HOSTAPD=y
BR2_PACKAGE_HOSTAPD_EAP=y
BR2_PACKAGE_HOSTAPD_WPS=y
BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IPTABLES=y
BR2_PACKAGE_IW=y BR2_PACKAGE_IW=y
BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NETCAT=y

View File

@ -79,6 +79,11 @@ BR2_PACKAGE_AUTOSSH=y
BR2_PACKAGE_CRDA=y BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DNSMASQ=y
# BR2_PACKAGE_DNSMASQ_TFTP is not set
BR2_PACKAGE_HOSTAPD=y
BR2_PACKAGE_HOSTAPD_EAP=y
BR2_PACKAGE_HOSTAPD_WPS=y
BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IPTABLES=y
BR2_PACKAGE_IW=y BR2_PACKAGE_IW=y
BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NETCAT=y

View File

@ -74,6 +74,11 @@ BR2_PACKAGE_AUTOSSH=y
BR2_PACKAGE_CRDA=y BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DNSMASQ=y
# BR2_PACKAGE_DNSMASQ_TFTP is not set
BR2_PACKAGE_HOSTAPD=y
BR2_PACKAGE_HOSTAPD_EAP=y
BR2_PACKAGE_HOSTAPD_WPS=y
BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IPTABLES=y
BR2_PACKAGE_IW=y BR2_PACKAGE_IW=y
BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NETCAT=y

View File

@ -83,6 +83,11 @@ BR2_PACKAGE_AUTOSSH=y
BR2_PACKAGE_CRDA=y BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DNSMASQ=y
# BR2_PACKAGE_DNSMASQ_TFTP is not set
BR2_PACKAGE_HOSTAPD=y
BR2_PACKAGE_HOSTAPD_EAP=y
BR2_PACKAGE_HOSTAPD_WPS=y
BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IPTABLES=y
BR2_PACKAGE_IW=y BR2_PACKAGE_IW=y
BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NETCAT=y

View File

@ -83,6 +83,11 @@ BR2_PACKAGE_AUTOSSH=y
BR2_PACKAGE_CRDA=y BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DNSMASQ=y
# BR2_PACKAGE_DNSMASQ_TFTP is not set
BR2_PACKAGE_HOSTAPD=y
BR2_PACKAGE_HOSTAPD_EAP=y
BR2_PACKAGE_HOSTAPD_WPS=y
BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IPTABLES=y
BR2_PACKAGE_IW=y BR2_PACKAGE_IW=y
BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NETCAT=y

View File

@ -92,6 +92,11 @@ BR2_PACKAGE_AUTOSSH=y
BR2_PACKAGE_CRDA=y BR2_PACKAGE_CRDA=y
BR2_PACKAGE_DHCP=y BR2_PACKAGE_DHCP=y
BR2_PACKAGE_DHCP_CLIENT=y BR2_PACKAGE_DHCP_CLIENT=y
BR2_PACKAGE_DNSMASQ=y
# BR2_PACKAGE_DNSMASQ_TFTP is not set
BR2_PACKAGE_HOSTAPD=y
BR2_PACKAGE_HOSTAPD_EAP=y
BR2_PACKAGE_HOSTAPD_WPS=y
BR2_PACKAGE_IPTABLES=y BR2_PACKAGE_IPTABLES=y
BR2_PACKAGE_IW=y BR2_PACKAGE_IW=y
BR2_PACKAGE_NETCAT=y BR2_PACKAGE_NETCAT=y

View File

@ -4,7 +4,7 @@
# #
############################################################# #############################################################
MOTIONEYE_VERSION = c683adf8b97e37135112e2623be95c0c13f4d2b8 MOTIONEYE_VERSION = c337b3a05a072aa06a97429b604882e9cb52bf8a
MOTIONEYE_SITE = $(call github,ccrisan,motioneye,$(MOTIONEYE_VERSION)) MOTIONEYE_SITE = $(call github,ccrisan,motioneye,$(MOTIONEYE_VERSION))
MOTIONEYE_SOURCE = $(MOTIONEYE_VERSION).tar.gz MOTIONEYE_SOURCE = $(MOTIONEYE_VERSION).tar.gz
MOTIONEYE_LICENSE = GPLv3 MOTIONEYE_LICENSE = GPLv3