From 7a3a8322a747c8803dbfbf3aa4912cf9f8158695 Mon Sep 17 00:00:00 2001 From: André Draszik Date: Sun, 13 Jan 2019 11:13:08 +0000 Subject: remove True option to getVar calls MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Richard Leitner --- recipes-core/openjdk/openjdk-8-common.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'recipes-core/openjdk/openjdk-8-common.inc') 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} \ -- cgit v1.2.3-54-g00ecf