summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOtavio Salvador <otavio@ossystems.com.br>2011-07-11 17:27:19 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-12 15:00:45 +0100
commitecb5359832ffa20668bcc39068c0574a72c473a5 (patch)
treeb1cb380b1fb376de12181472ed3546c1b195c28c
parente8bb8986d0dc09ab8b3c6d5f3e5678aa661bc337 (diff)
downloadpoky-ecb5359832ffa20668bcc39068c0574a72c473a5.tar.gz
poky-ecb5359832ffa20668bcc39068c0574a72c473a5.tar.bz2
poky-ecb5359832ffa20668bcc39068c0574a72c473a5.zip
cmake: update to 2.8.5 release
Acked-by: Tom Rini <tom_rini@mentor.com> (From OE-Core rev: 334cd15994eeb47636434a6e802f50b24e5182f3) Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/cmake/cmake-native_2.8.5.bb11
-rw-r--r--meta/recipes-devtools/cmake/cmake_2.8.5.bb11
2 files changed, 6 insertions, 16 deletions
diff --git a/meta/recipes-devtools/cmake/cmake-native_2.8.5.bb b/meta/recipes-devtools/cmake/cmake-native_2.8.5.bb
index c8da1cb2c7..3fe0c2e192 100644
--- a/meta/recipes-devtools/cmake/cmake-native_2.8.5.bb
+++ b/meta/recipes-devtools/cmake/cmake-native_2.8.5.bb
@@ -1,12 +1,7 @@
require cmake.inc
inherit native
-# This was need to keep version consistent - will be removed once 2.8.5 is released
-SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-2.8.5-rc3.tar.gz \
- file://support-oe-qt4-tools-names.patch"
-S = "${WORKDIR}/cmake-2.8.5-rc3"
+PR = "${INC_PR}.1"
-PR = "${INC_PR}.0"
-
-SRC_URI[md5sum] = "2d8018f8fa4c499e2c5b288d71660cba"
-SRC_URI[sha256sum] = "2987befc451f6404ea93bb99f00a38b80724fb655f121fed3bb0a08b65a771c8"
+SRC_URI[md5sum] = "3c5d32cec0f4c2dc45f4c2e84f4a20c5"
+SRC_URI[sha256sum] = "5e18bff75f01656c64f553412a8905527e1b85efaf3163c6fb81ea5aaced0b91"
diff --git a/meta/recipes-devtools/cmake/cmake_2.8.5.bb b/meta/recipes-devtools/cmake/cmake_2.8.5.bb
index 2a9a82c53a..64e7574677 100644
--- a/meta/recipes-devtools/cmake/cmake_2.8.5.bb
+++ b/meta/recipes-devtools/cmake/cmake_2.8.5.bb
@@ -4,17 +4,12 @@ inherit cmake
DEPENDS += "curl expat zlib libarchive ncurses"
-PR = "${INC_PR}.0"
-
-# This was need to keep version consistent - will be removed once 2.8.5 is released
-SRC_URI = "http://www.cmake.org/files/v${CMAKE_MAJOR_VERSION}/cmake-2.8.5-rc3.tar.gz \
- file://support-oe-qt4-tools-names.patch"
-S = "${WORKDIR}/cmake-2.8.5-rc3"
+PR = "${INC_PR}.1"
SRC_URI += "file://dont-run-cross-binaries.patch"
-SRC_URI[md5sum] = "2d8018f8fa4c499e2c5b288d71660cba"
-SRC_URI[sha256sum] = "2987befc451f6404ea93bb99f00a38b80724fb655f121fed3bb0a08b65a771c8"
+SRC_URI[md5sum] = "3c5d32cec0f4c2dc45f4c2e84f4a20c5"
+SRC_URI[sha256sum] = "5e18bff75f01656c64f553412a8905527e1b85efaf3163c6fb81ea5aaced0b91"
# Strip ${prefix} from ${docdir}, set result into docdir_stripped
python () {