diff mbox

[v2] qt5serialbus: new package

Message ID 1459257824-3098-1-git-send-email-yegorslists@googlemail.com
State Accepted
Headers show

Commit Message

Yegor Yefremov March 29, 2016, 1:23 p.m. UTC
From: Yegor Yefremov <yegorslists@googlemail.com>

Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
---
Changes:
	v2: - add qt5serialport build-time dependency (Julien Corjon)
	    - remove LGPL2.1 license (Julien Corjon)
	    - install canbusutil binary (Julien Corjon)

 package/qt5/Config.in                      |  1 +
 package/qt5/qt5serialbus/Config.in         | 11 +++++++
 package/qt5/qt5serialbus/qt5serialbus.hash |  2 ++
 package/qt5/qt5serialbus/qt5serialbus.mk   | 48 ++++++++++++++++++++++++++++++
 4 files changed, 62 insertions(+)
 create mode 100644 package/qt5/qt5serialbus/Config.in
 create mode 100644 package/qt5/qt5serialbus/qt5serialbus.hash
 create mode 100644 package/qt5/qt5serialbus/qt5serialbus.mk

Comments

Julien Corjon April 4, 2016, 2:47 p.m. UTC | #1
Dear Yegor,

Your patch looks fine, so:
Reviewed-by: Julien Corjon <corjon.j@ecagroup.com>

Regards,

Julien

