rpi/domo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bump buildroot to version 2017-02

Browse Source 
TG-3 #closed
This commit is contained in:
jbnadal
2017-03-28 18:29:16 +02:00
parent 93b7fd91d2
commit 42c92a6bcb
3010 changed files with 41289 additions and 46428 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
bsp/buildroot/package/qextserialport/0001-Create-a-main-include-file-QExtSerialPort.patch Normal file
View File

@@ -0,0 +1,40 @@
From 62fbe9c3539945df6204501b7e3ae0d51db075a3 Mon Sep 17 00:00:00 2001
From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Date: Thu, 24 Nov 2016 22:30:40 +0100
Subject: [PATCH] Create a main include file QExtSerialPort
This main include file will be installed in
<QtExtSerialPort/QExtSerialPort> so that Qt applications can use this
library by including header files in a Qt-like style.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
[Arnout: add it to qextserialport.pri so it is installed]
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
src/QExtSerialPort | 2 ++
src/qextserialport.pri | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
create mode 100644 src/QExtSerialPort
diff --git a/src/QExtSerialPort b/src/QExtSerialPort
new file mode 100644
index 0000000..a48aeea
--- /dev/null
+++ b/src/QExtSerialPort
@@ -0,0 +1,2 @@
+#include "qextserialport.h"
+#include "qextserialenumerator.h"
diff --git a/src/qextserialport.pri b/src/qextserialport.pri
index 461d56f..f8a678d 100644
--- a/src/qextserialport.pri
+++ b/src/qextserialport.pri
@@ -3,7 +3,8 @@
PUBLIC_HEADERS += $$PWD/qextserialport.h \
$$PWD/qextserialenumerator.h \
- $$PWD/qextserialport_global.h
+ $$PWD/qextserialport_global.h \
+ $$PWD/QExtSerialPort
HEADERS += $$PUBLIC_HEADERS \
$$PWD/qextserialport_p.h \

16
bsp/buildroot/package/qextserialport/0001-gui.patch
View File

@@ -1,16 +0,0 @@
Don't require Qt GUI module
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
diff -Nrup qextserialport-f83b4e7ca922e53.orig/qextserialport.pro qextserialport-f83b4e7ca922e53/qextserialport.pro
--- qextserialport-f83b4e7ca922e53.orig/qextserialport.pro 2012-10-17 09:13:53.000000000 +0200
+++ qextserialport-f83b4e7ca922e53/qextserialport.pro 2012-11-13 22:48:29.249431510 +0100
@@ -41,6 +41,8 @@ macx:qesp_mac_framework {
win32|mac:!wince*:!win32-msvc:!macx-xcode:CONFIG += debug_and_release build_all
+!win32*:!wince*:QT -= gui
+
#generate proper library name
greaterThan(QT_MAJOR_VERSION, 4) {
QESP_LIB_BASENAME = QtExtSerialPort

28
bsp/buildroot/package/qextserialport/0002-Tell-qmake-to-add-a-pkgconfig-file-to-ease-usage-wit.patch Normal file
View File

@@ -0,0 +1,28 @@
From 14d4d3e7b5c748118acffddd397fb67b37fd5054 Mon Sep 17 00:00:00 2001
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
Date: Thu, 24 Nov 2016 22:44:02 +0100
Subject: [PATCH] Tell qmake to add a pkgconfig file to ease usage with
applications
Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
---
qextserialport.pro | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/qextserialport.pro b/qextserialport.pro
index 8d2c03a..2fcb39c 100644
--- a/qextserialport.pro
+++ b/qextserialport.pro
@@ -42,7 +42,8 @@ TEMPLATE=lib
include(src/qextserialport.pri)
#create_prl is needed, otherwise, MinGW can't found libqextserialport1.a
-CONFIG += create_prl
+CONFIG += create_prl create_pc
+QMAKE_PKGCONFIG_DESTDIR = pkgconfig
#mac framework is designed for shared library
macx:qesp_mac_framework:qesp_static: CONFIG -= qesp_static
--
2.10.2

15
bsp/buildroot/package/qextserialport/0002-main-include.patch
View File

@@ -1,15 +0,0 @@
Create a main include file QExtSerialPort
This main include file will be installed in
<QExtSerialPort/QExtSerialPort> so that Qt applications can use this
library by including header files in a Qt-like style.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Index: qextserialport-ef4af2a2ee3f/src/QExtSerialPort
===================================================================
--- /dev/null
+++ qextserialport-ef4af2a2ee3f/src/QExtSerialPort
@@ -0,0 +1,2 @@
+#include "qextserialport.h"
+#include "qextserialenumerator.h"

19
bsp/buildroot/package/qextserialport/0003-pkgconfig.patch
View File

@@ -1,19 +0,0 @@
Add a pkgconfig file to ease usage with applications
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Index: qextserialport-ef4af2a2ee3f/qextserialport.pc
===================================================================
--- /dev/null
+++ qextserialport-ef4af2a2ee3f/qextserialport.pc
@@ -0,0 +1,10 @@
+prefix=/usr
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include/QExtSerialPort
+
+Name: QtExtSerialPort
+Description: QtExtSerialPort library
+Version: 1.2.0
+Libs: -L${libdir} -lqextserialport
+Cflags: -I${includedir}

26
bsp/buildroot/package/qextserialport/qextserialport.mk
View File

@@ -10,32 +10,36 @@ QEXTSERIALPORT_LICENSE = MIT
QEXTSERIALPORT_LICENSE_FILES = LICENSE.md
QEXTSERIALPORT_INSTALL_STAGING = YES
ifeq ($(BR2_STATIC_LIBS),y)
QEXTSERIALPORT_CONF_OPTS += CONFIG+=qesp_static
endif
ifeq ($(BR2_PACKAGE_QT),y)
QEXTSERIALPORT_DEPENDENCIES += qt
define QEXTSERIALPORT_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(QT_QMAKE))
endef
QEXTSERIALPORT_QMAKE = $(QT_QMAKE)
else ifeq ($(BR2_PACKAGE_QT5),y)
QEXTSERIALPORT_DEPENDENCIES += qt5base
define QEXTSERIALPORT_CONFIGURE_CMDS
(cd $(@D); $(TARGET_MAKE_ENV) $(QT5_QMAKE))
endef
QEXTSERIALPORT_QMAKE = $(QT5_QMAKE)
endif
define QEXTSERIALPORT_CONFIGURE_CMDS
cd $(@D); $(TARGET_MAKE_ENV) $(QEXTSERIALPORT_QMAKE) $(QEXTSERIALPORT_CONF_OPTS)
endef
define QEXTSERIALPORT_BUILD_CMDS
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D)
endef
define QEXTSERIALPORT_INSTALL_STAGING_CMDS
mkdir -p $(STAGING_DIR)/usr/include/QExtSerialPort
cp $(@D)/src/*.h $(STAGING_DIR)/usr/include/QExtSerialPort/
cp $(@D)/src/QExtSerialPort $(STAGING_DIR)/usr/include/QExtSerialPort/
cp -a $(@D)/*.so* $(STAGING_DIR)/usr/lib/
cp $(@D)/qextserialport.pc $(STAGING_DIR)/usr/lib/pkgconfig/
$(TARGET_MAKE_ENV) $(MAKE) -C $(@D) install
endef
ifeq ($(BR2_STATIC_LIBS),y)
QEXTSERIALPORT_INSTALL_TARGET = NO
else
define QEXTSERIALPORT_INSTALL_TARGET_CMDS
cp -a $(@D)/*.so.* $(TARGET_DIR)/usr/lib
endef
endif
$(eval $(generic-package))