Using prepend as part of a function name is a poor choice. Whilst we're about to make the syntax explict, improve the names anyway making the conversion easier and the intent clear that this isn't an override.
Signed-off-by: Richard Purdie <[email protected]> --- meta/classes/autotools.bbclass | 4 ++-- meta/classes/base.bbclass | 6 +++--- meta/classes/icecc.bbclass | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 9dc8ebdaa79..77d90a3df53 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -1,4 +1,4 @@ -def autotools_dep_prepend(d): +def get_autotools_dep(d): if d.getVar('INHIBIT_AUTOTOOLS_DEPS'): return '' @@ -19,7 +19,7 @@ def autotools_dep_prepend(d): return deps -DEPENDS_prepend = "${@autotools_dep_prepend(d)} " +DEPENDS_prepend = "${@get_autotools_dep(d)} " inherit siteinfo diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 42fb84c4d50..ff0579c7d69 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -66,7 +66,7 @@ oe_runmake() { } -def base_dep_prepend(d): +def get_base_dep(d): if d.getVar('INHIBIT_DEFAULT_DEPS', False): return "" return "${BASE_DEFAULT_DEPS}" @@ -74,8 +74,8 @@ def base_dep_prepend(d): BASE_DEFAULT_DEPS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}compilerlibs virtual/libc" BASEDEPENDS = "" -BASEDEPENDS_class-target = "${@base_dep_prepend(d)}" -BASEDEPENDS_class-nativesdk = "${@base_dep_prepend(d)}" +BASEDEPENDS_class-target = "${@get_base_dep(d)}" +BASEDEPENDS_class-nativesdk = "${@get_base_dep(d)}" DEPENDS_prepend="${BASEDEPENDS} " diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass index 80943fcf026..089d52732f8 100644 --- a/meta/classes/icecc.bbclass +++ b/meta/classes/icecc.bbclass @@ -97,7 +97,7 @@ ICECC_SYSTEM_CLASS_BL += "\ image \ " -def icecc_dep_prepend(d): +def get_icecc_dep(d): # INHIBIT_DEFAULT_DEPS doesn't apply to the patch command. Whether or not # we need that built is the responsibility of the patch function / class, not # the application. @@ -105,7 +105,7 @@ def icecc_dep_prepend(d): return "icecc-create-env-native" return "" -DEPENDS_prepend = "${@icecc_dep_prepend(d)} " +DEPENDS_prepend = "${@get_icecc_dep(d)} " get_cross_kernel_cc[vardepsexclude] += "KERNEL_CC" def get_cross_kernel_cc(bb,d): -- 2.30.2
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#154254): https://lists.openembedded.org/g/openembedded-core/message/154254 Mute This Topic: https://lists.openembedded.org/mt/84538276/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
