Reinhard Russinger 3 年之前
父节点
当前提交
9c64b0cb23

+ 16 - 0
Config.in

@@ -21,6 +21,21 @@ 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 "Other GfA Tools"
+source "$BR2_EXTERNAL_GFA_Display001_PATH/package/gfasysinfo/Config.in"
+source "$BR2_EXTERNAL_GFA_Display001_PATH/package/gfativaflashutil/Config.in"
+#------
+comment "GfA TIVA - SPI Kernelmodule"
+source "$BR2_EXTERNAL_GFA_Display001_PATH/package/drvgfaspi/Config.in"
+source "$BR2_EXTERNAL_GFA_Display001_PATH/package/gfaspistub/Config.in"
+#------
+comment "GfA LIB Services - Static Toolchain only libs"
+source "$BR2_EXTERNAL_GFA_Display001_PATH/package/gfaservices/Config.in"
+source "$BR2_EXTERNAL_GFA_Display001_PATH/package/gfaservicesdebug/Config.in"
+#------
+comment "GfA Tiva Flashplugin"
+source "$BR2_EXTERNAL_GFA_Display001_PATH/package/gfativaflashplugin/Config.in"
 #------
 comment "SIEMENS IEC Library"
 source "$BR2_EXTERNAL_GFA_Display001_PATH/package/Snap7/Config.in"
@@ -28,3 +43,4 @@ 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"
+#------

+ 1 - 1
configs/SOPINEA64_L50_Qt5.15_defconfig

@@ -159,7 +159,6 @@ BR2_PACKAGE_QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS="de_DE en_GB"
 BR2_PACKAGE_QT5WAYLAND=y
 BR2_PACKAGE_QT5WAYLAND_COMPOSITOR=y
 BR2_PACKAGE_QT5WEBENGINE=y
-BR2_PACKAGE_QT5WEBENGINE_PROPRIETARY_CODECS=y
 BR2_PACKAGE_WESTON=y
 BR2_PACKAGE_WESTON_DEFAULT_DRM=y
 BR2_PACKAGE_WESTON_FBDEV=y
@@ -450,6 +449,7 @@ BR2_PACKAGE_GFAIPC=y
 BR2_PACKAGE_GFASITARAUTILS=y
 BR2_PACKAGE_GFAQT=y
 BR2_PACKAGE_GFATIMER=y
+BR2_PACKAGE_GFANET=y
 BR2_PACKAGE_GFAIPCDEBUG=y
 BR2_PACKAGE_GFASITARAUTILSDEBUG=y
 BR2_PACKAGE_GFAQTDEBUG=y

+ 7 - 0
package/drvgfaspi/Config.in

@@ -0,0 +1,7 @@
+config BR2_PACKAGE_DRVGFASPI
+	bool "DRVGFASPI"
+	select BR2_PACKAGE_QT5BASE
+	help
+	  
+	  GfA Tivs SPI Kernelmodule
+	  https://gogs.reru.org

+ 12 - 0
package/drvgfaspi/drvgfaspi.mk

@@ -0,0 +1,12 @@
+################################################################################
+#
+# drvgfaspi
+#
+################################################################################
+
+DRVGFASPI_VERSION = 2021.10.12
+DRVGFASPI_SITE = https://gogs.reru.org/GfA/drvgfaspi.git
+DRVGFASPI_SITE_METHOD = git
+
+$(eval $(kernel-module))
+$(eval $(generic-package))

+ 1 - 1
package/gfaipc/gfaipc.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GFAIPC_VERSION = V1.4.0
+GFAIPC_VERSION = 2021.10.08
 GFAIPC_SITE = https://gogs.reru.org/GfA/libgfaipc.git
 GFAIPC_SITE_METHOD = git
 GFAIPC_DEPENDENCIES = qt5base

+ 1 - 1
package/gfaipcdebug/gfaipc.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GFAIPCDEBUG_VERSION = V1.4.0
+GFAIPCDEBUG_VERSION = 2021.10.08
 GFAIPCDEBUG_SITE = https://gogs.reru.org/GfA/libgfaipc.git
 GFAIPCDEBUG_SITE_METHOD = git
 GFAIPCDEBUG_DEPENDENCIES = qt5base

