diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2021-07-29 17:05:32 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2021-08-03 13:38:16 +0200 |
commit | a6bee8ea4cb91d0e07d8be272ddc0e56c86e4acf (patch) | |
tree | 127f88ca5f4c1f1a0fb80dca719ef817b700ed5b /classes | |
parent | 10f3673fd4b6c6e1e61c23478802f83652475a5f (diff) |
Convert to new override syntax
This is the result of automated script (0.9.0) conversion:
oe-core/scripts/contrib/convert-overrides.py .
converting the metadata to use ":" as the override character instead of "_".
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'classes')
-rw-r--r-- | classes/cmake_qt5.bbclass | 8 | ||||
-rw-r--r-- | classes/populate_sdk_qt5.bbclass | 4 | ||||
-rw-r--r-- | classes/populate_sdk_qt5_base.bbclass | 2 | ||||
-rw-r--r-- | classes/qmake5.bbclass | 4 | ||||
-rw-r--r-- | classes/qmake5_base.bbclass | 2 | ||||
-rw-r--r-- | classes/qmake5_paths.bbclass | 6 |
6 files changed, 13 insertions, 13 deletions
diff --git a/classes/cmake_qt5.bbclass b/classes/cmake_qt5.bbclass index e380a0ef..6accb819 100644 --- a/classes/cmake_qt5.bbclass +++ b/classes/cmake_qt5.bbclass @@ -1,12 +1,12 @@ inherit cmake inherit qmake5_paths -DEPENDS_prepend = "${QTBASEDEPENDS} " +DEPENDS:prepend = "${QTBASEDEPENDS} " QTBASEDEPENDS = "qtbase qtbase-native" -QTBASEDEPENDS_class-native = "qtbase-native" -QTBASEDEPENDS_class-nativesdk = "nativesdk-qtbase qtbase-native" +QTBASEDEPENDS:class-native = "qtbase-native" +QTBASEDEPENDS:class-nativesdk = "nativesdk-qtbase qtbase-native" -EXTRA_OECMAKE_prepend = " \ +EXTRA_OECMAKE:prepend = " \ -DOE_QMAKE_PATH_PREFIX=${OE_QMAKE_PATH_PREFIX} \ -DOE_QMAKE_PATH_HEADERS=${OE_QMAKE_PATH_HEADERS} \ -DOE_QMAKE_PATH_LIBS=${OE_QMAKE_PATH_LIBS} \ diff --git a/classes/populate_sdk_qt5.bbclass b/classes/populate_sdk_qt5.bbclass index a10341dc..e0b287eb 100644 --- a/classes/populate_sdk_qt5.bbclass +++ b/classes/populate_sdk_qt5.bbclass @@ -2,7 +2,7 @@ inherit populate_sdk_qt5_base -TOOLCHAIN_HOST_TASK_append = " nativesdk-packagegroup-qt5-toolchain-host" -TOOLCHAIN_TARGET_TASK_append = " packagegroup-qt5-toolchain-target" +TOOLCHAIN_HOST_TASK:append = " nativesdk-packagegroup-qt5-toolchain-host" +TOOLCHAIN_TARGET_TASK:append = " packagegroup-qt5-toolchain-target" FEATURE_PACKAGES_qtcreator-debug = "packagegroup-qt5-qtcreator-debug" diff --git a/classes/populate_sdk_qt5_base.bbclass b/classes/populate_sdk_qt5_base.bbclass index c26fee44..56341cd1 100644 --- a/classes/populate_sdk_qt5_base.bbclass +++ b/classes/populate_sdk_qt5_base.bbclass @@ -1,7 +1,7 @@ # This allow reuse of Qt paths inherit qmake5_paths -create_sdk_files_prepend () { +create_sdk_files:prepend () { # Generate a qt.conf file to be deployed with the SDK qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf touch $qtconf diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass index 1a960e8f..befb5bfd 100644 --- a/classes/qmake5.bbclass +++ b/classes/qmake5.bbclass @@ -4,7 +4,7 @@ inherit qmake5_base QT5TOOLSDEPENDS ?= "qtbase-native" -DEPENDS_prepend = "${QT5TOOLSDEPENDS} " +DEPENDS:prepend = "${QT5TOOLSDEPENDS} " do_configure() { qmake5_base_do_configure @@ -14,6 +14,6 @@ do_install() { qmake5_base_do_install } -do_install_class-native() { +do_install:class-native() { qmake5_base_native_do_install } diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index 6266c55c..459d2dae 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass @@ -1,5 +1,5 @@ # hardcode linux, because that's what 0001-Add-linux-oe-g-platform.patch adds -XPLATFORM_toolchain-clang = "linux-oe-clang" +XPLATFORM:toolchain-clang = "linux-oe-clang" XPLATFORM ?= "linux-oe-g++" OE_QMAKE_PLATFORM_NATIVE = "${XPLATFORM}" diff --git a/classes/qmake5_paths.bbclass b/classes/qmake5_paths.bbclass index ca7e4fc2..abed93b7 100644 --- a/classes/qmake5_paths.bbclass +++ b/classes/qmake5_paths.bbclass @@ -9,8 +9,8 @@ QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}${QT_DIR_NAME}" QMAKE_MKSPEC_PATH_TARGET = "${STAGING_LIBDIR}${QT_DIR_NAME}" QMAKE_MKSPEC_PATH = "${QMAKE_MKSPEC_PATH_TARGET}" -QMAKE_MKSPEC_PATH_class-native = "${QMAKE_MKSPEC_PATH_NATIVE}" -QMAKE_MKSPEC_PATH_class-nativesdk = "${QMAKE_MKSPEC_PATH_NATIVE}" +QMAKE_MKSPEC_PATH:class-native = "${QMAKE_MKSPEC_PATH_NATIVE}" +QMAKE_MKSPEC_PATH:class-nativesdk = "${QMAKE_MKSPEC_PATH_NATIVE}" OE_QMAKE_PATH_PREFIX = "${prefix}" OE_QMAKE_PATH_HEADERS = "${includedir}${QT_DIR_NAME}" @@ -27,7 +27,7 @@ OE_QMAKE_PATH_SETTINGS = "${sysconfdir}" OE_QMAKE_PATH_EXAMPLES = "${datadir}/examples" OE_QMAKE_PATH_TESTS = "${datadir}/tests" OE_QMAKE_PATH_HOST_PREFIX = "" -OE_QMAKE_PATH_HOST_PREFIX_class-target = "${STAGING_DIR_NATIVE}" +OE_QMAKE_PATH_HOST_PREFIX:class-target = "${STAGING_DIR_NATIVE}" OE_QMAKE_PATH_HOST_BINS = "${bindir}${QT_DIR_NAME}" OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}" OE_QMAKE_PATH_HOST_LIBS = "${STAGING_LIBDIR}" |