Merge branch 'wrk_ru' of GfA/Display001GfA into gfa-k44104-qt-57

board/GfA/Display001/BUILD

@@ -1 +1 @@
-626
+634

board/GfA/Display001/Display001_4.4.104_rt_defconfig

@@ -3900,7 +3900,8 @@ CONFIG_USB_MUSB_AM335X_CHILD=y
 #
 # MUSB DMA mode
 #
-CONFIG_MUSB_PIO_ONLY=y
+# CONFIG_MUSB_PIO_ONLY is not set
+CONFIG_USB_TI_CPPI41_DMA=y
 CONFIG_USB_DWC3=y
 # CONFIG_USB_DWC3_HOST is not set
 # CONFIG_USB_DWC3_GADGET is not set

board/GfA/Display001/post-build_4.4.sh

@@ -34,23 +34,7 @@ then
 	rm $FILE_TO_DELETE
 fi
 
-# Dienste auf Manuell stellen
-SERVICE=S80dhcp-relay
-NSERVICE=M80dhcp-relay
-if [ -f $TARGETDIR/etc/init.d/$SERVICE ]
-then
-	rm $TARGETDIR/etc/init.d/$NSERVICE
-	mv $TARGETDIR/etc/init.d/$SERVICE $TARGETDIR/etc/init.d/$NSERVICE
-fi
-
-SERVICE=S80dhcp-server
-NSERVICE=M80dhcp-server
-if [ -f $TARGETDIR/etc/init.d/$SERVICE ]
-then
-	rm $TARGETDIR/etc/init.d/$NSERVICE
-	mv $TARGETDIR/etc/init.d/$SERVICE $TARGETDIR/etc/init.d/$NSERVICE
-fi
-
+# Dienste auf Manuell stellen oder löschen
 SERVICE=S50postgresql
 NSERVICE=M50postgresql
 if [ -f $TARGETDIR/etc/init.d/$SERVICE ]

board/GfA/Display001/rootfs/etc/dhcp/dhcpd.conf

@@ -1,34 +0,0 @@
-#
-# Sample configuration file for ISC dhcpd for Debian
-#
-# $Id: dhcpd.conf,v 1.1.1.1 2002/05/21 00:07:44 peloy Exp $
-#
-
-# The ddns-updates-style parameter controls whether or not the server will
-# attempt to do a DNS update when a lease is confirmed. We default to the
-# behavior of the version 2 packages ('none', since DHCP v2 didn't
-# have support for DDNS.)
-ddns-update-style none;
-
-# option definitions common to all supported networks...
-option domain-name "example.org";
-option domain-name-servers ns1.example.org, ns2.example.org;
-
-default-lease-time 600;
-max-lease-time 7200;
-
-# If this DHCP server is the official DHCP server for the local
-# network, the authoritative directive should be uncommented.
-authoritative;
-
-# Use this to send dhcp log messages to a different log file (you also
-# have to hack syslog.conf to complete the redirection).
-# log-facility local7;
-
-subnet 192.168.7.0 netmask 255.255.255.252 {
-  range 192.168.7.1 192.168.7.1;
-}
-
-subnet 192.168.8.0 netmask 255.255.255.0 {
-  range 192.168.8.100 192.168.8.110;
-}

board/GfA/Display001/rootfs/etc/dnsmasq.conf

@@ -0,0 +1,11 @@
+no-dhcp-interface=eth0
+
+interface=usb0
+
+dhcp-range=usb0,192.168.7.1,192.168.7.1,1h
+dhcp-option=usb0,1,255.255.255.252
+dhcp-option=usb0,3,192.168.7.2
+dhcp-option=usb0,6,192.168.7.2
+
+listen-address=127.0.0.1
+listen-address=192.168.7.2

board/GfA/Display001/rootfs/etc/init.d/M98usb_g_ether

@@ -9,12 +9,10 @@ case "$1" in
 	modprobe g_ether
 	/sbin/ifdown usb0
 	/sbin/ifup usb0
