Inbetriebnahem:

aktueller Stand

board/PSG/iot2000/grub.cfg

@@ -1,7 +1,7 @@
 set default="0"
 set timeout="0"
 
-menuentry "Buildroot" {
+menuentry "PSG iot2000" {
 	# Grub2 supports ext4, load the kernel from the Linux rootfs partition
 	# Set root tells grub to search the 2nd partition for the bzImage
 	set root=(hd0,msdos2)

board/PSG/iot2000/linux-4.4.config

@@ -2011,11 +2011,18 @@ CONFIG_RT2800PCI_RT53XX=y
 CONFIG_RT2800PCI_RT3290=y
 # CONFIG_RT2500USB is not set
 # CONFIG_RT73USB is not set
-# CONFIG_RT2800USB is not set
+CONFIG_RT2800USB=m
+CONFIG_RT2800USB_RT33XX=y
+CONFIG_RT2800USB_RT35XX=y
+CONFIG_RT2800USB_RT3573=y
+CONFIG_RT2800USB_RT53XX=y
+CONFIG_RT2800USB_RT55XX=y
+CONFIG_RT2800USB_UNKNOWN=y
 CONFIG_RT2800_LIB=m
 CONFIG_RT2800_LIB_MMIO=m
 CONFIG_RT2X00_LIB_MMIO=m
 CONFIG_RT2X00_LIB_PCI=m
+CONFIG_RT2X00_LIB_USB=m
 CONFIG_RT2X00_LIB=m
 CONFIG_RT2X00_LIB_FIRMWARE=y
 CONFIG_RT2X00_LIB_CRYPTO=y

board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_iot200/tinc.conf

@@ -3,5 +3,5 @@ PingTimeout = 40
 AddressFamily = ipv4
 Interface = tun5
 Port = 443
-Mode = router
+Mode = switch
 ConnectTo = psgnet

board/PSG/iot2000/rootfs_overlay/etc/tinc/psgnet_melasan/tinc.conf

@@ -3,5 +3,5 @@ PingTimeout = 40
 AddressFamily = ipv4
 Interface = tun5
 Port = 443
-Mode = router
+Mode = switch
 ConnectTo = psgnet

board/PSG/iot2000/rootfs_overlay/opt/AuthenticVision/AuthenticVision.ini

@@ -3,12 +3,12 @@ DBHOST = "localhost"
 DBUSER =  "melasan"
 DBPWD = "Melasan2017"
 
-[SLIDApi]
-urlbase = "https://helios-demo-api.authenticvision.com/api/activate";
+[SLIDApi_demo]
+urlbase = "https://helios-demo-api.authenticvision.com/api/activation/summarized";
 pubkey = "d8a97684e65c1bf90e7ca48c428f3e70";
 privkey = "4b22135bcbf7c0adbbf063c14505ff7d59aa79a8b2ec7f64b92526a2fa8cbe175c9abdd16afb9963464426f7a602fb9a5306ef7135bff37135e3bff0f0a6897d";
 
-[SLIDApi_productive]
+[SLIDApi]
 urlbase = "https://helios-api.authenticvision.com/api/activation/summarized"
 pubkey = "6104bb3400b5f05e27df95de1e7d7262"
 privkey = "0ca8485775be27826ed260053e5357c08b5f08d6b159d447133eb75e6ca5f57a337ad842bb711f5576c1b2793c41789cd0d45b626e4d745e55f7a3ac7d8f0623"

board/PSG/iot2000/rootfs_overlay/root/monitoring/activation_queue_check.sh

@@ -0,0 +1,15 @@
+#!/bin/bash -ex
+
+SQL_QUERY="SELECT * FROM Slid WHERE EnableDone = 0 AND Date < DATE_SUB(NOW(), INTERVAL 1 HOUR);"
+
+result=$(mysql -u melasan -pMelasan2017 -D Melasan -B -N -e "$SQL_QUERY") 
+rows=$(echo "$result" | wc -l)
+#echo $rows
+ 
+if [ $rows -eq 1 ]; then
+   echo "OK"
+else
+   echo "CRITICAL"          
+   exit 2
+fi
+

board/PSG/iot2000/rootfs_overlay/root/monitoring/helios_api_check.sh

@@ -0,0 +1,14 @@
+#!/bin/bash -ex
+host="https://helios-api.authenticvision.com/api/status"
+
+curlRequest=$(curl $host)
+ 
+#echo "$curlRequest"
+ 
+if echo $curlRequest | grep -q "OK"; then
+   echo "OK"
+else
+   echo "CRITICAL"          
+   exit 2
+fi
+

configs/iot2000_defconfig

@@ -4,6 +4,8 @@ BR2_HOST_DIR="/opt/PSG/TC_L44y_C6x"
 BR2_OPTIMIZE_G=y
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
+BR2_BINUTILS_VERSION_2_27_X=y
+BR2_GCC_VERSION_7_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_GCC_ENABLE_OPENMP=y
 BR2_PACKAGE_HOST_GDB=y
@@ -122,114 +124,17 @@ BR2_PACKAGE_WILC1000_FIRMWARE=y
 BR2_PACKAGE_WILINK_BT_FIRMWARE=y
 BR2_PACKAGE_ZD1211_FIRMWARE=y
 BR2_PACKAGE_EVTEST=y
+BR2_PACKAGE_PARTED=y
 BR2_PACKAGE_USBMOUNT=y
 BR2_PACKAGE_USBUTILS=y
+BR2_PACKAGE_NODEJS=y
+BR2_PACKAGE_NODEJS_NPM=y
 BR2_PACKAGE_PYTHON=y
-BR2_PACKAGE_PYTHON_BZIP2=y
-BR2_PACKAGE_PYTHON_BSDDB=y
-BR2_PACKAGE_PYTHON_OSSAUDIODEV=y
-BR2_PACKAGE_PYTHON_ALSAAUDIO=y
-BR2_PACKAGE_PYTHON_ARROW=y
-BR2_PACKAGE_PYTHON_ASN1CRYPTO=y
-BR2_PACKAGE_PYTHON_BITSTRING=y
-BR2_PACKAGE_PYTHON_BOTTLE=y
-BR2_PACKAGE_PYTHON_CAN=y
-BR2_PACKAGE_PYTHON_CHEETAH=y
-BR2_PACKAGE_PYTHON_CHERRYPY=y
-BR2_PACKAGE_PYTHON_COHERENCE=y
-BR2_PACKAGE_PYTHON_CONFIGOBJ=y
-BR2_PACKAGE_PYTHON_CONFIGSHELL_FB=y
-BR2_PACKAGE_PYTHON_CRC16=y
-BR2_PACKAGE_PYTHON_CRCMOD=y
-BR2_PACKAGE_PYTHON_CROSSBAR=y
-BR2_PACKAGE_PYTHON_CSSSELECT=y
-BR2_PACKAGE_PYTHON_CSSUTILS=y
-BR2_PACKAGE_PYTHON_DAEMON=y
-BR2_PACKAGE_PYTHON_DIALOG=y
-BR2_PACKAGE_PYTHON_DJANGO=y
-BR2_PACKAGE_PYTHON_DOCOPT=y
-BR2_PACKAGE_PYTHON_DPKT=y
-BR2_PACKAGE_PYTHON_ECDSA=y
-BR2_PACKAGE_PYTHON_ENUM=y
-BR2_PACKAGE_PYTHON_FLASK_BABEL=y
-BR2_PACKAGE_PYTHON_FLASK_JSONRPC=y
-BR2_PACKAGE_PYTHON_FLASK_LOGIN=y
-BR2_PACKAGE_PYTHON_FLUP=y
-BR2_PACKAGE_PYTHON_GOBJECT=y
-BR2_PACKAGE_PYTHON_GUNICORN=y
-BR2_PACKAGE_PYTHON_H2=y
-BR2_PACKAGE_PYTHON_HTML5LIB=y
-BR2_PACKAGE_PYTHON_HTTPLIB2=y
-BR2_PACKAGE_PYTHON_HUMANIZE=y
-BR2_PACKAGE_PYTHON_IBMIOTF=y
-BR2_PACKAGE_PYTHON_ID3=y
-BR2_PACKAGE_PYTHON_INIPARSE=y
-BR2_PACKAGE_PYTHON_IOWAIT=y
-BR2_PACKAGE_PYTHON_IPADDR=y
-BR2_PACKAGE_PYTHON_IPY=y
-BR2_PACKAGE_PYTHON_IPYTHON=y
-BR2_PACKAGE_PYTHON_JSON_SCHEMA_VALIDATOR=y
-BR2_PACKAGE_PYTHON_KEYRING=y
-BR2_PACKAGE_PYTHON_LIBCONFIG=y
-BR2_PACKAGE_PYTHON_LXML=y
-BR2_PACKAGE_PYTHON_M2R=y
-BR2_PACKAGE_PYTHON_MAD=y
-BR2_PACKAGE_PYTHON_MARKDOWN=y
-BR2_PACKAGE_PYTHON_MELD3=y
-BR2_PACKAGE_PYTHON_MSGPACK=y
-BR2_PACKAGE_PYTHON_MUTAGEN=y
-BR2_PACKAGE_PYTHON_MWSCRAPE=y
-BR2_PACKAGE_PYTHON_NETIFACES=y
-BR2_PACKAGE_PYTHON_NFC=y
-BR2_PACKAGE_PYTHON_NUMPY=y
-BR2_PACKAGE_PYTHON_PAM=y
-BR2_PACKAGE_PYTHON_PARAMIKO=y
-BR2_PACKAGE_PYTHON_PILLOW=y
-BR2_PACKAGE_PYTHON_POSIX_IPC=y
-BR2_PACKAGE_PYTHON_PRIORITY=y
-BR2_PACKAGE_PYTHON_PROTOBUF=y
-BR2_PACKAGE_PYTHON_PUDB=y
-BR2_PACKAGE_PYTHON_PYCLI=y
-BR2_PACKAGE_PYTHON_PYELFTOOLS=y
-BR2_PACKAGE_PYTHON_PYFTPDLIB=y
-BR2_PACKAGE_PYTHON_PYICU=y
-BR2_PACKAGE_PYTHON_PYLIBFTDI=y
-BR2_PACKAGE_PYTHON_PYMYSQL=y
-BR2_PACKAGE_PYTHON_PYPARTED=y
-BR2_PACKAGE_PYTHON_PYPCAP=y
-BR2_PACKAGE_PYTHON_PYQRCODE=y
-BR2_PACKAGE_PYTHON_PYQT5=y
-BR2_PACKAGE_PYTHON_PYRATEMP=y
-BR2_PACKAGE_PYTHON_PYRO=y
-BR2_PACKAGE_PYTHON_PYROUTE2=y
-BR2_PACKAGE_PYTHON_PYSENDFILE=y
-BR2_PACKAGE_PYTHON_PYSMB=y
-BR2_PACKAGE_PYTHON_PYSNMP_APPS=y
-BR2_PACKAGE_PYTHON_PYSNMP_MIBS=y
-BR2_PACKAGE_PYTHON_PYSOCKS=y
-BR2_PACKAGE_PYTHON_PYTABLEWRITER=y
-BR2_PACKAGE_PYTHON_PYUDEV=y
-BR2_PACKAGE_PYTHON_PYUSB=y
-BR2_PACKAGE_PYTHON_PYXB=y
-BR2_PACKAGE_PYTHON_PYZMQ=y
-BR2_PACKAGE_PYTHON_RTSLIB_FB=y
-BR2_PACKAGE_PYTHON_SERIAL=y
-BR2_PACKAGE_PYTHON_SH=y
-BR2_PACKAGE_PYTHON_SIMPLEJSON=y
-BR2_PACKAGE_PYTHON_SMBUS_CFFI=y
-BR2_PACKAGE_PYTHON_SOCKETIO=y
-BR2_PACKAGE_PYTHON_SORTEDCONTAINERS=y
-BR2_PACKAGE_PYTHON_SPIDEV=y
-BR2_PACKAGE_PYTHON_THRIFT=y
-BR2_PACKAGE_PYTHON_TOMAKO=y
-BR2_PACKAGE_PYTHON_UJSON=y
-BR2_PACKAGE_PYTHON_VERSIONTOOLS=y
-BR2_PACKAGE_PYTHON_WEB2PY=y
-BR2_PACKAGE_PYTHON_WEBPY=y
-BR2_PACKAGE_PYTHON_WHOOSH=y
-BR2_PACKAGE_PYTHON_WS4PY=y
-BR2_PACKAGE_PYTHON_XLUTILS=y
+BR2_PACKAGE_ALSA_LIB=y
+BR2_PACKAGE_LIBMAD=y
 BR2_PACKAGE_CA_CERTIFICATES=y
+BR2_PACKAGE_LIBSODIUM=y
+BR2_PACKAGE_BERKELEYDB=y
 BR2_PACKAGE_MARIADB=y
 BR2_PACKAGE_MARIADB_SERVER=y
 BR2_PACKAGE_SQLITE_STAT3=y
@@ -237,14 +142,21 @@ BR2_PACKAGE_SQLITE_ENABLE_FTS3=y
 BR2_PACKAGE_SQLITE_ENABLE_JSON1=y
 BR2_PACKAGE_SQLITE_ENABLE_UNLOCK_NOTIFY=y
 BR2_PACKAGE_SQLITE_NO_SYNC=y
+BR2_PACKAGE_LIBCONFIG=y
+BR2_PACKAGE_GD=y
+BR2_PACKAGE_LIBFTDI=y
 BR2_PACKAGE_JANSSON=y
 BR2_PACKAGE_JSON_C=y
+BR2_PACKAGE_LIBXSLT=y
+BR2_PACKAGE_LIBYAML=y
 BR2_PACKAGE_YAJL=y
 BR2_PACKAGE_CURL=y
 BR2_PACKAGE_LIBCURL_VERBOSE=y
 BR2_PACKAGE_LIBMICROHTTPD=y
 BR2_PACKAGE_LIBMICROHTTPD_SSL=y
 BR2_PACKAGE_LIBMODBUS=y
+BR2_PACKAGE_ZEROMQ=y
+BR2_PACKAGE_BOOST=y
 BR2_PACKAGE_BOOST_ATOMIC=y
 BR2_PACKAGE_BOOST_CHRONO=y
 BR2_PACKAGE_BOOST_CONTAINER=y
@@ -259,7 +171,6 @@ BR2_PACKAGE_BOOST_IOSTREAMS=y
 BR2_PACKAGE_BOOST_LOCALE=y
 BR2_PACKAGE_BOOST_LOG=y
 BR2_PACKAGE_BOOST_MATH=y
-BR2_PACKAGE_BOOST_METAPARSE=y
 BR2_PACKAGE_BOOST_MPI=y
 BR2_PACKAGE_BOOST_PROGRAM_OPTIONS=y
 BR2_PACKAGE_BOOST_RANDOM=y
@@ -272,6 +183,8 @@ BR2_PACKAGE_BOOST_TIMER=y
 BR2_PACKAGE_BOOST_TYPE_ERASURE=y
 BR2_PACKAGE_BOOST_WAVE=y
 BR2_PACKAGE_LIBB64=y
+BR2_PACKAGE_LINUX_PAM=y
+BR2_PACKAGE_ICU=y
 BR2_PACKAGE_NCURSES_WCHAR=y
 BR2_PACKAGE_NCURSES_TARGET_PROGS=y
 BR2_PACKAGE_BLUEZ_TOOLS=y
@@ -286,6 +199,11 @@ BR2_PACKAGE_DNSMASQ=y
 # BR2_PACKAGE_DNSMASQ_TFTP is not set
 # BR2_PACKAGE_DNSMASQ_DHCP is not set
 BR2_PACKAGE_ETHTOOL=y
+BR2_PACKAGE_HOSTAPD=y
+BR2_PACKAGE_HOSTAPD_EAP=y
+BR2_PACKAGE_HOSTAPD_WPS=y
+BR2_PACKAGE_HTTPING=y
+BR2_PACKAGE_HTTPING_TFO=y
 BR2_PACKAGE_IPROUTE2=y
 BR2_PACKAGE_IPTABLES=y
 BR2_PACKAGE_IPTABLES_BPF_NFSYNPROXY=y
@@ -302,6 +220,22 @@ BR2_PACKAGE_PPPD_RADIUS=y
 BR2_PACKAGE_RSYNC=y
 BR2_PACKAGE_SSHPASS=y
 BR2_PACKAGE_TINC=y
+BR2_PACKAGE_WPA_SUPPLICANT=y
+BR2_PACKAGE_WPA_SUPPLICANT_AP_SUPPORT=y
+BR2_PACKAGE_WPA_SUPPLICANT_WIFI_DISPLAY=y
+BR2_PACKAGE_WPA_SUPPLICANT_MESH_NETWORKING=y
+BR2_PACKAGE_WPA_SUPPLICANT_AUTOSCAN=y
+BR2_PACKAGE_WPA_SUPPLICANT_EAP=y
+BR2_PACKAGE_WPA_SUPPLICANT_HOTSPOT=y
+BR2_PACKAGE_WPA_SUPPLICANT_DEBUG_SYSLOG=y
+BR2_PACKAGE_WPA_SUPPLICANT_WPS=y
+BR2_PACKAGE_WPA_SUPPLICANT_CLI=y
+BR2_PACKAGE_WPA_SUPPLICANT_WPA_CLIENT_SO=y
+BR2_PACKAGE_WPA_SUPPLICANT_PASSPHRASE=y
+BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD=y
+BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW=y
+BR2_PACKAGE_WPA_SUPPLICANT_DBUS_INTROSPECTION=y
+BR2_PACKAGE_DIALOG=y
 BR2_PACKAGE_PINENTRY=y
 BR2_PACKAGE_SCREEN=y
 BR2_PACKAGE_SUDO=y
@@ -325,5 +259,4 @@ BR2_PACKAGE_HOST_CMAKE=y
 BR2_PACKAGE_HOST_DOSFSTOOLS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
-BR2_PACKAGE_WT=y
 # BR2_PACKAGE_ADC1X8S102 is not set

package/python-ufw/001-ufw-target-path.patch

@@ -0,0 +1,58 @@
+diff -Naurp a/.applied_patches_list b/.applied_patches_list
+--- a/.applied_patches_list	2017-12-11 12:39:29.935135715 +0100
++++ b/.applied_patches_list	2017-12-11 12:38:33.543052804 +0100
+@@ -0,0 +1 @@
++/home/ru/BUILD/B_IOT/PSG/package/python-ufw/001-set-executable.patch
+diff -Naurp a/setup.py b/setup.py
+--- a/setup.py	2016-02-18 06:26:44.000000000 +0100
++++ b/setup.py	2017-12-11 12:38:43.075066819 +0100
+@@ -63,6 +63,9 @@ class Install(_install, object):
+             real_prefix = self.home + '/usr'
+         real_sharedir = os.path.join(real_prefix, 'share', 'ufw')
+ 
++        br_target_dir = os.environ.get('TARGET_DIR')
++        real_statedir = br_target_dir + real_statedir
++
+         # Update the modules' paths
+         for fn in [ 'common.py' ]:
+             # 'staging' is used with just 'install' but build_lib is used when
+@@ -123,10 +126,10 @@ class Install(_install, object):
+             self.mkpath(os.path.dirname(f))
+ 
+         # update the interpreter to that of the one the user specified for setup
+-        print("Updating staging/ufw to use %s" % (sys.executable))
++        print("Updating staging/ufw to use %s" % ('/usr/bin/env python'))
+         subprocess.call(["sed",
+                          "-i",
+-                         "1s%^#.*python.*%#! /usr/bin/env " + sys.executable + "%g",
++                         "1s%^#.*python.*%#! /usr/bin/env " + 'python' + "%g",
+                          'staging/ufw'])
+         self.copy_file('staging/ufw', script)
+         self.copy_file('doc/ufw.8', manpage)
+@@ -158,6 +161,9 @@ class Install(_install, object):
+         if self.root != None:
+             confdir = self.root + real_confdir
+ 
++        if br_target_dir != None:
++            confdir = br_target_dir + confdir
++
+         defaults = os.path.join(confdir, 'default', 'ufw')
+         ufwconf = os.path.join(confdir, 'ufw', 'ufw.conf')
+         sysctl = os.path.join(confdir, 'ufw', 'sysctl.conf')
+@@ -169,13 +175,16 @@ class Install(_install, object):
+         user6_rules = os.path.join(confdir, 'ufw', 'user6.rules')
+ 
+         apps_dir = os.path.join(confdir, 'ufw', 'applications.d')
++
+         init_before_hook = os.path.join(confdir, 'ufw', 'before.init')
+         init_after_hook = os.path.join(confdir, 'ufw', 'after.init')
+ 
+         for f in [ defaults, ufwconf ]:
+             self.mkpath(os.path.dirname(f))
+ 
++
+         self.mkpath(apps_dir)
++        
+         for f in os.listdir('profiles'):
+             self.copy_file(os.path.join('profiles', f), apps_dir)
+ 

package/python-ufw/python-ufw.mk

@@ -9,6 +9,23 @@ PYTHON_UFW_SOURCE = ufw-$(PYTHON_UFW_VERSION).tar.gz
 PYTHON_UFW_SITE = https://launchpad.net/ufw/0.35/0.35/+download
 PYTHON_UFW_LICENSE = MIT
 PYTHON_UFW_LICENSE_FILES = LICENSE
-PYTHON_UFW_SETUP_TYPE = setuptools
+PYTHON_UFW_SETUP_TYPE = distutils
+#PYTHON_UFW_DISTUTILS_INSTALL_TARGET_OPT = --prefix=$(TARGET_DIR)
+
+#define PYTHON_UFW_BUILD_CMDS
+#	cd $(PYTHON_UFW_BUILDDIR); \
+#	$(PYTHON_UFW_PYTHON_INTERPRETER) setup.py build
+#
+#	cd $(PYTHON_UFW_BUILDDIR); \
+#	rm -rf ./SETUP;\
+#	mkdir ./SETUP; \
+#	$(PYTHON_UFW_PYTHON_INTERPRETER) setup.py install --install-platbase="./SETUP"
+#endef
+
+#define PYTHON_UFW_INSTALL_TARGET_CMDS
+#	echo "================>";\
+#	cd $(PYTHON_UFW_BUILDDIR)/SETUP; \
+#	cp -av * $(TARGET_DIR)
+#endef
 
 $(eval $(python-package))

package/wt/wt.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-WT_VERSION = 4.0.0
+WT_VERSION = 4.0.2
 WT_SOURCE = $(WT_VERSION).tar.gz 
 WT_SITE = https://github.com/kdeforche/wt/archive
 WT_INSTALL_STAGING = YES