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:22:07 +0100 |
commit | b8e2bab119be251e3a3395dc55cf25b32504272c (patch) | |
tree | 112b9935eee0cf29390d04aec0b6b9938f15be5b /meta/recipes-devtools | |
parent | 32b82672033013ad89b931aa1235415db699415e (diff) | |
download | poky-b8e2bab119be251e3a3395dc55cf25b32504272c.tar.gz |
meta: cleanup d.getVar(var, 1)
(From OE-Core rev: 79fe476be233015c1c90e9c3fb4572267b5551d1)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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 () { | |||
17 | } | 17 | } |
18 | 18 | ||
19 | python do_install_config () { | 19 | python do_install_config () { |
20 | indir = os.path.dirname(d.getVar('FILE',1)) | 20 | indir = os.path.dirname(d.getVar('FILE', True)) |
21 | infile = open(oe.path.join(indir, 'files', 'apt.conf'), 'r') | 21 | infile = open(oe.path.join(indir, 'files', 'apt.conf'), 'r') |
22 | data = infile.read() | 22 | data = infile.read() |
23 | infile.close() | 23 | 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" | |||
9 | LIC_FILES_CHKSUM = "file://Copyright.txt;md5=052f86c15bbde68af55c7f7b340ab639 \ | 9 | LIC_FILES_CHKSUM = "file://Copyright.txt;md5=052f86c15bbde68af55c7f7b340ab639 \ |
10 | file://Source/cmake.h;beginline=1;endline=10;md5=341736dae83c9e344b53eeb1bc7d7bc2" | 10 | file://Source/cmake.h;beginline=1;endline=10;md5=341736dae83c9e344b53eeb1bc7d7bc2" |
11 | 11 | ||
12 | CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV',1).split('.')[0:2])}" | 12 | CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV', True).split('.')[0:2])}" |
13 | 13 | ||
14 | SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ | 14 | SRC_URI = "https://cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ |
15 | file://support-oe-qt4-tools-names.patch \ | 15 | 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" | |||
32 | 32 | ||
33 | # Some packages have the version preceeding the .so instead properly | 33 | # Some packages have the version preceeding the .so instead properly |
34 | # versioned .so.<version>, so we need to reorder and repackage. | 34 | # versioned .so.<version>, so we need to reorder and repackage. |
35 | SOLIBS = "-${@d.getVar('PV',1)[:-2]}.so" | 35 | SOLIBS = "-${@d.getVar('PV', True)[:-2]}.so" |
36 | FILES_SOLIBSDEV = "${libdir}/libkconfig-parser.so" | 36 | FILES_SOLIBSDEV = "${libdir}/libkconfig-parser.so" |
37 | 37 | ||
38 | BBCLASSEXTEND = "native" | 38 | 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" | |||
11 | LICENSE = "LGPLv2.1" | 11 | LICENSE = "LGPLv2.1" |
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" |
13 | 13 | ||
14 | SHRT_VER = "${@d.getVar('PV',1).split('.')[0]}.${@d.getVar('PV',1).split('.')[1]}" | 14 | SHRT_VER = "${@d.getVar('PV', True).split('.')[0]}.${@d.getVar('PV', True).split('.')[1]}" |
15 | 15 | ||
16 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz" | 16 | SRC_URI = "http://ftp.gnome.org/pub/GNOME/sources/${BPN}/${SHRT_VER}/${BP}.tar.xz" |
17 | inherit autotools pkgconfig upstream-version-is-even | 17 | inherit autotools pkgconfig upstream-version-is-even |