Skip to contentSkip to conversation

qt4: Update to dunfell

PATCH New Davis, Michael 1 participant 1 message Oct 16, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 qt4: Update to dunfell

This patch removes the deprecated distro_features_check and adds meta-python2 as a dependent layer. Compability is now limited to dunfell.

---
 classes/qt4x11.bbclass                                        | 2 +-
 conf/layer.conf                                               | 3 ++-
 recipes-qt4/images/core-image-lsb-qt4.bb                      | 2 +-
 recipes-qt4/packagegroups/packagegroup-core-qt.bb             | 2 +-
 recipes-qt4/packagegroups/packagegroup-qt-toolchain-target.bb | 2 +-
 recipes-qt4/recipes-python/python-pyqt_4.12.bb                | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)
classes/qt4x11.bbclass +1 -1
index 6f06d34..7f65d81 100644
@@ -4,7 +4,7 @@ DEPENDS_prepend = "${QT4DEPENDS}"
 # depends on qt4-x11
 REQUIRED_DISTRO_FEATURES += "x11"
 
-inherit qmake2 distro_features_check
+inherit qmake2 features_check
 
 QT_BASE_NAME = "qt4"
 QT_DIR_NAME = "qt4"
conf/layer.conf +2 -1
index c8d31bb..ab30e58 100644
@@ -8,4 +8,5 @@ BBFILE_COLLECTIONS += "qt4-layer"
 BBFILE_PATTERN_qt4-layer = "^${LAYERDIR}/"
 BBFILE_PRIORITY_qt4-layer = "6"
 
-LAYERSERIES_COMPAT_qt4-layer = "thud warrior zeus"
+LAYERSERIES_COMPAT_qt4-layer = "dunfell"
+LAYERDEPENDS_qt4-layer = "meta-python2"
recipes-qt4/images/core-image-lsb-qt4.bb +1 -1
index 03d27f8..c5c8f2b 100644
@@ -9,5 +9,5 @@ IMAGE_INSTALL = "\
 
 inherit core-image
 
-inherit distro_features_check
+inherit features_check
 REQUIRED_DISTRO_FEATURES = "x11"
recipes-qt4/packagegroups/packagegroup-core-qt.bb +1 -1
index b7de69e..1989646 100644
@@ -9,7 +9,7 @@ PR = "r4"
 # Qt4 could NOT be built on MIPS64 with 64 bits userspace
 COMPATIBLE_HOST_mips64 = "null"
 
-inherit packagegroup distro_features_check
+inherit packagegroup features_check
 
 # The quicky and fotowall requires x11 in DISTRO_FEATURES
 REQUIRED_DISTRO_FEATURES = "x11"
recipes-qt4/packagegroups/packagegroup-qt-toolchain-target.bb +1 -1
index 772c151..7e6f839 100644
@@ -4,7 +4,7 @@ QTLIBPREFIX = ""
 
 require packagegroup-qt-toolchain-target.inc
 
-inherit distro_features_check
+inherit features_check
 # depends on qt4-x11-free
 REQUIRED_DISTRO_FEATURES = "x11"
 
recipes-qt4/recipes-python/python-pyqt_4.12.bb +1 -1
index bc51d5b..5ff8a61 100644
@@ -18,7 +18,7 @@ S = "${WORKDIR}/PyQt4_gpl_x11-${PV}"
 
 PARALLEL_MAKE = ""
 
-inherit qmake2 pythonnative python-dir distro_features_check
+inherit qmake2 pythonnative python-dir features_check
 # depends on qt4-x11-free
 REQUIRED_DISTRO_FEATURES = "x11"
 
Signature · 11 lines
2.26.2

CONFIDENTIALITY NOTICE:

This e-mail transmission and any documents, files or previous e-mail messages attached to it may contain information that is 
confidential, protected by the attorney/client or other privileges, and may constitute non-public information. It is intended to be
conveyed only to the designated recipient(s) named above. 

Any unauthorized use, reproduction, forwarding, distribution or other dissemination of this transmission is strictly prohibited and 
may be unlawful. If you are not an intended recipient of this e-mail transmission, please notify the sender by return e-mail and permanently
delete any record of this transmission. Your cooperation is appreciated.