summaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk/openjdk-8-cross.inc
diff options
context:
space:
mode:
authorAndré Draszik <andre.draszik@jci.com>2019-01-13 11:13:08 +0000
committerRichard Leitner <richard.leitner@skidata.com>2020-08-17 13:02:40 +0200
commit8f6374ef51eb0f4d2e85fbd6b546b9cee0bb954d (patch)
treeba8f325f8b8a29797950897d39e7074cf69c3902 /recipes-core/openjdk/openjdk-8-cross.inc
parent3d2a7dc0360138e0e77c8251c24feb2486365a59 (diff)
downloadmeta-java-8f6374ef51eb0f4d2e85fbd6b546b9cee0bb954d.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.inc10
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
112python remove_debuglink() { 112python 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)