| Submitter | Otavio Salvador |
|---|---|
| Date | July 11, 2011, 5:27 p.m. |
| Message ID | <20c3ca693fdd81de50e817ff64ada90a4bf71ade.1310405202.git.otavio@ossystems.com.br> |
| Download | mbox | patch |
| Permalink | /patch/7331/ |
| State | New, archived |
| Headers | show |
Comments
On 07/11/2011 10:27 AM, Otavio Salvador wrote: > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> > --- > meta/recipes-devtools/cmake/cmake-native_2.8.5.bb | 11 +++-------- > meta/recipes-devtools/cmake/cmake_2.8.5.bb | 11 +++-------- > 2 files changed, 6 insertions(+), 16 deletions(-) Since this also fixed a little license problem (older versions shipped some unused Windows build fragments that were marked as proprietary) we've noticed: Acked-by: Tom Rini <tom_rini@mentor.com>
On Mon, 2011-07-11 at 10:50 -0700, Tom Rini wrote: > On 07/11/2011 10:27 AM, Otavio Salvador wrote: > > Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> > > --- > > meta/recipes-devtools/cmake/cmake-native_2.8.5.bb | 11 +++-------- > > meta/recipes-devtools/cmake/cmake_2.8.5.bb | 11 +++-------- > > 2 files changed, 6 insertions(+), 16 deletions(-) > > Since this also fixed a little license problem (older versions shipped > some unused Windows build fragments that were marked as proprietary) > we've noticed: > > Acked-by: Tom Rini <tom_rini@mentor.com> Merged to master, thanks. Richard
Patch
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 c8da1cb..3fe0c2e 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 2a9a82c..64e7574 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 () {
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- meta/recipes-devtools/cmake/cmake-native_2.8.5.bb | 11 +++-------- meta/recipes-devtools/cmake/cmake_2.8.5.bb | 11 +++-------- 2 files changed, 6 insertions(+), 16 deletions(-)