+ 1 - 1
package/gfamininet/gfamininet.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GFAMININET_VERSION = V1.0.0
+GFAMININET_VERSION = 2021.10.15
 GFAMININET_SITE = https://gogs.reru.org/GfA/libgfamininet.git
 GFAMININET_SITE_METHOD = git
 GFAMININET_DEPENDENCIES = qt5base

+ 1 - 1
package/gfamininetdebug/gfamininet.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GFAMININETDEBUG_VERSION = V1.0.0
+GFAMININETDEBUG_VERSION = 2021.10.15
 GFAMININETDEBUG_SITE = https://gogs.reru.org/GfA/libgfamininet.git
 GFAMININETDEBUG_SITE_METHOD = git
 GFAMININETDEBUG_DEPENDENCIES = qt5base

+ 1 - 1
package/gfanet/gfanet.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GFANET_VERSION = V1.0.0
+GFANET_VERSION = 2021.10.08
 GFANET_SITE = https://gogs.reru.org/GfA/libgfaNET.git
 GFANET_SITE_METHOD = git
 GFANET_DEPENDENCIES = qt5base

+ 1 - 1
package/gfanetdebug/gfanet.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GFANETDEBUG_VERSION = V1.0.0
+GFANETDEBUG_VERSION = 2021.10.08
 GFANETDEBUG_SITE = https://gogs.reru.org/GfA/libgfaNET.git
 GFANETDEBUG_SITE_METHOD = git
 GFANETDEBUG_DEPENDENCIES = qt5base

+ 0 - 1
package/gfaqt/Config.in

@@ -1,7 +1,6 @@
 config BR2_PACKAGE_GFAQT
 	bool "GfAQT"
 	select BR2_PACKAGE_QT5BASE
-	select BR2_PACKAGE_GFANET
 	help
 	  
 	  GfA QT Tools

+ 2 - 2
package/gfaqt/gfaqt.mk

@@ -4,10 +4,10 @@
 #
 ################################################################################
 
-GFAQT_VERSION = V1.2.0
+GFAQT_VERSION = 2021.10.08
 GFAQT_SITE = https://gogs.reru.org/GfA/libgfaqt.git
 GFAQT_SITE_METHOD = git
-GFAQT_DEPENDENCIES = qt5base gfanet
+GFAQT_DEPENDENCIES = qt5base
 GFAQT_INSTALL_STAGING = YES
 GFAQT_INSTALL_TARGET = YES
 

+ 1 - 1
package/gfaqtdebug/gfaqt.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GFAQTDEBUG_VERSION = V1.2.0
+GFAQTDEBUG_VERSION = 2021.10.08
 GFAQTDEBUG_SITE = https://gogs.reru.org/GfA/libgfaqt.git
 GFAQTDEBUG_SITE_METHOD = git
 GFAQTDEBUG_DEPENDENCIES = qt5base gfanetdebug

+ 8 - 0
package/gfaservices/Config.in

@@ -0,0 +1,8 @@
+config BR2_PACKAGE_GFASERVICES
+	bool "GfASERVICES"
+	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_LIBULFIUS
+	help
+	  
+	  GfA Services Static libraries
+	  https://gogs.reru.org

+ 26 - 0
package/gfaservices/gfaservices.mk

@@ -0,0 +1,26 @@
+################################################################################
+#
+# GfASERVICES
+#
+################################################################################
+
+GFASERVICES_VERSION = 2021.10.15
+GFASERVICES_SITE = https://gogs.reru.org/GfA/libgfaservices.git
+GFASERVICES_SITE_METHOD = git
+GFASERVICES_DEPENDENCIES = qt5base libulfius
+GFASERVICES_INSTALL_STAGING = YES
+
+define GFASERVICES_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define GFASERVICES_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define GFASERVICES_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
+$(eval $(generic-package))
+

+ 8 - 0
package/gfaservicesdebug/Config.in

@@ -0,0 +1,8 @@
+config BR2_PACKAGE_GFASERVICESDEBUG
+	bool "GfASERVICESDEBUG"
+	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_LIBULFIUS
+	help
+	  
+	  GfA Services Static debug libraries
+	  https://gogs.reru.org

