ソースを参照

fixed missinge debug libraries and defaultpassword for mysql

Reinhard Russinger 3 年 前
コミット
7ffbbccc15

+ 16 - 5
Config.in

@@ -2,11 +2,9 @@ source "$BR2_EXTERNAL_GFA_Display001_PATH/package/applicationlauncher/Config.in"
 source "$BR2_EXTERNAL_GFA_Display001_PATH/package/gfasqlplugin/Config.in"
 source "$BR2_EXTERNAL_GFA_Display001_PATH/package/qtfreevirtualkeyboard/Config.in"
 source "$BR2_EXTERNAL_GFA_Display001_PATH/package/gfabrowser/Config.in"
+comment "Old GfA utils (outdated)"
 source "$BR2_EXTERNAL_GFA_Display001_PATH/package/libgfaipc/Config.in"
 source "$BR2_EXTERNAL_GFA_Display001_PATH/package/libgfatimer/Config.in"
-source "$BR2_EXTERNAL_GFA_Display001_PATH/package/libulfius/Config.in"
-source "$BR2_EXTERNAL_GFA_Display001_PATH/package/libyder/Config.in"
-source "$BR2_EXTERNAL_GFA_Display001_PATH/package/liborcania/Config.in"
 #-------
 comment "Gfa Tools"
 source "$BR2_EXTERNAL_GFA_Display001_PATH/package/gfaipc/Config.in"
@@ -15,8 +13,21 @@ source "$BR2_EXTERNAL_GFA_Display001_PATH/package/gfaqt/Config.in"
 source "$BR2_EXTERNAL_GFA_Display001_PATH/package/gfamininet/Config.in"
 source "$BR2_EXTERNAL_GFA_Display001_PATH/package/gfatimer/Config.in"
 source "$BR2_EXTERNAL_GFA_Display001_PATH/package/gfanet/Config.in"
-comment "GfA SPI Kernelmodule"
+#-------
+comment "GfA Tools Debug"
+source "$BR2_EXTERNAL_GFA_Display001_PATH/package/gfaipcdebug/Config.in"
+source "$BR2_EXTERNAL_GFA_Display001_PATH/package/gfasitarautilsdebug/Config.in"
+source "$BR2_EXTERNAL_GFA_Display001_PATH/package/gfaqtdebug/Config.in"
+source "$BR2_EXTERNAL_GFA_Display001_PATH/package/gfamininetdebug/Config.in"
+source "$BR2_EXTERNAL_GFA_Display001_PATH/package/gfatimerdebug/Config.in"
+source "$BR2_EXTERNAL_GFA_Display001_PATH/package/gfanetdebug/Config.in"
+#------
+comment "GfA TIVA - SPI Kernelmodule"
 source "$BR2_EXTERNAL_GFA_Display001_PATH/package/drvgfaspi/Config.in"
 #------
-comment "Additional Tools"
+comment "SIEMENS IEC Library"
 source "$BR2_EXTERNAL_GFA_Display001_PATH/package/Snap7/Config.in"
+comment "Common Tools"
+source "$BR2_EXTERNAL_GFA_Display001_PATH/package/libulfius/Config.in"
+source "$BR2_EXTERNAL_GFA_Display001_PATH/package/libyder/Config.in"
+source "$BR2_EXTERNAL_GFA_Display001_PATH/package/liborcania/Config.in"

+ 7 - 1
configs/Display001_4.4.145_bone23_Qt5.7_defconfig

@@ -468,15 +468,21 @@ BR2_PACKAGE_HOST_DTC=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_MTOOLS=y
 BR2_PACKAGE_APPLICATIONLAUNCHER=y
+BR2_PACKAGE_GFASQLPLUGIN=y
 BR2_PACKAGE_QTFREEVIRTUALKEYBOARD=y
 BR2_PACKAGE_GFABROWSER=y
 # BR2_PACKAGE_LIBGFAIPC is not set
 # BR2_PACKAGE_LIBGFATIMER is not set
-BR2_PACKAGE_LIBULFIUS=y
 BR2_PACKAGE_GFAIPC=y
 BR2_PACKAGE_GFASITARAUTILS=y
 BR2_PACKAGE_GFAQT=y
 BR2_PACKAGE_GFAMININET=y
 BR2_PACKAGE_GFATIMER=y
 BR2_PACKAGE_GFANET=y
