Reinhard Russinger 5 år sedan
förälder
incheckning
a49fa01a23

+ 1 - 1
board/GfA/Display001/BUILD

@@ -1 +1 @@
-704
+705

+ 8 - 7
board/GfA/Display001/post-build_4.4.sh

@@ -2,20 +2,22 @@
 
 TARGETDIR=$1
 
+GFA_PATH="../GfA/board/GfA/Display001"
+GFA_ROOT_PATH=$GFA_PATH/rootfs
 echo ">>>$TARGETDIR<<<"
 
-BUILD=`cat ../GfA/board/GfA/Display001/BUILD`
+BUILD=`cat $GFA_PATH/BUILD`
 BUILDDATE=`date +"%Y-%m-%d %H:%M"`
 BUILD=$((BUILD+1))
-echo $BUILD > ../GfA/board/GfA/Display001/BUILD
+echo $BUILD > $GFA_PATH/BUILD
 
-chmod 600  ../GfA/board/GfA/Display001/rootfs/root/.ssh/id*
-cp -a ../GfA/board/GfA/Display001/rootfs/* $TARGETDIR/
+chmod 600  $GFA_ROOT_PATH/root/.ssh/id*
+cp -a $GFA_ROOT_PATH/* $TARGETDIR/
 cp -v output/staging/usr/bin/locale $TARGETDIR/usr/bin/
 mkdir -p $TARGETDIR/usr/share/i18n
 cp -a output/staging/usr/share/i18n/* $TARGETDIR/usr/share/i18n
 
-# Dateien löschen
+# Dateien loeschen
 FILE_TO_DELETE=$TARGETDIR/etc/wpa_supplicant.conf
 if [ -f $FILE_TO_DELETE ]
 then
@@ -74,8 +76,6 @@ 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
@@ -83,3 +83,4 @@ cp $TARGETDIR/usr/share/fonts/dejavu/* $TARGETDIR/usr/lib/fonts
 cp $TARGETDIR/usr/share/fonts/liberation/* $TARGETDIR/usr/lib/fonts
 #------------------------------------
 echo "GfA-Display001 Rel 1.0 Build $BUILD ($BUILDDATE)" > $TARGETDIR/etc/BUILD
+

+ 14 - 4
configs/Display001_4.4.104_rt21_Qt5.15_defconfig

@@ -3,7 +3,7 @@ BR2_cortex_a8=y
 BR2_ARM_INSTRUCTIONS_THUMB2=y
 BR2_DL_DIR="~/buildroot_dl"
 BR2_HOST_DIR="/opt/GfA/TC_L44104_C930_QT515"
-BR2_JLEVEL=4
+BR2_JLEVEL=5
 # BR2_COMPILER_PARANOID_UNSAFE_PATH is not set
 BR2_TOOLCHAIN_BUILDROOT_GLIBC=y
 BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_4=y
@@ -11,7 +11,7 @@ BR2_GCC_VERSION_9_X=y
 BR2_TOOLCHAIN_BUILDROOT_CXX=y
 BR2_PACKAGE_HOST_GDB=y
 BR2_PACKAGE_HOST_GDB_TUI=y
-BR2_PACKAGE_HOST_GDB_PYTHON=y
+BR2_PACKAGE_HOST_GDB_PYTHON3=y
 BR2_GDB_VERSION_8_3=y
 BR2_TOOLCHAIN_GLIBC_GCONV_LIBS_COPY=y
 BR2_TARGET_GENERIC_HOSTNAME="GfA"
@@ -38,6 +38,9 @@ BR2_LINUX_KERNEL_DTS_SUPPORT=y
 BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="../GfA/board/GfA/Display001/DTS_4.4/Display001.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_4.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_7.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_10.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_15.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_rru.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_4_nopruss.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_7_gain1.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_5.dts ../GfA/board/GfA/Display001/DTS_4.4/Display002_7.dts ../GfA/board/GfA/Display001/DTS_4.4/Display002_10.dts ../GfA/board/GfA/Display001/DTS_4.4/Display002_4.dts ../GfA/board/GfA/Display001/DTS_4.4/Display002_7_rs485.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_10_30Hz.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_7_30Hz.dts ../GfA/board/GfA/Display001/DTS_4.4/Display001_4_2020.dts"
 BR2_PACKAGE_BUSYBOX_CONFIG="../GfA/board/GfA/Display001/busybox.config"
 BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
+BR2_PACKAGE_BLUEZ_ALSA=y
+BR2_PACKAGE_BLUEZ_ALSA_HCITOP=y
+BR2_PACKAGE_BLUEZ_ALSA_RFCOMM=y
 BR2_PACKAGE_FFMPEG_GPL=y
 BR2_PACKAGE_FFMPEG_NONFREE=y
 BR2_PACKAGE_FFMPEG_FFPLAY=y
@@ -69,7 +72,10 @@ BR2_PACKAGE_UNRAR=y
 BR2_PACKAGE_UNZIP=y
 BR2_PACKAGE_ZIP=y
 BR2_PACKAGE_GDB=y
+BR2_PACKAGE_GDB_SERVER=y
 BR2_PACKAGE_GDB_DEBUGGER=y
+BR2_PACKAGE_GDB_TUI=y
+BR2_PACKAGE_GDB_PYTHON=y
 BR2_PACKAGE_STRACE=y
 BR2_PACKAGE_BINUTILS=y
 BR2_PACKAGE_BINUTILS_TARGET=y
@@ -211,7 +217,6 @@ BR2_PACKAGE_PYTHON_PYUDEV=y
 BR2_PACKAGE_TCL=y
 BR2_PACKAGE_EXPECT=y
 BR2_PACKAGE_TCLLIB=y
-BR2_PACKAGE_ALSA_LIB=y
 BR2_PACKAGE_LIBMAD=y
 BR2_PACKAGE_LIBMPD=y
 BR2_PACKAGE_TAGLIB=y
@@ -221,6 +226,7 @@ BR2_PACKAGE_SZIP=y
 BR2_PACKAGE_GNUTLS_TOOLS=y
 BR2_PACKAGE_LIBSHA1=y
 BR2_PACKAGE_LIBSSH2=y
+BR2_PACKAGE_ORACLE_MYSQL_SERVER=y
 BR2_PACKAGE_SQLITE_NO_SYNC=y
 BR2_PACKAGE_LIBCONFIG=y
 BR2_PACKAGE_KMSXX=y
@@ -284,7 +290,6 @@ BR2_PACKAGE_BOOST_TIMER=y
 BR2_PACKAGE_BOOST_TYPE_ERASURE=y
 BR2_PACKAGE_BOOST_WAVE=y
 BR2_PACKAGE_ELFUTILS=y
-BR2_PACKAGE_LIBICAL=y
 BR2_PACKAGE_LIBSIGC=y
 BR2_PACKAGE_POCO=y
 BR2_PACKAGE_POCO_NETSSL_OPENSSL=y
@@ -303,6 +308,11 @@ BR2_PACKAGE_MSMTP=y
 BR2_PACKAGE_MUTT=y
 BR2_PACKAGE_MUTT_IMAP=y
 BR2_PACKAGE_MUTT_POP3=y
+BR2_PACKAGE_BLUEZ_TOOLS=y
+BR2_PACKAGE_BLUEZ5_UTILS_OBEX=y
+BR2_PACKAGE_BLUEZ5_UTILS_CLIENT=y
+BR2_PACKAGE_BLUEZ5_UTILS_DEPRECATED=y
+BR2_PACKAGE_BLUEZ5_UTILS_PLUGINS_HEALTH=y
 BR2_PACKAGE_BRIDGE_UTILS=y
 BR2_PACKAGE_CAN_UTILS=y
 BR2_PACKAGE_CIVETWEB=y

+ 1 - 1
patches/0001-Helper-Scripts.patch

@@ -477,7 +477,7 @@ new file mode 100644
 index 0000000..91c8444
 --- /dev/null
 +++ b/UpdateRootfs.sh.in
-@@ -0,0 +1,953 @@
+@@ -0,0 +1,957 @@
 +#!/bin/sh
 +
 +TMP_PATH="$GFA_PREFIX/__GfA_Update"