diff options
| author |   Robert Yang <liezhi.yang@windriver.com> | 2016-09-12 01:32:07 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-14 22:20:03 +0100 |
| commit | 79fe476be233015c1c90e9c3fb4572267b5551d1 (patch) | |
| tree | 8108a57e977a6e21d80bbeb263cdfa991b3dc3c9 /meta/recipes-devtools | |
| parent | 2f1a44d33d9ecceef69d11ef92c5369314cb3bf5 (diff) | |
| download | openembedded-core-contrib-79fe476be233015c1c90e9c3fb4572267b5551d1.tar.gz | |
meta: cleanup d.getVar(var, 1)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-devtools')
| -rw-r--r-- | meta/recipes-devtools/apt/apt-native.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/cmake/cmake.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/vala/vala.inc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/apt/apt-native.inc b/meta/recipes-devtools/apt/apt-native.inc index 59aa04e119..9fa206efe1 100644 --- a/meta/recipes-devtools/apt/apt-native.inc +++ b/meta/recipes-devtools/apt/apt-native.inc @@ -17,7 +17,7 @@ python do_install () { } python do_install_config () { - indir = os.path.dirname(d.getVar('FILE',1)) + indir = os.path.dirname(d.getVar('FILE', True)) infile = open(oe.path.join(indir, 'files', 'apt.conf'), 'r') data = infile.read() infile.close() diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index 1a1896f91a..1f73b3afab 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -9,7 +9,7 @@ LICENSE = "BSD" LIC_FILES_CHKSUM = "file://Copyright.txt;md5=052f86c15bbde68af55c7f7b340ab639 \ file://Source/cmake.h;beginline=1;endline=10;md5=341736dae83c9e344b53eeb1bc7d7bc2" -CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV',1).split('.')[0:2])}" +CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV', True).split('.')[0:2])}" SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://support-oe-qt4-tools-names.patch \ diff --git a/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb b/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb index 804186dfdd..9b65a991d4 100644 --- a/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb +++ b/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb @@ -32,7 +32,7 @@ EXTRA_OECONF += "--disable-gconf --disable-qconf" # Some packages have the version preceeding the .so instead properly # versioned .so.<version>, so we need to reorder and repackage. -SOLIBS = "-${@d.getVar('PV',1)[:-2]}.so" +SOLIBS = "-${@d.getVar('PV', True)[:-2]}.so" FILES_SOLIBSDEV = "${libdir}/libkconfig-parser.so" BBCLASSEXTEND = "native" diff --git a/meta/recipes-devtools/vala/vala.inc b/meta/recipes-devtools/vala/vala.inc index 37aa38f542..34c9db931d 100644 --- a/meta/recipes-devtools/vala/vala.inc +++ b/meta/recipes-devtools/vala/vala.inc @@ -11,7 +11,7 @@ HOMEPAGE = "http://vala-project.org" LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" -SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" +SHRT_VER = "${@d.getVar('PV', True).split('.')[0]}.${@d.getVar('PV', True).split('.')[1]}" SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz" inherit autotools pkgconfig upstream-version-is-even |