+BR2_PACKAGE_GFAIPCDEBUG=y
+BR2_PACKAGE_GFASITARAUTILSDEBUG=y
+BR2_PACKAGE_GFAQTDEBUG=y
+BR2_PACKAGE_GFAMININETDEBUG=y
+BR2_PACKAGE_GFATIMERDEBUG=y
 BR2_PACKAGE_DRVGFASPI=y
+BR2_PACKAGE_LIBULFIUS=y

+ 7 - 0
package/gfaipcdebug/Config.in

@@ -0,0 +1,7 @@
+config BR2_PACKAGE_GFAIPCDEBUG
+	bool "GfAIPCDEBUG"
+	select BR2_PACKAGE_QT5BASE
+	help
+	  
+	  GfA IPC Tools
+	  https://gogs.reru.org

+ 32 - 0
package/gfaipcdebug/gfaipc.mk

@@ -0,0 +1,32 @@
+################################################################################
+#
+# GfAIPC
+#
+################################################################################
+
+GFAIPCDEBUG_VERSION = V1.4.0
+GFAIPCDEBUG_SITE = https://gogs.reru.org/GfA/libgfaipc.git
+GFAIPCDEBUG_SITE_METHOD = git
+GFAIPCDEBUG_DEPENDENCIES = qt5base
+GFAIPCDEBUG_INSTALL_STAGING = YES
+GFAIPCDEBUG_INSTALL_TARGET = YES
+
+define GFAIPCDEBUG_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake CONFIG+=debug)
+endef
+
+define GFAIPCDEBUG_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define GFAIPCDEBUG_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install_library
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install_includes
+endef
+
+define GFAIPCDEBUG_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) INSTALL_ROOT=$(TARGET_DIR)/ $(MAKE) -C $(@D)	install_target
+endef
+
+$(eval $(generic-package))
+

+ 9 - 0
package/gfamininetdebug/Config.in

@@ -0,0 +1,9 @@
+config BR2_PACKAGE_GFAMININETDEBUG
+	bool "GfAMININETDEBUG"
+	select BR2_PACKAGE_QT5BASE
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  Qt GfAMininet 
+	  https://gogs.reru.org

+ 32 - 0
package/gfamininetdebug/gfamininet.mk

@@ -0,0 +1,32 @@
+################################################################################
+#
+# GfAMININET
+#
+################################################################################
+
+GFAMININETDEBUG_VERSION = V1.0.0
+GFAMININETDEBUG_SITE = https://gogs.reru.org/GfA/libgfamininet.git
+GFAMININETDEBUG_SITE_METHOD = git
+GFAMININETDEBUG_DEPENDENCIES = qt5base
+GFAMININETDEBUG_INSTALL_STAGING = YES
+GFAMININETDEBUG_INSTALL_TARGET = YES
+
+define GFAMININETDEBUG_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake CONFIG+=debug) 
+endef
+
+define GFAMININETDEBUG_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define GFAMININETDEBUG_INSTALL_STAGING_CMDS
+#	$(TARGET_MAKE_ENV) INSTALL_ROOT=$(STAGING_DIR)/ $(MAKE) -C $(@D) install_toolchain
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install_library
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install_includes
+endef
+
+define GFAMININETDEBUG_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) INSTALL_ROOT=$(TARGET_DIR)/ $(MAKE) -C $(@D)	install_target
+endef
+
+$(eval $(generic-package))

+ 7 - 0
package/gfanetdebug/Config.in

@@ -0,0 +1,7 @@
+config BR2_PACKAGE_GFANETDEBUG
+	bool "GfANETDEBUG"
+	select BR2_PACKAGE_QT5BASE
+	help
+	  
+	  GfA Network Setting Tools Tools
+	  https://gogs.reru.org

+ 32 - 0
package/gfanetdebug/gfanet.mk

