BUILD 637

	RTC Settings
	mysql user/grup correct assignment

	minicom added
	lrz,lsz added, minicom defaults changed

board/GfA/Display001/BUILD

@@ -1 +1 @@
-635
+637

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

@@ -59,6 +59,23 @@ then
 	mv $TARGETDIR/etc/init.d/$SERVICE $TARGETDIR/etc/init.d/$NSERVICE
 fi
 
+SERVICE=S49ntp
+NSERVICE=M49ntp
+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=S60openvpn
+NSERVICE=M60openvpn
+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
+
+
 #------------------------------------
 #-- fonts kopieren, muss noch geändert werden dass qt mit fontconfig funktioniert
 mkdir -p $TARGETDIR/usr/lib/fonts

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

@@ -0,0 +1,86 @@
+#!/bin/sh
+#
+# Do GfA rtc settings on Systemstart	
+#
+#
+#-------------------------------------
+set_rtc () {
+        echo "setting rtc ${BASEBOARD}"
+
+        if [ "$BASEBOARD" == "DISPLAY001" ]; then
+                /root/gfa_spi -w
+        fi
+
+        if [ "$BASEBOARD" == "DISPLAY002_DI4" -o "$BASEBOARD" == "DISPLAY002_RS485" ]; then
+                hwclock -uw
+        fi
+}
+
+read_rtc () {
+
+        echo "read rtc ${BASEBOARD}"
+
+        if [ "$BASEBOARD" == "DISPLAY001" ]; then
+                RTCSTATE=`/root/gfa_spi -r`
+                echo ${RTCSTATE}
+        fi
+
+        if [ "$BASEBOARD" == "DISPLAY002_DI4" -o "$BASEBOARD" == "DISPLAY002_RS485" ]; then
+                hwclock -ur
+        fi
+}
+
+check_rtc () {
+        if [ "$BASEBOARD" == "DISPLAY001" ]; then
+                RTCSTATE=`/root/gfa_spi -r`
+                
+                case $RTCSTATE in
+                 *\(ok*)
+                 	echo "RTC OK !"
+                 	;;
+                 *)
+                 	echo "RTC POWERFAIL !"
+                 	;;
+                esac		
+                
+        fi
+
+        if [ "$BASEBOARD" == "DISPLAY002_DI4" -o "$BASEBOARD" == "DISPLAY002_RS485" ]; then
+                echo "N/A board without TIVA"
+        fi
+}
+#----------------------------------------------------------
+TIMESERVER=time.memod.de
+BASEBOARD=`cat /tmp/BASEBOARD`
+
+case "$1" in
+  start|set)
+        echo "check rtc ${BASEBOARD}"
+	check_rtc > /tmp/STATUS_GFA_RTC_ON_START
+
+	sleep 2
+	/usr/sbin/rdate ${TIMESERVER} 2>/dev/null
+
+	if [ $? = 0 ]; then
+        	echo "got time from internet"
+        	set_rtc
+	else
+        	echo -e "no time from internet\n rtc not set"
+	fi
+	read_rtc
+
+        exit 0
+        ;;
+  stop)
+         exit 0
+        ;;
+  restart|reload)
+        "$0" stop
+        "$0" start
+        ;;
+  *)
+        echo "Usage: $0 {start|set|stop|restart}"
+        exit 1
+esac
+
+exit $?

board/GfA/Display001/rootfs/var/GfA/Display_GSM.ini

@@ -8,7 +8,7 @@ SENTSTART=0
 PING=0
 GPRSACTIVE=0
 GPRSNAIL=5
-TSYNCCMD=rdate time.memod.de
+TSYNCCMD=/etc/init.d/S99rtc_GfA set
 TSYNC=67
 SERDEVINIT=/var/GfA/SerDevInit
 

configs/Display001_4.4.104_rt21_Qt5.7_defconfig

@@ -94,6 +94,8 @@ BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
 BR2_PACKAGE_E2FSPROGS=y
 BR2_PACKAGE_E2FSPROGS_DEBUGFS=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
