diff options
Diffstat (limited to 'meta/recipes-devtools/cmake')
| -rw-r--r-- | meta/recipes-devtools/cmake/cmake.inc | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/cmake/cmake_2.8.5.bb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/meta/recipes-devtools/cmake/cmake.inc b/meta/recipes-devtools/cmake/cmake.inc index ec37a10..8433c53 100644 --- a/meta/recipes-devtools/cmake/cmake.inc +++ b/meta/recipes-devtools/cmake/cmake.inc @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://Copyright.txt;md5=f372516292ff7c33337bf16a74a5f9a8 \ INC_PR = "r1" -CMAKE_MAJOR_VERSION = "${@'.'.join(bb.data.getVar('PV',d,1).split('.')[0:2])}" +CMAKE_MAJOR_VERSION = "${@'.'.join(d.getVar('PV',1).split('.')[0:2])}" SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-${PV}.tar.gz \ file://support-oe-qt4-tools-names.patch" diff --git a/meta/recipes-devtools/cmake/cmake_2.8.5.bb b/meta/recipes-devtools/cmake/cmake_2.8.5.bb index 8e04072..3e2a218 100644 --- a/meta/recipes-devtools/cmake/cmake_2.8.5.bb +++ b/meta/recipes-devtools/cmake/cmake_2.8.5.bb @@ -13,8 +13,8 @@ SRC_URI[sha256sum] = "5e18bff75f01656c64f553412a8905527e1b85efaf3163c6fb81ea5aac # Strip ${prefix} from ${docdir}, set result into docdir_stripped python () { - prefix=bb.data.getVar("prefix", d, 1) - docdir=bb.data.getVar("docdir", d, 1) + prefix=d.getVar("prefix", 1) + docdir=d.getVar("docdir", 1) if not docdir.startswith(prefix): raise bb.build.FuncFailed('docdir must contain prefix as its prefix') @@ -23,7 +23,7 @@ python () { if len(docdir_stripped) > 0 and docdir_stripped[0] == '/': docdir_stripped = docdir_stripped[1:] - bb.data.setVar("docdir_stripped", docdir_stripped, d) + d.setVar("docdir_stripped", docdir_stripped) } EXTRA_OECMAKE=" \ |