@@ -0,0 +1,32 @@
+################################################################################
+#
+# GfANET
+#
+################################################################################
+
+GFANETDEBUG_VERSION = V1.0.0
+GFANETDEBUG_SITE = https://gogs.reru.org/GfA/libgfaNET.git
+GFANETDEBUG_SITE_METHOD = git
+GFANETDEBUG_DEPENDENCIES = qt5base
+GFANETDEBUG_INSTALL_STAGING = YES
+GFANETDEBUG_INSTALL_TARGET = YES
+
+define GFANETDEBUG_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake CONFIG+=debug)
+endef
+
+define GFANETDEBUG_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define GFANETDEBUG_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install_library
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install_includes
+endef
+
+define GFANETDEBUG_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) INSTALL_ROOT=$(TARGET_DIR)/ $(MAKE) -C $(@D)	install_target
+endef
+
+$(eval $(generic-package))
+

+ 8 - 0
package/gfaqtdebug/Config.in

@@ -0,0 +1,8 @@
+config BR2_PACKAGE_GFAQTDEBUG
+	bool "GfAQTDEBUG"
+	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_GFANETDEBUG
+	help
+	  
+	  GfA QT Tools
+	  https://gogs.reru.org

+ 32 - 0
package/gfaqtdebug/gfaqt.mk

@@ -0,0 +1,32 @@
+################################################################################
+#
+# GfAQT
+#
+################################################################################
+
+GFAQTDEBUG_VERSION = V1.2.0
+GFAQTDEBUG_SITE = https://gogs.reru.org/GfA/libgfaqt.git
+GFAQTDEBUG_SITE_METHOD = git
+GFAQTDEBUG_DEPENDENCIES = qt5base gfanetdebug
+GFAQTDEBUG_INSTALL_STAGING = YES
+GFAQTDEBUG_INSTALL_TARGET = YES
+
+define GFAQTDEBUG_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake CONFIG+=debug)
+endef
+
+define GFAQTDEBUG_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define GFAQTDEBUG_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install_library
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install_includes
+endef
+
+define GFAQTDEBUG_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) INSTALL_ROOT=$(TARGET_DIR)/ $(MAKE) -C $(@D)	install_target
+endef
+
+$(eval $(generic-package))
+

+ 9 - 0
package/gfasitarautilsdebug/Config.in

@@ -0,0 +1,9 @@
+config BR2_PACKAGE_GFASITARAUTILSDEBUG
+	bool "GfASITARAUtilsDEBUG"
+	select BR2_PACKAGE_QT5BASE
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  Qt GfASITARAUtils 
+	  https://gogs.reru.org

+ 32 - 0
package/gfasitarautilsdebug/gfasitarautils.mk

@@ -0,0 +1,32 @@
+################################################################################
+#
+# GfASITARAUtils
+#
+################################################################################
+
+GFASITARAUTILSDEBUG_VERSION = V1.0.0
+GFASITARAUTILSDEBUG_SITE = https://gogs.reru.org/GfA/libgfasitarautils.git
+GFASITARAUTILSDEBUG_SITE_METHOD = git
+GFASITARAUTILSDEBUG_DEPENDENCIES = qt5base
+GFASITARAUTILSDEBUG_INSTALL_STAGING = YES
+GFASITARAUTILSDEBUG_INSTALL_TARGET = YES
+
+define GFASITARAUTILSDEBUG_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake CONFIG+=debug)
+endef
+
+define GFASITARAUTILSDEBUG_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define GFASITARAUTILSDEBUG_INSTALL_STAGING_CMDS
+#	$(TARGET_MAKE_ENV) INSTALL_ROOT=$(STAGING_DIR)/ $(MAKE) -C $(@D) install_toolchain
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install_library
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install_includes
+endef
+
+define GFASITARAUTILSDEBUG_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) INSTALL_ROOT=$(TARGET_DIR)/ $(MAKE) -C $(@D)	install_target
+endef
+
+$(eval $(generic-package))

+ 7 - 0
package/gfatimerdebug/Config.in

@@ -0,0 +1,7 @@
+config BR2_PACKAGE_GFATIMERDEBUG
+	bool "GfATIMERDEBUG"
+	select BR2_PACKAGE_QT5BASE
+	help
+	  
+	  GfA Timer Tools
+	  https://gogs.reru.org

+ 32 - 0
package/gfatimerdebug/gfatimer.mk

