Update buildroot 2020.02.01 (#622)
* Update buildroot 2020.02.01 Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix LN * Fix wpa Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix lint Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * fix-network Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch> * Fix script Signed-off-by: Pascal Vizeli <pvizeli@syshack.ch>
This commit is contained in:
@@ -25,31 +25,43 @@ ifneq ($(strip $(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),)
|
||||
QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+="$(foreach lang,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS),lang-$(lang))"
|
||||
|
||||
ifneq ($(filter ja_JP all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),)
|
||||
QT5VIRTUALKEYBOARD_LICENSE := $(QT5VIRTUALKEYBOARD_LICENSE), Apache-2.0 (openwnn)
|
||||
QT5VIRTUALKEYBOARD_LICENSE += , Apache-2.0 (openwnn)
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
|
||||
QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/openwnn/NOTICE
|
||||
else
|
||||
QT5VIRTUALKEYBOARD_LICENSE_FILES += src/plugins/openwnn/3rdparty/openwnn/NOTICE
|
||||
endif
|
||||
endif
|
||||
|
||||
ifneq ($(filter zh_CN all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),)
|
||||
QT5VIRTUALKEYBOARD_LICENSE += , Apache-2.0 (pinyin)
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
|
||||
QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES
|
||||
QT5VIRTUALKEYBOARD_LICENSE := $(QT5VIRTUALKEYBOARD_LICENSE), Apache-2.0 (pinyin)
|
||||
QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/pinyin/NOTICE
|
||||
else
|
||||
QT5VIRTUALKEYBOARD_LICENSE_FILES += src/plugins/pinyin/3rdparty/pinyin/NOTICE
|
||||
endif
|
||||
endif
|
||||
|
||||
ifneq ($(filter zh_TW all,$(QT5VIRTUALKEYBOARD_LANGUAGE_LAYOUTS)),)
|
||||
QT5VIRTUALKEYBOARD_LICENSE += , Apache-2.0 (tcime), BSD-3-Clause (tcime)
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
|
||||
QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES
|
||||
QT5VIRTUALKEYBOARD_LICENSE := $(QT5VIRTUALKEYBOARD_LICENSE), Apache-2.0 (tcime), BSD-3-Clause (tcime)
|
||||
QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/tcime/COPYING
|
||||
else
|
||||
QT5VIRTUALKEYBOARD_LICENSE_FILES += src/plugins/tcime/3rdparty/tcime/COPYING
|
||||
endif
|
||||
endif
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5VIRTUALKEYBOARD_HANDWRITING),y)
|
||||
QT5VIRTUALKEYBOARD_3RDPARTY_PARTS = YES
|
||||
QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+=handwriting
|
||||
QT5VIRTUALKEYBOARD_LICENSE := $(QT5VIRTUALKEYBOARD_LICENSE), MIT (lipi-toolkit)
|
||||
QT5VIRTUALKEYBOARD_LICENSE += , MIT (lipi-toolkit)
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_5_6),y)
|
||||
QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/lipi-toolkit/license.txt
|
||||
else
|
||||
QT5VIRTUALKEYBOARD_LICENSE_FILES += src/virtualkeyboard/3rdparty/lipi-toolkit/MIT_LICENSE.txt
|
||||
QT5VIRTUALKEYBOARD_LICENSE_FILES += src/plugins/lipi-toolkit/3rdparty/lipi-toolkit/MIT_LICENSE.txt
|
||||
endif
|
||||
endif
|
||||
|
||||
@@ -57,7 +69,7 @@ ifeq ($(BR2_PACKAGE_QT5VIRTUALKEYBOARD_ARROW_KEY_NAVIGATION),y)
|
||||
QT5VIRTUALKEYBOARD_QMAKEFLAGS += CONFIG+=arrow-key-navigation
|
||||
endif
|
||||
|
||||
ifdef QT5VIRTUALKEYBOARD_3RDPARTY_PARTS
|
||||
ifeq ($(QT5VIRTUALKEYBOARD_3RDPARTY_PARTS),YES)
|
||||
define QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_PARTS
|
||||
cp -dpfr $(STAGING_DIR)/usr/qtvirtualkeyboard $(TARGET_DIR)/usr
|
||||
endef
|
||||
@@ -93,10 +105,17 @@ define QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES
|
||||
endef
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_QT5_VERSION_LATEST):$(BR2_STATIC_LIBS),y:)
|
||||
define QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS
|
||||
cp -dpf $(STAGING_DIR)/usr/lib/libQt5VirtualKeyboard*.so.* $(TARGET_DIR)/usr/lib
|
||||
endef
|
||||
endif
|
||||
|
||||
define QT5VIRTUALKEYBOARD_INSTALL_TARGET_CMDS
|
||||
mkdir -p $(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts
|
||||
cp -dpfr $(STAGING_DIR)/usr/lib/qt/plugins/platforminputcontexts/libqtvirtualkeyboardplugin.so \
|
||||
$(TARGET_DIR)/usr/lib/qt/plugins/platforminputcontexts
|
||||
$(QT5VIRTUALKEYBOARD_INSTALL_TARGET_LIBS)
|
||||
$(QT5VIRTUALKEYBOARD_INSTALL_TARGET_QML)
|
||||
$(QT5VIRTUALKEYBOARD_INSTALL_TARGET_3RDPARTY_PARTS)
|
||||
$(QT5VIRTUALKEYBOARD_INSTALL_TARGET_EXAMPLES)
|
||||
|
||||
Reference in New Issue
Block a user