aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-core/openjdk
diff options
context:
space:
mode:
authorAndré Draszik <andre.draszik@jci.com>2019-01-13 11:13:08 +0000
committerRichard Leitner <richard.leitner@skidata.com>2019-12-27 12:05:54 +0100
commit7a3a8322a747c8803dbfbf3aa4912cf9f8158695 (patch)
tree0b30eb3e80156f051006977d7782b4c61a4bac9f /recipes-core/openjdk
parent7bb0903d1a96d0bee47236f59128db62072a7043 (diff)
downloadmeta-java-7a3a8322a747c8803dbfbf3aa4912cf9f8158695.tar.gz
meta-java-7a3a8322a747c8803dbfbf3aa4912cf9f8158695.tar.bz2
meta-java-7a3a8322a747c8803dbfbf3aa4912cf9f8158695.zip
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')
-rw-r--r--recipes-core/openjdk/openjdk-7-common.inc2
-rw-r--r--recipes-core/openjdk/openjdk-8-common.inc4
-rw-r--r--recipes-core/openjdk/openjdk-8-cross.inc10
3 files changed, 8 insertions, 8 deletions
diff --git a/recipes-core/openjdk/openjdk-7-common.inc b/recipes-core/openjdk/openjdk-7-common.inc
index 9d2dd8f..c87266d 100644
--- a/recipes-core/openjdk/openjdk-7-common.inc
+++ b/recipes-core/openjdk/openjdk-7-common.inc
@@ -93,7 +93,7 @@ export ALT_CUPS_HEADERS_PATH = "${STAGING_INCDIR}"
export ALT_FREETYPE_HEADERS_PATH = "${STAGING_INCDIR}/freetype2"
export ALT_FREETYPE_LIB_PATH = "${STAGING_LIBDIR}"
export CACAO_CONFIGURE_ARGS = " \
- ${@['','--enable-softfloat'][d.getVar('TARGET_FPU', True) == 'soft']}"
+ ${@['','--enable-softfloat'][d.getVar('TARGET_FPU') == 'soft']}"
JAVA_HOME[unexport] = "1"
diff --git a/recipes-core/openjdk/openjdk-8-common.inc b/recipes-core/openjdk/openjdk-8-common.inc
index 4d8f935..1fbe7fe 100644
--- a/recipes-core/openjdk/openjdk-8-common.inc
+++ b/recipes-core/openjdk/openjdk-8-common.inc
@@ -163,8 +163,8 @@ export DEBUG_BINARIES = "true"
ALTERNATIVE_PRIORITY = "50"
-OPENJDK_UPDATE_VERSION = "${@d.getVar('PV', True).split('b')[0]}"
-OPENJDK_BUILD_NUMBER = "b${@d.getVar('PV', True).split('b')[1]}"
+OPENJDK_UPDATE_VERSION = "${@d.getVar('PV').split('b')[0]}"
+OPENJDK_BUILD_NUMBER = "b${@d.getVar('PV').split('b')[1]}"
EXTRA_OECONF_append = "\
--with-build-number=${OPENJDK_BUILD_NUMBER} \
--with-update-version=${OPENJDK_UPDATE_VERSION} \
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 = '\
'
python remove_debuglink() {
- dvar = d.getVar('PKGD', True)
- objcopy = d.getVar("OBJCOPY", True)
+ dvar = d.getVar('PKGD')
+ objcopy = d.getVar("OBJCOPY")
# Remove the previous debuglink if it has existed, because it has a different file name with that we will add.
- if d.getVar('PN', True).find("jre") != -1:
- file = dvar + d.getVar("JRE_HOME", True) + "/lib/" + d.getVar("JDK_ARCH", True) + "/server/libjvm.so"
+ if d.getVar('PN').find("jre") != -1:
+ file = dvar + d.getVar("JRE_HOME") + "/lib/" + d.getVar("JDK_ARCH") + "/server/libjvm.so"
else:
- file = dvar + d.getVar("JDK_HOME", True) + "/jre/lib/" + d.getVar("JDK_ARCH", True) + "/server/libjvm.so"
+ file = dvar + d.getVar("JDK_HOME") + "/jre/lib/" + d.getVar("JDK_ARCH") + "/server/libjvm.so"
cmd = "'%s' --remove-section .gnu_debuglink '%s'" % (objcopy, file)
oe.utils.getstatusoutput(cmd)