+BR2_PACKAGE_EXFAT=y
+BR2_PACKAGE_EXFAT_UTILS=y
 BR2_PACKAGE_F2FS_TOOLS=y
 BR2_PACKAGE_FLASHBENCH=y
 BR2_PACKAGE_MAKEDEVS=y
@@ -224,6 +226,7 @@ BR2_PACKAGE_INPUT_TOOLS=y
 BR2_PACKAGE_KBD=y
 BR2_PACKAGE_LIBUIO=y
 BR2_PACKAGE_LSUIO=y
+BR2_PACKAGE_MINICOM=y
 BR2_PACKAGE_PARTED=y
 BR2_PACKAGE_RS485CONF=y
 BR2_PACKAGE_SISPMCTL=y
@@ -402,6 +405,7 @@ BR2_PACKAGE_IPSEC_TOOLS=y
 BR2_PACKAGE_IPSEC_TOOLS_READLINE=y
 BR2_PACKAGE_IPTABLES=y
 BR2_PACKAGE_IW=y
+BR2_PACKAGE_LRZSZ=y
 BR2_PACKAGE_MINIDLNA=y
 BR2_PACKAGE_MOSQUITTO=y
 BR2_PACKAGE_NETPLUG=y
@@ -416,6 +420,7 @@ BR2_PACKAGE_PPPD_FILTER=y
 BR2_PACKAGE_PPPD_RADIUS=y
 BR2_PACKAGE_PPTP_LINUX=y
 BR2_PACKAGE_RSYNC=y
+BR2_PACKAGE_TFTPD=y
 BR2_PACKAGE_TINC=y
 BR2_PACKAGE_WGET=y
 BR2_PACKAGE_WIRELESS_TOOLS=y

patches/0016-set-rtc-from-display_gsm.patch

@@ -0,0 +1,27 @@
+diff --git a/UpdateRootfs.sh.in b/UpdateRootfs.sh.in
+index 3e4b29d..a891487 100644
+--- a/UpdateRootfs.sh.in
++++ b/UpdateRootfs.sh.in
+@@ -90,6 +90,10 @@ tt=/bin/busybox
+ echo -e "===\n \$tt\n"
+ recurse "" \$tt
+ 
++tt=/bin/sed
++echo -e "===\n \$tt\n"
++recurse "" \$tt
++
+ tt=/usr/sbin/fbset
+ echo -e "===\n \$tt\n"
+ recurse "" \$tt
+@@ -287,6 +291,11 @@ then
+ 	rm -rf $GFA_PREFIX/etc/dhcp
+ fi
+ 
++if [ -e $GFA_PREFIX/var/GfA/Display_GSM.ini ]
++then
++	sed -i 's/TSYNCCMD=rdate time.memod.de/TSYNCCMD=\/etc\/init.d\/S99rtc_GfA set/' $GFA_PREFIX/var/GfA/Display_GSM.ini
++fi
++
+ #echo "Update Firmware"
+ #echo "."
+ #/root/spi_tivia /root/btm43_0107.bin >/dev/null

patches/0017-set-mysql-and-pstgres-owner-for-datadir.patch

