mirror of
https://github.com/motioneye-project/motioneyeos.git
synced 2025-07-28 05:36:32 +00:00
Merge branch 'dev' into thingos-next
This commit is contained in:
commit
1520d2c5fb
@ -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"
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
gpu_mem=128
|
gpu_mem=256
|
||||||
|
|
||||||
dtparam=i2c_arm=on
|
dtparam=i2c_arm=on
|
||||||
dtparam=i2s=on
|
dtparam=i2s=on
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
gpu_mem=128
|
gpu_mem=256
|
||||||
|
|
||||||
dtparam=i2c_arm=on
|
dtparam=i2c_arm=on
|
||||||
dtparam=i2s=on
|
dtparam=i2s=on
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
@ -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
|
||||||
|
Loading…
x
Reference in New Issue
Block a user