Change cmake macro

Change-Id: Ib4c43059489e2e3e216459ac4abe81d96c0253c1

diff --git a/proto-meta-Tizen_generic/rpm_tizen_macro/etc/macros.cmake b/proto-meta-Tizen_generic/rpm_tizen_macro/etc/macros.cmake
index d5d616c..532c009 100644 (file)
--- a/proto-meta-Tizen_generic/rpm_tizen_macro/etc/macros.cmake
+++ b/proto-meta-Tizen_generic/rpm_tizen_macro/etc/macros.cmake
@@ -21,6 +21,9 @@
         %{?_cmake_lib_suffix64} \\\
 %endif \
         %{?_cmake_skip_rpath} \\\
-        -DBUILD_SHARED_LIBS:BOOL=ON \\\
-        -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake 
-        
+        -DBUILD_SHARED_LIBS:BOOL=ON
+
+#        tmp remove toolchain
+#        \\\
+#        -DCMAKE_TOOLCHAIN_FILE=${WORKDIR}/toolchain.cmake
+

diff --git a/tools/spec2yocto.py b/tools/spec2yocto.py
index b7f394f..d5ce547 100755 (executable)
--- a/tools/spec2yocto.py
+++ b/tools/spec2yocto.py
@@ -1675,6 +1675,7 @@ class MetaSpec:
     def __create_install( self ,file_d):
         code=self.__spec_parser.get_install_section()
         code=code.replace("\n","\n ")
+        code=code.replace("\n EOF","\nEOF")
         file_d.write( "do_install() {\n" )
         file_d.write( " echo export RPM_BUILD_ROOT=${D}\n" )
         file_d.write( " %s\n" % code )