Le 29/03/2016 15:23, yegorslists@googlemail.com a écrit :
> From: Yegor Yefremov <yegorslists@googlemail.com>
>
> Signed-off-by: Yegor Yefremov <yegorslists@googlemail.com>
> ---
> Changes:
> 	v2: - add qt5serialport build-time dependency (Julien Corjon)
> 	    - remove LGPL2.1 license (Julien Corjon)
> 	    - install canbusutil binary (Julien Corjon)
>
>   package/qt5/Config.in                      |  1 +
>   package/qt5/qt5serialbus/Config.in         | 11 +++++++
>   package/qt5/qt5serialbus/qt5serialbus.hash |  2 ++
>   package/qt5/qt5serialbus/qt5serialbus.mk   | 48 ++++++++++++++++++++++++++++++
>   4 files changed, 62 insertions(+)
>   create mode 100644 package/qt5/qt5serialbus/Config.in
>   create mode 100644 package/qt5/qt5serialbus/qt5serialbus.hash
>   create mode 100644 package/qt5/qt5serialbus/qt5serialbus.mk
>
> diff --git a/package/qt5/Config.in b/package/qt5/Config.in
> index f673daa..4febee6 100644
> --- a/package/qt5/Config.in
> +++ b/package/qt5/Config.in
> @@ -40,6 +40,7 @@ source "package/qt5/qt5imageformats/Config.in"
>   source "package/qt5/qt5multimedia/Config.in"
>   source "package/qt5/qt5quickcontrols/Config.in"
>   source "package/qt5/qt5sensors/Config.in"
> +source "package/qt5/qt5serialbus/Config.in"
>   source "package/qt5/qt5serialport/Config.in"
>   source "package/qt5/qt5svg/Config.in"
>   source "package/qt5/qt5tools/Config.in"
> diff --git a/package/qt5/qt5serialbus/Config.in b/package/qt5/qt5serialbus/Config.in
> new file mode 100644
> index 0000000..504141c
> --- /dev/null
> +++ b/package/qt5/qt5serialbus/Config.in
> @@ -0,0 +1,11 @@
> +config BR2_PACKAGE_QT5SERIALBUS
> +	bool "qt5serialbus"
> +	select BR2_PACKAGE_QT5BASE
> +	select BR2_PACKAGE_QT5SERIALPORT
> +	help
> +	  Qt is a cross-platform application and UI framework for
> +	  developers using C++.
> +
> +	  This package corresponds to the qt5serialbus module.
> +
> +	  http://qt.io
> diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash
> new file mode 100644
> index 0000000..da46e76
> --- /dev/null
> +++ b/package/qt5/qt5serialbus/qt5serialbus.hash
> @@ -0,0 +1,2 @@
> +# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtserialbus-opensource-src-5.6.0.tar.xz.mirrorlist
> +sha256 8cca530ee53f19672f57ffee6f2f28866d5c84b8cb3dbbd67c05d27893ac0b8e qtserialbus-opensource-src-5.6.0.tar.xz
> diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk
> new file mode 100644
> index 0000000..63d2820
> --- /dev/null
> +++ b/package/qt5/qt5serialbus/qt5serialbus.mk
> @@ -0,0 +1,48 @@
> +################################################################################
> +#
> +# qt5serialbus
> +#
> +################################################################################
> +
> +QT5SERIALBUS_VERSION = $(QT5_VERSION)
> +QT5SERIALBUS_SITE = $(QT5_SITE)
> +QT5SERIALBUS_SOURCE = qtserialbus-opensource-src-$(QT5SERIALBUS_VERSION).tar.xz
> +QT5SERIALBUS_DEPENDENCIES = qt5base qt5serialport
> +QT5SERIALBUS_INSTALL_STAGING = YES
> +
> +ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
> +QT5SERIALBUS_LICENSE = GPLv2 or GPLv3 or LGPLv3, GFDLv1.3 (docs)
> +QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
> +else
> +QT5SERIALBUS_LICENSE = Commercial license
> +QT5SERIALBUS_REDISTRIBUTE = NO
> +endif
> +
> +define QT5SERIALBUS_CONFIGURE_CMDS
> +	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
> +endef
> +
> +define QT5SERIALBUS_BUILD_CMDS
> +	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
> +endef
> +
> +define QT5SERIALBUS_INSTALL_STAGING_CMDS
> +	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
> +	$(QT5_LA_PRL_FILES_FIXUP)
> +endef
> +
> +ifeq ($(BR2_STATIC_LIBS),)
> +define QT5SERIALBUS_INSTALL_TARGET_CMDS
> +	cp -dpf $(STAGING_DIR)/usr/lib/libQt5SerialBus.so.* \
> +		$(TARGET_DIR)/usr/lib
> +
> +	mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins/canbus
> +	cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/canbus/*.so \
> +		$(TARGET_DIR)/usr/lib/qt/plugins/canbus
> +
> +	$(INSTALL) -m 0755 -D $(@D)/bin/canbusutil \
> +		$(TARGET_DIR)/usr/bin/canbusutil
> +endef
> +endif
> +
> +$(eval $(generic-package))
>
Thomas Petazzoni April 18, 2016, 8:44 p.m. UTC | #2
Hello,

On Tue, 29 Mar 2016 15:23:44 +0200, yegorslists@googlemail.com wrote:

> +ifeq ($(BR2_STATIC_LIBS),)
> +define QT5SERIALBUS_INSTALL_TARGET_CMDS
> +	cp -dpf $(STAGING_DIR)/usr/lib/libQt5SerialBus.so.* \
> +		$(TARGET_DIR)/usr/lib
> +
> +	mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins/canbus
> +	cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/canbus/*.so \
> +		$(TARGET_DIR)/usr/lib/qt/plugins/canbus
> +
> +	$(INSTALL) -m 0755 -D $(@D)/bin/canbusutil \
> +		$(TARGET_DIR)/usr/bin/canbusutil

This tool is most likely available and should be installed even when
BR2_STATIC_LIBS=y, so I've fixed up this aspect in your package and
applied. Please check
https://git.buildroot.net/buildroot/commit/?id=1a9a9d15e670b0ab93da06e036384514ac69b642,
and if you can, do a BR2_STATIC_LIBS=y build to double check.

Thanks a lot!

Thomas
diff mbox

Patch

diff --git a/package/qt5/Config.in b/package/qt5/Config.in
index f673daa..4febee6 100644
--- a/package/qt5/Config.in
+++ b/package/qt5/Config.in
@@ -40,6 +40,7 @@  source "package/qt5/qt5imageformats/Config.in"
 source "package/qt5/qt5multimedia/Config.in"
 source "package/qt5/qt5quickcontrols/Config.in"
 source "package/qt5/qt5sensors/Config.in"
+source "package/qt5/qt5serialbus/Config.in"
 source "package/qt5/qt5serialport/Config.in"
 source "package/qt5/qt5svg/Config.in"
 source "package/qt5/qt5tools/Config.in"
diff --git a/package/qt5/qt5serialbus/Config.in b/package/qt5/qt5serialbus/Config.in
new file mode 100644
index 0000000..504141c
--- /dev/null
+++ b/package/qt5/qt5serialbus/Config.in
@@ -0,0 +1,11 @@ 
+config BR2_PACKAGE_QT5SERIALBUS
+	bool "qt5serialbus"
+	select BR2_PACKAGE_QT5BASE
+	select BR2_PACKAGE_QT5SERIALPORT
+	help
+	  Qt is a cross-platform application and UI framework for
+	  developers using C++.
+
+	  This package corresponds to the qt5serialbus module.
+
+	  http://qt.io
diff --git a/package/qt5/qt5serialbus/qt5serialbus.hash b/package/qt5/qt5serialbus/qt5serialbus.hash
new file mode 100644
index 0000000..da46e76
--- /dev/null
+++ b/package/qt5/qt5serialbus/qt5serialbus.hash
@@ -0,0 +1,2 @@ 
+# Hash from: http://download.qt.io/official_releases/qt/5.6/5.6.0/submodules/qtserialbus-opensource-src-5.6.0.tar.xz.mirrorlist
+sha256 8cca530ee53f19672f57ffee6f2f28866d5c84b8cb3dbbd67c05d27893ac0b8e qtserialbus-opensource-src-5.6.0.tar.xz
diff --git a/package/qt5/qt5serialbus/qt5serialbus.mk b/package/qt5/qt5serialbus/qt5serialbus.mk
new file mode 100644
index 0000000..63d2820
--- /dev/null
+++ b/package/qt5/qt5serialbus/qt5serialbus.mk
@@ -0,0 +1,48 @@ 
+################################################################################
+#
+# qt5serialbus
+#
+################################################################################
+
+QT5SERIALBUS_VERSION = $(QT5_VERSION)
+QT5SERIALBUS_SITE = $(QT5_SITE)
+QT5SERIALBUS_SOURCE = qtserialbus-opensource-src-$(QT5SERIALBUS_VERSION).tar.xz
+QT5SERIALBUS_DEPENDENCIES = qt5base qt5serialport
+QT5SERIALBUS_INSTALL_STAGING = YES
+
+ifeq ($(BR2_PACKAGE_QT5BASE_LICENSE_APPROVED),y)
+QT5SERIALBUS_LICENSE = GPLv2 or GPLv3 or LGPLv3, GFDLv1.3 (docs)
+QT5SERIALBUS_LICENSE_FILES = LICENSE.GPLv2 LICENSE.GPLv3 LICENSE.LGPLv3 LICENSE.FDL
+else
+QT5SERIALBUS_LICENSE = Commercial license
+QT5SERIALBUS_REDISTRIBUTE = NO
+endif
+
+define QT5SERIALBUS_CONFIGURE_CMDS
+	(cd $(@D); $(TARGET_MAKE_ENV) $(HOST_DIR)/usr/bin/qmake)
+endef
+
+define QT5SERIALBUS_BUILD_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
+endef
+
+define QT5SERIALBUS_INSTALL_STAGING_CMDS
+	$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
+	$(QT5_LA_PRL_FILES_FIXUP)
+endef
+
+ifeq ($(BR2_STATIC_LIBS),)
+define QT5SERIALBUS_INSTALL_TARGET_CMDS
+	cp -dpf $(STAGING_DIR)/usr/lib/libQt5SerialBus.so.* \
+		$(TARGET_DIR)/usr/lib
+
+	mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins/canbus
+	cp -dpf $(STAGING_DIR)/usr/lib/qt/plugins/canbus/*.so \
+		$(TARGET_DIR)/usr/lib/qt/plugins/canbus
+
+	$(INSTALL) -m 0755 -D $(@D)/bin/canbusutil \
+		$(TARGET_DIR)/usr/bin/canbusutil
+endef
+endif
+
+$(eval $(generic-package))