From ebef44963866d3231ccfe79d66d21c96ca0b4113 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Wed, 25 Jan 2017 15:31:59 -0800 Subject: remove some more True options to getVar calls getVar() now defaults to expanding by default, thus remove the True option from getVar() calls. Fix a small number of cases not addressed by the original patch: http://git.openembedded.org/meta-openembedded/commit/?id=efd3696e70a6603f1a45faa4a172433514f0a487 Signed-off-by: Andre McCurdy Signed-off-by: Martin Jansa --- meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb | 2 +- meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb | 2 +- meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb | 2 +- meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'meta-gnome') diff --git a/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb b/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb index ec17c75e37..07b4831cee 100644 --- a/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb +++ b/meta-gnome/recipes-gnome/abiword/abiword_3.0.1.bb @@ -22,7 +22,7 @@ SRC_URI[md5sum] = "f3f8052e7b4979a43b75775a381e6cb8" SRC_URI[sha256sum] = "e094f6fbf0afc5c5538b4894888e7c346f8ee8f49c9d24821dd696d0734865c6" #want 3.x from 3.x.y for the installation directory -SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" +SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" inherit autotools-brokensep pkgconfig diff --git a/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb b/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb index d391bba134..7e684c8407 100644 --- a/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb +++ b/meta-gnome/recipes-gnome/gcalctool/gcalctool_5.32.0.bb @@ -5,7 +5,7 @@ DEPENDS = "gtk+ gnome-doc-utils" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" +SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "http://download.gnome.org/sources/${BPN}/${SHRT_VER}/${BP}.tar.gz" SRC_URI[md5sum] = "48db927c6e7ee1d5395f953a8c184c98" diff --git a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb index dfc1775a30..01da347bde 100644 --- a/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb +++ b/meta-gnome/recipes-gnome/gnome-menus/gnome-menus3_3.10.1.bb @@ -10,7 +10,7 @@ inherit gnomebase pkgconfig python-dir pythonnative gobject-introspection BPN = "gnome-menus" -SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" +SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${SHRT_VER}/${BPN}-${PV}.tar.xz" SRC_URI[md5sum] = "6db025e79e2b69f39fc7aa0753f43081" diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb index 1afcd49158..f9af2ee644 100644 --- a/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb +++ b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb @@ -3,7 +3,7 @@ SECTION = "x11/gnome/libs" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" SRC_NAME = "ORBit2" -SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" +SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" SRC_URI = " \ ${GNOME_MIRROR}/${SRC_NAME}/${SHRT_VER}/${SRC_NAME}-${PV}.tar.bz2 \ file://configure-lossage.patch \ -- cgit 1.2.3-korg