Build New changes

Config.in

@@ -36,7 +36,6 @@ source "$BR2_EXTERNAL_GFA_Display001_PATH/package/gfaservicesdebug/Config.in"
 #------
 comment "GfA Tiva Flashplugin"
 source "$BR2_EXTERNAL_GFA_Display001_PATH/package/gfativaflashplugin/Config.in"
-source "$BR2_EXTERNAL_GFA_Display001_PATH/package/gfativaflashplugindebug/Config.in"
 #------
 comment "SIEMENS IEC Library"
 source "$BR2_EXTERNAL_GFA_Display001_PATH/package/Snap7/Config.in"

board/GfA/Display001/BUILD

@@ -1 +1 @@
-827
+828

package/gfasqlplugin/0001-fix-target-path.patch

@@ -0,0 +1,15 @@
+diff --git a/mysqlqmlplugin.pro b/mysqlqmlplugin.pro
+index 29e1c38..9e0677b 100644
+--- a/mysqlqmlplugin.pro
++++ b/mysqlqmlplugin.pro
+@@ -35,8 +35,8 @@ HEADERS += \
+ 
+ ##############################################################
+ 
+-qmlPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
+-
++##qmlPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
++qmlPath = /usr/qml/$$replace(uri, \\., /)
+ ##############################################################
+ 
+ linux-g++ {

package/gfasqlplugin/gfasqlplugin.mk

@@ -19,12 +19,14 @@ define GFASQLPLUGIN_BUILD_CMDS
 	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
 endef
 
-define GFASQLPLUGIN_INSTALL_STAGING_CMDS
-	$(TARGET_MAKE_ENV) INSTALL_ROOT=$(STAGING_DIR)/ $(MAKE) -C $(@D) install
+define GFASQLPLUGIN_INSTALL_TARGET_CMDS
+	$(TARGET_MAKE_ENV) INSTALL_ROOT=$(TARGET_DIR)/ $(MAKE) -C $(@D) install_target
+	$(TARGET_MAKE_ENV) INSTALL_ROOT=$(TARGET_DIR)/ $(MAKE) -C $(@D) install_qmlDir
+	$(TARGET_MAKE_ENV) INSTALL_ROOT=$(TARGET_DIR)/ $(MAKE) -C $(@D) install_copy_qmltyes
 endef
 
-define GFASQLPLUGIN_INSTALL_TARGET_CMDS
-	$(TARGET_MAKE_ENV) INSTALL_ROOT=$(TARGET_DIR)/ $(MAKE) -C $(@D) install
+define GFASQLPLUGIN_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV)  INSTALL_ROOT=$(STAGING_DIR)/ $(MAKE) -C $(@D) install
 endef
 
 $(eval $(generic-package))

package/gfasysinfo/0001-add-missing-include.patch → package/gfasysinfo/0001-cmath-include.patch

@@ -1,12 +1,12 @@
 diff --git a/gfasysinfo/src/procfile.cpp b/gfasysinfo/src/procfile.cpp
-index 1f7fb88..1fa7e8a 100644
+index 1f7fb88..8f375c9 100644
 --- a/gfasysinfo/src/procfile.cpp
 +++ b/gfasysinfo/src/procfile.cpp
 @@ -4,6 +4,7 @@
  #include <fstream>
  #include <sstream>
  #include <regex>
-+#include <math.h>
++#include <cmath>
  #include "procfile.h"
  
  /////////////////////////////////////////////////////////////////////////////

package/gfativaflashplugin/0001-fix-target-path.patch

@@ -0,0 +1,15 @@
+diff --git a/gfativaflashplugin.pro b/gfativaflashplugin.pro
+index 1c00fd3..fe5a1d1 100644
+--- a/gfativaflashplugin.pro
++++ b/gfativaflashplugin.pro
+@@ -40,8 +40,8 @@ HEADERS += \
+ 
+ ##############################################################
+ 
+-qmlPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
+-
++##qmlPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /)
++qmlPath = /usr/qml/$$replace(uri, \\., /)
+ ##############################################################
+ 
+ linux-g++ {

package/gfativaflashplugin/gfativaflashplugin.mk

@@ -7,6 +7,8 @@
 GFATIVAFLASHPLUGIN_VERSION = 2021.10.15
 GFATIVAFLASHPLUGIN_SITE = https://gogs.reru.org/GfA/libgfativaflashplugin.git
 GFATIVAFLASHPLUGIN_SITE_METHOD = git
+GFATIVAFLASHPLUGIN_INSTALL_STAGING = YES
+GFATIVAFLASHPLUGIN_INSTALL_TARGET = YES
 
 define GFATIVAFLASHPLUGIN_CONFIGURE_CMDS
 	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
@@ -17,7 +19,13 @@ define GFATIVAFLASPLUGIN_BUILD_CMDS
 endef
 
 define GFATIVAFLASHPLUGIN_INSTALL_TARGET_CMDS
-        (cd $(@D); $(TARGET_MAKE_ENV) INSTALL_ROOT=$(TARGET_DIR)/ $(MAKE) -C$(@D) install)
+       $(TARGET_MAKE_ENV) INSTALL_ROOT=$(TARGET_DIR)/ $(MAKE) -C $(@D) install_target
+       $(TARGET_MAKE_ENV) INSTALL_ROOT=$(TARGET_DIR)/ $(MAKE) -C $(@D) install_qmlDir
+       $(TARGET_MAKE_ENV) INSTALL_ROOT=$(TARGET_DIR)/ $(MAKE) -C $(@D) install_copy_qmltyes
+endef
+
+define GFATIVAFLASHPLUGIN_INSTALL_STAGING_CMDS
+        $(TARGET_MAKE_ENV) INSTALL_ROOT=$(STAGING_DIR)/ $(MAKE) -C $(@D) install
 endef
 
 $(eval $(generic-package))

package/gfativaflashplugindebug/Config.in

@@ -1,6 +0,0 @@
-config BR2_PACKAGE_GFATIVAFLASHPLUGINDEBUG
-	bool "GFATIVAFLASHPLUGINDEBUG"
-	help
-	  
-	  GfA flash utility for remote devices
-	  https://gogs.reru.org

package/gfativaflashplugindebug/gfativaflashplugindebug.mk

@@ -1,23 +0,0 @@
-################################################################################
-#
-# gfativaflashplugindebug
-#
-################################################################################
-
-GFATIVAFLASHPLUGINDEBUG_VERSION = 2021.10.15
-GFATIVAFLASHPLUGINDEBUG_SITE = https://gogs.reru.org/GfA/libgfativaflashplugin.git
-GFATIVAFLASHPLUGINDEBUG_SITE_METHOD = git
-
-define GFATIVAFLASHPLUGINDEBUG_CONFIGURE_CMDS
-	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake CONFIG+=debug)
-endef
-
-define GFATIVAFLASPLUGINDEBUG_BUILD_CMDS
-        (cd $(@D); $(TARGET_MAKE_ENV) $(MAKE) -C $(@D))
-endef
-
-define GFATIVAFLASHPLUGINDEBUG_INSTALL_TARGET_CMDS
-        (cd $(@D); $(TARGET_MAKE_ENV) INSTALL_ROOT=$(TARGET_DIR)/ $(MAKE) -C$(@D) install)
-endef
-
-$(eval $(generic-package))