@@ -0,0 +1,32 @@
+################################################################################
+#
+# GfATIMER
+#
+################################################################################
+
+GFATIMERDEBUG_VERSION = V1.0.0
+GFATIMERDEBUG_SITE = https://gogs.reru.org/GfA/libgfatimer.git
+GFATIMERDEBUG_SITE_METHOD = git
+GFATIMERDEBUG_DEPENDENCIES = qt5base
+GFATIMERDEBUG_INSTALL_STAGING = YES
+GFATIMERDEBUG_INSTALL_TARGET = YES
+
+define GFATIMERDEBUG_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake CONFIG+=debug)
+endef
+
+define GFATIMERDEBUG_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define GFATIMERDEBUG_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install_library
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install_includes
+endef
+
+define GFATIMERDEBUG_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) INSTALL_ROOT=$(TARGET_DIR)/ $(MAKE) -C $(@D)	install_target
+endef
+
+$(eval $(generic-package))
+

+ 82 - 0
patches/0112-create-root-pwd-for-mysql.patch

@@ -0,0 +1,82 @@
+diff --git a/package/mysql/S97mysqld b/package/mysql/S97mysqld
+index b8d90d1..9e7d60a 100644
+--- a/package/mysql/S97mysqld
++++ b/package/mysql/S97mysqld
+@@ -6,8 +6,8 @@ MYSQL_USER="mysql"
+ [ -r /etc/default/mysql ] && . /etc/default/mysql
+ 
+ case "$1" in
+-	start)
+-		if [ ! -d $MYSQL_DIR/mysql ] ; then
++        start)
++                if [ ! -d $MYSQL_DIR/mysql ]; then
+ #--- my.cnf for GfA ---
+ (\
+ cat << EOF
+@@ -20,32 +20,38 @@ innodb_strict_mode=1
+ EOF
+ ) > /etc/my.cnf
+ #----------------------
+-			echo "Creating MySQL system tables..."
+-			mysql_install_db --user=$MYSQL_USER --ldata=$MYSQL_DIR
+-		fi
+-
+-		# mysqld runs as user mysql, but /run is only writable by root
+-		# so create a subdirectory for mysql.
+-		install -d -o mysql -g root -m 0755 /run/mysql
+-
+-		# We don't use start-stop-daemon because mysqld has
+-		# its own wrapper script.
+-		printf "Starting mysql..."
+-		/usr/bin/mysqld_safe --pid-file=/run/mysql/mysqld.pid &
+-		echo "done."
+-		;;
+-	stop)
+-		printf "Stopping mysql..."
+-		if test -f /run/mysql/mysqld.pid ; then
+-			kill `cat /run/mysql/mysqld.pid`
+-		fi
+-		echo "done."
+-		;;
+-	restart)
+-		$0 stop
+-		$0 start
+-		;;
+-	*)
+-		echo "Usage: /etc/init.d/mysqld {start|stop|restart}"
+-		;;
++                        echo "Creating MySQL system tables..."
++                        mysql_install_db --user=$MYSQL_USER --ldata=$MYSQL_DIR
++
++                        install -d -o mysql -g root -m 0755 /run/mysql
++
++                        printf "Starting mysql..."
++                        /usr/bin/mysqld_safe --pid-file=/run/mysql/mysqld.pid &
++
++                        until mysql -u root -h localhost -e 'select 1;' 2>/dev/null; do  echo "..>>"; sleep 1; done
++
++                        mysqladmin -u root password "root"
++                        printf "set root pwd"
++                else
++                        install -d -o mysql -g root -m 0755 /run/mysql
++                        printf "Starting mysql..."
++                        /usr/bin/mysqld_safe --pid-file=/run/mysql/mysqld.pid &
++                fi
++                echo "done."
++                ;;
++        stop)
++                printf "Stopping mysql..."
++                if test -f /run/mysql/mysqld.pid ; then
++                        kill `cat /run/mysql/mysqld.pid`
++                fi
++                echo "done."
++                ;;
++        restart)
++                $0 stop
++                $0 start
++                ;;
++        *)
++                echo "Usage: /etc/init.d/mysqld {start|stop|restart}"
++                ;;
+ esac
++