diff options
author | André Draszik <andre.draszik@jci.com> | 2019-01-13 11:13:08 +0000 |
---|---|---|
committer | Richard Leitner <richard.leitner@skidata.com> | 2019-12-27 12:05:54 +0100 |
commit | 7a3a8322a747c8803dbfbf3aa4912cf9f8158695 (patch) | |
tree | 0b30eb3e80156f051006977d7782b4c61a4bac9f /recipes-core/openjdk/openjdk-8-cross.inc | |
parent | 7bb0903d1a96d0bee47236f59128db62072a7043 (diff) | |
download | meta-java-7a3a8322a747c8803dbfbf3aa4912cf9f8158695.tar.gz |
remove True option to getVar calls
getVar() has been defaulting to expanding by default for
a long time (2016), thus remove the True option from
getVar() calls with a regex search and replace.
Search & replace made using the following command:
sed -e 's|\(d\.getVar \?\)( \?\([^,()]*\), \?True)|\1(\2)|g' \
-i $(git grep -E 'getVar ?\( ?([^,()]*), ?True\)' \
| cut -d':' -f1 \
| sort -u)
Signed-off-by: André Draszik <andre.draszik@jci.com>
Signed-off-by: Richard Leitner <richard.leitner@skidata.com>
Diffstat (limited to 'recipes-core/openjdk/openjdk-8-cross.inc')
-rw-r--r-- | recipes-core/openjdk/openjdk-8-cross.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/recipes-core/openjdk/openjdk-8-cross.inc b/recipes-core/openjdk/openjdk-8-cross.inc index 7552930..18b99fd 100644 --- a/recipes-core/openjdk/openjdk-8-cross.inc +++ b/recipes-core/openjdk/openjdk-8-cross.inc | |||
@@ -110,14 +110,14 @@ EXTRA_OEMAKE_append = '\ | |||
110 | ' | 110 | ' |
111 | 111 | ||
112 | python remove_debuglink() { | 112 | python remove_debuglink() { |
113 | dvar = d.getVar('PKGD', True) | 113 | dvar = d.getVar('PKGD') |
114 | objcopy = d.getVar("OBJCOPY", True) | 114 | objcopy = d.getVar("OBJCOPY") |
115 | 115 | ||
116 | # Remove the previous debuglink if it has existed, because it has a different file name with that we will add. | 116 | # Remove the previous debuglink if it has existed, because it has a different file name with that we will add. |
117 | if d.getVar('PN', True).find("jre") != -1: | 117 | if d.getVar('PN').find("jre") != -1: |
118 | file = dvar + d.getVar("JRE_HOME", True) + "/lib/" + d.getVar("JDK_ARCH", True) + "/server/libjvm.so" | 118 | file = dvar + d.getVar("JRE_HOME") + "/lib/" + d.getVar("JDK_ARCH") + "/server/libjvm.so" |
119 | else: | 119 | else: |
120 | file = dvar + d.getVar("JDK_HOME", True) + "/jre/lib/" + d.getVar("JDK_ARCH", True) + "/server/libjvm.so" | 120 | file = dvar + d.getVar("JDK_HOME") + "/jre/lib/" + d.getVar("JDK_ARCH") + "/server/libjvm.so" |
121 | 121 | ||
122 | cmd = "'%s' --remove-section .gnu_debuglink '%s'" % (objcopy, file) | 122 | cmd = "'%s' --remove-section .gnu_debuglink '%s'" % (objcopy, file) |
123 | oe.utils.getstatusoutput(cmd) | 123 | oe.utils.getstatusoutput(cmd) |