@@ -0,0 +1,36 @@
+diff --git a/UpdateRootfs.sh.in b/UpdateRootfs.sh.in
+index 04618dcbb9..e5247ab42a 100644
+--- a/UpdateRootfs.sh.in
++++ b/UpdateRootfs.sh.in
+@@ -319,12 +319,13 @@ fi
+ GID_NOGROUP=`awk -F\: '/nogroup/ {print $3}' $GFA_PREFIX/etc/group`
+ if [ -z "$GID_NOGROUP" ]; then
+ #  addgroup -S -g 65534 nogroup
+-  echo "nogroup:x:65534:" >> $GFA_PREFIX/etc/group
++  GID_NOGROUP=65534
++  echo "nogroup:x:${GID_NOUGROUP}:" >> $GFA_PREFIX/etc/group
+ fi
+ #--create missing users for mysql,
+ if [ -z `awk -F\: '/mysql/ {print $3}' $GFA_PREFIX/etc/passwd` ]; then
+   UID_MY=`awk -F: '{uid[$3]=1}END{for(x=1000; x<=1500; x++) {if(uid[x] != ""){}else{print x; exit;}}}' $GFA_PREFIX/etc/passwd`
+-  echo "mysql:x:$UID_MY:65534:MySQL daemon:/var/mysql:/bin/false" >> $GFA_PREFIX/etc/passwd
++  echo "mysql:x:$UID_MY:${GID_NOUGROUP}:MySQL daemon:/var/mysql:/bin/false" >> $GFA_PREFIX/etc/passwd
+ fi
+ #--create missing users for postgresql,
+ if [ -z `awk -F\: '/postgres/ {print $3}' $GFA_PREFIX/etc/passwd` ]; then
+@@ -337,8 +338,13 @@ if [ -z `awk -F\: '/postgres/ {print $3}' $GFA_PREFIX/etc/passwd` ]; then
+   echo "postgres:x:$UID_PG:$GID_PG:PostgreSQL Server:/var/lib/pgsql:/bin/sh" >> $GFA_PREFIX/etc/passwd
+ fi
+ #------------------
+-chown -Rv mysql:nogroup $GFA_PREFIX/var/mysql
+-chown -Rv postgres:postgres $GFA_PREFIX/var/lib/pgsql
++UID_MY=`awk -F\: '/mysql/ {print $3}' $GFA_PREFIX/etc/passwd`
++UID_PG=`awk -F\: '/postgres/ {print $3}' $GFA_PREFIX/etc/passwd`
++GID_PG=`awk -F\: '/postgres/ {print $3}' $GFA_PREFIX/etc/group`
++GID_NOGROUP=`awk -F\: '/nogroup/ {print $3}' $GFA_PREFIX/etc/group`
++
++chown -Rv ${UID_MY}:${GID_NOGROUP} $GFA_PREFIX/var/mysql
++chown -Rv ${UID_PG}:${GID_PG} $GFA_PREFIX/var/lib/pgsql
+ #==============================================================================
+ # Get Graphics resolution and set dtb to the right resolution
+ BASEBOARD=`cat /tmp/BASEBOARD`

patches/0018-minicom-lrz-lsz-instead-of-rx-sx.patch

@@ -0,0 +1,29 @@
+diff --git a/package/minicom/0003-use-lsz-and-lrz-instead-of-rx-sx.patch b/package/minicom/0003-use-lsz-and-lrz-instead-of-rx-sx.patch
+new file mode 100644
+index 0000000000..0d8ee6877a
+--- /dev/null
++++ b/package/minicom/0003-use-lsz-and-lrz-instead-of-rx-sx.patch
+@@ -0,0 +1,23 @@
++diff --git a/src/rwconf.c b/src/rwconf.c
++index 1737a40..caef515 100644
++--- a/src/rwconf.c
+++++ b/src/rwconf.c
++@@ -77,12 +77,12 @@ struct pars mpars[] = {
++   { "",			0,   "pname11" },
++   { "",			0,   "pname12" },
++ #if defined(__linux__) || defined(__GNU__)
++-  { "/usr/bin/sz -vv -b",	0,   "pprog1" },
++-  { "/usr/bin/sb -vv",		0,   "pprog2" },
++-  { "/usr/bin/sx -vv",		0,   "pprog3" },
++-  { "/usr/bin/rz -vv -b -E",	0,   "pprog4" },
++-  { "/usr/bin/rb -vv",		0,   "pprog5" },
++-  { "/usr/bin/rx -vv",		0,   "pprog6" },
+++  { "/usr/bin/lsz --zmodem -vv -b",	0,   "pprog1" },
+++  { "/usr/bin/lsz --ymodemsb -vv",		0,   "pprog2" },
+++  { "/usr/bin/lsz --xmodem -vv",		0,   "pprog3" },
+++  { "/usr/bin/lrz --zmodem -vv -b -E",	0,   "pprog4" },
+++  { "/usr/bin/lrz --ymodem -vv",		0,   "pprog5" },
+++  { "/usr/bin/lrz --xmodem -vv",		0,   "pprog6" },
++   { "/usr/bin/kermit -i -l %l -b %b -s", 0, "pprog7" },
++   { "/usr/bin/kermit -i -l %l -b %b -r", 0, "pprog8" },
++ #else