+ 26 - 0
package/gfaservicesdebug/gfaservicesdebug.mk

@@ -0,0 +1,26 @@
+################################################################################
+#
+# GfASERVICESDEBUG
+#
+################################################################################
+
+GFASERVICESDEBUG_VERSION = 2021.10.15
+GFASERVICESDEBUG_SITE = https://gogs.reru.org/GfA/libgfaservices.git
+GFASERVICESDEBUG_SITE_METHOD = git
+GFASERVICESDEBUG_DEPENDENCIES = qt5base libulfius
+GFASERVICESDEBUG_INSTALL_STAGING = YES
+
+define GFASERVICESDEBUG_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake CONFIG+=debug)
+endef
+
+define GFASERVICESDEBUG_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define GFASERVICESDEBUG_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+endef
+
+$(eval $(generic-package))
+

+ 1 - 1
package/gfasitarautils/gfasitarautils.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GFASITARAUTILS_VERSION = V1.0.0
+GFASITARAUTILS_VERSION = 2021.10.08
 GFASITARAUTILS_SITE = https://gogs.reru.org/GfA/libgfasitarautils.git
 GFASITARAUTILS_SITE_METHOD = git
 GFASITARAUTILS_DEPENDENCIES = qt5base

+ 1 - 1
package/gfasitarautilsdebug/gfasitarautils.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GFASITARAUTILSDEBUG_VERSION = V1.0.0
+GFASITARAUTILSDEBUG_VERSION = 2021.10.08
 GFASITARAUTILSDEBUG_SITE = https://gogs.reru.org/GfA/libgfasitarautils.git
 GFASITARAUTILSDEBUG_SITE_METHOD = git
 GFASITARAUTILSDEBUG_DEPENDENCIES = qt5base

+ 6 - 0
package/gfaspistub/Config.in

@@ -0,0 +1,6 @@
+config BR2_PACKAGE_GFASPISTUB
+	bool "GFASPISTUB"
+	help
+	  
+	  GfA Tiva user interface
+	  https://gogs.reru.org

+ 23 - 0
package/gfaspistub/gfaspistub.mk

@@ -0,0 +1,23 @@
+################################################################################
+#
+# gfaspistub
+#
+################################################################################
+
+GFASPISTUB_VERSION = 2021.10.12
+GFASPISTUB_SITE = https://gogs.reru.org/GfA/drvgfaspi.git
+GFASPISTUB_SITE_METHOD = git
+
+define GFASPISTUB_CONFIGURE_CMDS
+	(cd $(@D)/GfaSpiStub; $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define GFASPISTUB_BUILD_CMDS
+        (cd $(@D)/GfaSpiStub; $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/GfaSpiStub)
+endef
+
+define GFASPISTUB_INSTALL_TARGET_CMDS
+        (cd $(@D)/GfaSpiStub; $(TARGET_MAKE_ENV) INSTALL_ROOT=$(TARGET_DIR)/ $(MAKE) -C$(@D)/GfaSpiStub install)
+endef
+
+$(eval $(generic-package))

+ 15 - 0
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++ {

+ 5 - 5
package/gfasqlplugin/gfasqlplugin.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GFASQLPLUGIN_VERSION = 1.0.0
+GFASQLPLUGIN_VERSION = 2021.10.15
 GFASQLPLUGIN_SITE = https://gogs.reru.org/GfA/GfASQLPlugin.git
 GFASQLPLUGIN_SITE_METHOD = git
 GFASQLPLUGIN_DEPENDENCIES = qt5base
@@ -19,12 +19,12 @@ 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
 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))

+ 6 - 0
package/gfasysinfo/Config.in

@@ -0,0 +1,6 @@
+config BR2_PACKAGE_GFASYSINFO
+	bool "GFASYSINFO"
+	help
+	  
+	  GfA sysinfo service
+	  https://gogs.reru.org

+ 23 - 0
package/gfasysinfo/gfasysinfo.mk

