[oe-commits] org.oe.dev merge of '218274d3d618ee5de9be9d8d43abfc279f552139'

[oe commit]

merge of '218274d3d618ee5de9be9d8d43abfc279f552139'
     and '8eb2a350085e36627bc9a432834ecae61c94ac82'

Author: oe at openembedded.org
Branch: org.openembedded.dev
Revision: 6acddf364e7286f03e9e90e9d79ea91cfff7b282
ViewMTN: http://monotone.openembedded.org/revision/info/6acddf364e7286f03e9e90e9d79ea91cfff7b282
Files:
1
packages/cmake/cmake-native_2.6.0.bb
classes/cmake.bbclass
packages/freesmartphone/frameworkd_git.bb
Diffs:

#
# mt diff -r218274d3d618ee5de9be9d8d43abfc279f552139 -r6acddf364e7286f03e9e90e9d79ea91cfff7b282
#
#
#
# add_file "packages/cmake/cmake-native_2.6.0.bb"
#  content [4f64626d54e0045ba29dc10ad3c41a629b250aee]
# 
# patch "classes/cmake.bbclass"
#  from [1fbe2c1cc0ed7f80d95cd2757472581efd8f9825]
#    to [fd1b88d5d95f59fad2e97aac4309d906b1c5c471]
#
============================================================
--- packages/cmake/cmake-native_2.6.0.bb	4f64626d54e0045ba29dc10ad3c41a629b250aee
+++ packages/cmake/cmake-native_2.6.0.bb	4f64626d54e0045ba29dc10ad3c41a629b250aee
@@ -0,0 +1,11 @@
+inherit native
+require cmake.inc
+
+do_stage() {
+    oe_runmake install
+    autotools_stage_all
+}
+
+do_install() {
+	:
+}
============================================================
--- classes/cmake.bbclass	1fbe2c1cc0ed7f80d95cd2757472581efd8f9825
+++ classes/cmake.bbclass	fd1b88d5d95f59fad2e97aac4309d906b1c5c471
@@ -4,7 +4,8 @@ cmake_do_configure() {
 inherit autotools
 
 cmake_do_configure() {
-    cmake . -DCMAKE_INSTALL_PREFIX:PATH=${prefix}
+     cmake . -DCMAKE_INSTALL_PREFIX:PATH=${prefix} -Wno-dev \
+     -DCMAKE_FIND_ROOT_PATH=${STAGING_DIR_HOST}
 }
 
 EXPORT_FUNCTIONS do_configure


#
# mt diff -r8eb2a350085e36627bc9a432834ecae61c94ac82 -r6acddf364e7286f03e9e90e9d79ea91cfff7b282
#
#
#
# patch "packages/freesmartphone/frameworkd_git.bb"
#  from [674c4ebb890b3779108c1a9fe1cd2caee70c1201]
#    to [9ee16ebd42adf0a37443b1d2dc9fc0638368597e]
#
============================================================
--- packages/freesmartphone/frameworkd_git.bb	674c4ebb890b3779108c1a9fe1cd2caee70c1201
+++ packages/freesmartphone/frameworkd_git.bb	9ee16ebd42adf0a37443b1d2dc9fc0638368597e
@@ -5,7 +5,7 @@ PV = "0.8.0+gitr${SRCREV}"
 DEPENDS = "python-cython-native python-pyrex-native"
 LICENSE = "GPL"
 PV = "0.8.0+gitr${SRCREV}"
-PR = "r1"
+PR = "r2"
 
 inherit distutils update-rc.d
 
@@ -30,6 +30,7 @@ RDEPENDS_${PN} += "\
   python-pygobject \
   python-pyrtc \
   python-pyserial \
+  python-shell \
   python-syslog \
 "