summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-29 15:21:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-07-30 00:11:51 +0100
commit2f2875f73ceec4839f1fdbbd65a216a0cc840b76 (patch)
treea62e24e1de0d60c24d0125e9675af83257e2d74d
parenta4b9bf3a1e48d5a65896807597522627c6ac5e1c (diff)
downloadpoky-2f2875f73ceec4839f1fdbbd65a216a0cc840b76.tar.gz
autotools/base/icecc: Remove prepend from function names
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. (From OE-Core rev: 9d002acae720b0a8e96a6734424a142b86880461) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/autotools.bbclass4
-rw-r--r--meta/classes/base.bbclass6
-rw-r--r--meta/classes/icecc.bbclass4
3 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass
index 9dc8ebdaa7..77d90a3df5 100644
--- a/meta/classes/autotools.bbclass
+++ b/meta/classes/autotools.bbclass
@@ -1,4 +1,4 @@
1def autotools_dep_prepend(d): 1def get_autotools_dep(d):
2 if d.getVar('INHIBIT_AUTOTOOLS_DEPS'): 2 if d.getVar('INHIBIT_AUTOTOOLS_DEPS'):
3 return '' 3 return ''
4 4
@@ -19,7 +19,7 @@ def autotools_dep_prepend(d):
19 19
20 return deps 20 return deps
21 21
22DEPENDS_prepend = "${@autotools_dep_prepend(d)} " 22DEPENDS_prepend = "${@get_autotools_dep(d)} "
23 23
24inherit siteinfo 24inherit siteinfo
25 25
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 42fb84c4d5..ff0579c7d6 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -66,7 +66,7 @@ oe_runmake() {
66} 66}
67 67
68 68
69def base_dep_prepend(d): 69def get_base_dep(d):
70 if d.getVar('INHIBIT_DEFAULT_DEPS', False): 70 if d.getVar('INHIBIT_DEFAULT_DEPS', False):
71 return "" 71 return ""
72 return "${BASE_DEFAULT_DEPS}" 72 return "${BASE_DEFAULT_DEPS}"
@@ -74,8 +74,8 @@ def base_dep_prepend(d):
74BASE_DEFAULT_DEPS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}compilerlibs virtual/libc" 74BASE_DEFAULT_DEPS = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}compilerlibs virtual/libc"
75 75
76BASEDEPENDS = "" 76BASEDEPENDS = ""
77BASEDEPENDS_class-target = "${@base_dep_prepend(d)}" 77BASEDEPENDS_class-target = "${@get_base_dep(d)}"
78BASEDEPENDS_class-nativesdk = "${@base_dep_prepend(d)}" 78BASEDEPENDS_class-nativesdk = "${@get_base_dep(d)}"
79 79
80DEPENDS_prepend="${BASEDEPENDS} " 80DEPENDS_prepend="${BASEDEPENDS} "
81 81
diff --git a/meta/classes/icecc.bbclass b/meta/classes/icecc.bbclass
index 80943fcf02..089d52732f 100644
--- a/meta/classes/icecc.bbclass
+++ b/meta/classes/icecc.bbclass
@@ -97,7 +97,7 @@ ICECC_SYSTEM_CLASS_BL += "\
97 image \ 97 image \
98 " 98 "
99 99
100def icecc_dep_prepend(d): 100def get_icecc_dep(d):
101 # INHIBIT_DEFAULT_DEPS doesn't apply to the patch command. Whether or not 101 # INHIBIT_DEFAULT_DEPS doesn't apply to the patch command. Whether or not
102 # we need that built is the responsibility of the patch function / class, not 102 # we need that built is the responsibility of the patch function / class, not
103 # the application. 103 # the application.
@@ -105,7 +105,7 @@ def icecc_dep_prepend(d):
105 return "icecc-create-env-native" 105 return "icecc-create-env-native"
106 return "" 106 return ""
107 107
108DEPENDS_prepend = "${@icecc_dep_prepend(d)} " 108DEPENDS_prepend = "${@get_icecc_dep(d)} "
109 109
110get_cross_kernel_cc[vardepsexclude] += "KERNEL_CC" 110get_cross_kernel_cc[vardepsexclude] += "KERNEL_CC"
111def get_cross_kernel_cc(bb,d): 111def get_cross_kernel_cc(bb,d):