@@ -0,0 +1,23 @@
+################################################################################
+#
+# gfasysinfo
+#
+################################################################################
+
+GFASYSINFO_VERSION = 2021.10.08
+GFASYSINFO_SITE = https://gogs.reru.org/GfA/libgfaipc.git
+GFASYSINFO_SITE_METHOD = git
+
+define GFASYSINFO_CONFIGURE_CMDS
+	(cd $(@D)/gfasysinfo; $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define GFASYSINFO_BUILD_CMDS
+        (cd $(@D)/gfasysinfo; $(TARGET_MAKE_ENV) $(MAKE) -C $(@D)/gfasysinfo)
+endef
+
+define GFASYSINFO_INSTALL_TARGET_CMDS
+        (cd $(@D)/gfasysinfo; $(TARGET_MAKE_ENV) INSTALL_ROOT=$(TARGET_DIR)/ $(MAKE) -C$(@D)/gfasysinfo install)
+endef
+
+$(eval $(generic-package))

+ 1 - 1
package/gfatimer/gfatimer.mk

@@ -4,7 +4,7 @@
 #
 ################################################################################
 
-GFATIMER_VERSION = V1.0.0
+GFATIMER_VERSION = 2021.10.08
 GFATIMER_SITE = https://gogs.reru.org/GfA/libgfatimer.git
 GFATIMER_SITE_METHOD = git
 GFATIMER_DEPENDENCIES = qt5base

+ 2 - 2
package/gfatimerdebug/gfatimer.mk

@@ -1,10 +1,10 @@
-################################################################################
+#################################################################################
 #
 # GfATIMER
 #
 ################################################################################
 
-GFATIMERDEBUG_VERSION = V1.0.0
+GFATIMERDEBUG_VERSION = 2021.10.08
 GFATIMERDEBUG_SITE = https://gogs.reru.org/GfA/libgfatimer.git
 GFATIMERDEBUG_SITE_METHOD = git
 GFATIMERDEBUG_DEPENDENCIES = qt5base

+ 15 - 0
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++ {

+ 6 - 0
package/gfativaflashplugin/Config.in

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

+ 29 - 0
package/gfativaflashplugin/gfativaflashplugin.mk

@@ -0,0 +1,29 @@
+################################################################################
+#
+# gfativaflashplugin
+#
+################################################################################
+
+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)
+endef
+
+define GFATIVAFLASPLUGIN_BUILD_CMDS
+        (cd $(@D); $(TARGET_MAKE_ENV) $(MAKE) -C $(@D))
+endef
+
+define GFATIVAFLASHPLUGIN_INSTALL_TARGET_CMDS
+        (cd $(@D); $(TARGET_MAKE_ENV) INSTALL_ROOT=$(TARGET_DIR)/ $(MAKE) -C$(@D) install_target)
+endef
+
+define GFATIVAFLASHPLUGIN_INSTALL_STAGING_CMDS
+        $(TARGET_MAKE_ENV) INSTALL_ROOT=$(STAGING_DIR)/ $(MAKE) -C $(@D) install
+endef
+
+$(eval $(generic-package))

+ 6 - 0
package/gfativaflashutil/Config.in

@@ -0,0 +1,6 @@
+config BR2_PACKAGE_GFATIVAFLASHUTIL
+	bool "GFATIVAFLASHUTIL"
+	help
+	  
+	  GfA flas utility for remote devices
+	  https://gogs.reru.org

+ 23 - 0
package/gfativaflashutil/gfativaflashutil.mk

@@ -0,0 +1,23 @@
+################################################################################
+#
+# gfativaflashutil
+#
+################################################################################
+
+GFATIVAFLASHUTIL_VERSION = 2021.10.15
+GFATIVAFLASHUTIL_SITE = https://gogs.reru.org/GfA/gfativaflashutil.git
+GFATIVAFLASHUTIL_SITE_METHOD = git
+
+define GFATIVAFLASHUTIL_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define GFATIVAFLASHUTIL_BUILD_CMDS
+        (cd $(@D); $(TARGET_MAKE_ENV) $(MAKE) -C $(@D))
+endef
+
+define GFATIVAFLASHUTIL_INSTALL_TARGET_CMDS
+        (cd $(@D); $(TARGET_MAKE_ENV) INSTALL_ROOT=$(TARGET_DIR)/ $(MAKE) -C$(@D) install)
+endef
+
+$(eval $(generic-package))