-	udhcpd
 	;;
   stop)
 	echo -n "Stopping usb g_ether network..."
 	rmmod g_ether
-	killall udhcpd
 	;;
   restart|reload)
 	"$0" stop

board/GfA/Display001/rootfs/etc/init.d/S99civetweb

@@ -0,0 +1,40 @@
+#!/bin/sh
+#
+# Start App	
+#
+#
+APPNAME=civetweb
+APPBIN=/usr/bin/civetweb # full qualified applicationpath
+APPPAR="-document_root /var/GfA/WebVnc/novnc/ -enable_directory_listing no -listening_ports 8080"
+
+
+case "$1" in
+  start)
+        echo -e "Starting ${APPNAME} ...\n"
+	if [ ! -f ${APPBIN} ]; then
+		echo -e "Program ${APPBIN} doesn't exist \n"
+		exit 1
+	fi 
+        screen -dmS ${APPNAME} sh -c "while true; do ${APPBIN} ${APPPAR}; echo '${APPNAME} stopped--> restart'; sleep 2;done"
+        exit 0
+        ;;
+  stop)
+        echo -e "Stopping ${APPNAME} ...\n"
+        KILLPID=`screen -list | grep ${APPNAME} | awk -F'.' '{print $1}'`
+        if [ ${#KILLPID} != "0" ]
+                then
+                kill $KILLPID
+         fi
+         exit 0
+        ;;
+  restart|reload)
+        "$0" stop
+        "$0" start
+        ;;
+  *)
+        echo "Usage: $0 {start|stop|restart}"
+        exit 1
+esac
+
+exit $?
+

board/GfA/Display001/rootfs/etc/init.d/S99fbvncserver

@@ -1,18 +1,29 @@
 #!/bin/sh
 #
-# Start fbvncserver
+# Start App	
 #
-
+#
+APPNAME=fbvncserver
+APPBIN=/usr/sbin/fbvncserver
+APPPAR="-t /dev/input/event1 -k /dev/null -P /etc/vncpwd"
 case "$1" in
   start)
-        echo -e "Starting fbvncserevr ...\n"
-        fbvncserver -t /dev/input/event1 -k /dev/null -P /etc/vncpwd &
-	civetweb -document_root /var/GfA/WebVnc/novnc/ -enable_directory_listing no -listening_ports 8080 &
+        echo -e "Starting ${APPNAME} ...\n"
+	if [ ! -f ${APPBIN} ]; then
+		echo -e "Program ${APPBIN} doesn't exist \n"
+		exit 1
+	fi 
+        screen -dmS ${APPNAME} sh -c "while true; do ${APPBIN} ${APPPAR}; echo '${APPNAME} stopped--> restart'; sleep 2;done"
+        exit 0
         ;;
   stop)
-        echo -e "Stopping fbvncserver ...\n"
-        killall civetweb
-        killall fbvncserver
+        echo -e "Stopping ${APPNAME} ...\n"
+        KILLPID=`screen -list | grep ${APPNAME} | awk -F'.' '{print $1}'`
+        if [ ${#KILLPID} != "0" ]
+                then
+                kill $KILLPID
+         fi
+         exit 0
         ;;
   restart|reload)
         "$0" stop
@@ -24,3 +35,4 @@ case "$1" in
 esac
 
 exit $?
+

board/GfA/Display001/rootfs/etc/udhcpd.conf

@@ -1,6 +0,0 @@
-start      192.168.7.1
-end        192.168.7.1
-interface  usb0
-max_leases 1
-option subnet 255.255.255.252
-

configs/Display001_4.4.104_rt21_Qt5.7_defconfig

@@ -357,7 +357,6 @@ BR2_PACKAGE_BOOST_TYPE_ERASURE=y
 BR2_PACKAGE_BOOST_WAVE=y
 BR2_PACKAGE_ELFUTILS=y
 BR2_PACKAGE_LIBCAP_TOOLS=y
-BR2_PACKAGE_LIBEVENT=y
 BR2_PACKAGE_LIBICAL=y
 BR2_PACKAGE_POCO=y
 BR2_PACKAGE_POCO_NETSSL_OPENSSL=y
@@ -378,15 +377,17 @@ BR2_PACKAGE_MSMTP=y
 BR2_PACKAGE_MUTT=y
 BR2_PACKAGE_MUTT_IMAP=y
 BR2_PACKAGE_MUTT_POP3=y
+BR2_PACKAGE_BLUEZ_UTILS_COMPAT=y
+BR2_PACKAGE_BLUEZ_UTILS_AUDIO=y
+BR2_PACKAGE_BLUEZ_UTILS_USB=y
+BR2_PACKAGE_BLUEZ_UTILS_GATT=y
+BR2_PACKAGE_BRIDGE_UTILS=y
 BR2_PACKAGE_CAN_UTILS=y
 BR2_PACKAGE_CIVETWEB=y
 BR2_PACKAGE_CIVETWEB_WITH_LUA=y
 BR2_PACKAGE_CONNTRACK_TOOLS=y
 BR2_PACKAGE_CRDA=y
-BR2_PACKAGE_DHCP=y
-BR2_PACKAGE_DHCP_SERVER=y
-BR2_PACKAGE_DHCP_SERVER_DELAYED_ACK=y
-BR2_PACKAGE_DHCP_CLIENT=y
+BR2_PACKAGE_DNSMASQ=y
 BR2_PACKAGE_ETHTOOL=y
 BR2_PACKAGE_GESFTPSERVER=y
 BR2_PACKAGE_HOSTAPD=y
@@ -404,6 +405,9 @@ BR2_PACKAGE_IW=y
 BR2_PACKAGE_MINIDLNA=y
 BR2_PACKAGE_MOSQUITTO=y
 BR2_PACKAGE_NETPLUG=y
+BR2_PACKAGE_NTP=y
+BR2_PACKAGE_NTP_NTPDATE=y
+BR2_PACKAGE_NTP_NTPTIME=y
 BR2_PACKAGE_OPENSSH=y
 BR2_PACKAGE_OPENVPN=y
 BR2_PACKAGE_OPENVPN_SMALL=y

patches/0012-libmodbus_test-Update-dmsmasq.patch

@@ -0,0 +1,49 @@
+diff --git a/UpdateRootfs.sh.in b/UpdateRootfs.sh.in
+index a4456bf836..89ff561aa2 100644
+--- a/UpdateRootfs.sh.in
++++ b/UpdateRootfs.sh.in
+@@ -137,6 +137,31 @@ then
+ 	rm /etc/init.d/S99_wlan_usb
+ fi
+ 
++if [ -e /etc/init.d/M80dhcp-relay ]
++then
++	rm /etc/init.d/M80dhcp-relay
++fi
++
++if [ -e /etc/init.d/S80dhcp-relay ]
++then
++	rm /etc/init.d/S80dhcp-relay
++fi
++
++if [ -e /etc/init.d/M80dhcp-server ]
++then
++	rm /etc/init.d/M80dhcp-server
++fi
++
++if [ -e /etc/init.d/S80dhcp-server ]
++then
++	rm /etc/init.d/S80dhcp-server
++fi
++
++if [ -d /etc/dhcp ]
++then
++	rm -rf /etc/dhcp
++fi
++
+ #echo "Update Firmware"
+ #echo "."
+ #/root/spi_tivia /root/btm43_0107.bin >/dev/null
+diff --git a/package/libmodbus/libmodbus.mk b/package/libmodbus/libmodbus.mk
+index 62909e4a9e..13b9b260e9 100644
+--- a/package/libmodbus/libmodbus.mk
++++ b/package/libmodbus/libmodbus.mk
+@@ -4,7 +4,7 @@
+ #
+ ################################################################################
+ 
+-LIBMODBUS_VERSION = GfA
++LIBMODBUS_VERSION = GfATest
+ LIBMODBUS_SITE = https://gogs.reru.org/GfA/libmodbus.git
+ LIBMODBUS_SITE_METHOD = git
+ LIBMODBUS_LICENSE = LGPLv2.1+