use replace native build

Change-Id: Id7302e06e1763793fcec5b6b8e1eaeff0dd8fa30

diff --git a/proto-meta-Tizen_generic/rpm_tizen_macro/lib/macros b/proto-meta-Tizen_generic/rpm_tizen_macro/lib/macros
index 3882bd7..311e1cd 100644 (file)
--- a/proto-meta-Tizen_generic/rpm_tizen_macro/lib/macros
+++ b/proto-meta-Tizen_generic/rpm_tizen_macro/lib/macros
@@ -80,7 +80,7 @@
 #
 %__ar                  \${HOST_SYS}-ar
 %__as                  as
-%__cc                  \${HOST_SYS}-gcc
+%__cc                  \${CC}
 %__cpp                 \${HOST_SYS}-gcc -E
 %__cxx                 \${HOST_SYS}-g++
 %__ld                  ld

diff --git a/proto-meta-Tizen_generic/specfile-initial/dlog/packaging/dlog.spec b/proto-meta-Tizen_generic/specfile-initial/dlog/packaging/dlog.spec
index 8b31117..500e092 100755 (executable)
--- a/proto-meta-Tizen_generic/specfile-initial/dlog/packaging/dlog.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/dlog/packaging/dlog.spec
@@ -3,7 +3,7 @@
 Name:       dlog
 Summary:    Logging service
 Version:    0.4.1
-Release:    15
+Release:    0
 Group:      System/Libraries
 License:    Apache-2.0
 Source0:    %{name}-%{version}.tar.gz
@@ -14,6 +14,7 @@ Source103:  dlog.manifest
 %if %{with dlog_to_systemd_journal}
 BuildRequires: pkgconfig(libsystemd-journal)
 %endif
+BuildRequires: pkgconfig(libtzplatform-config)
 
 %description
 dlog API library
@@ -59,20 +60,18 @@ make %{?jobs:-j%jobs}
 
 %install
 %make_install
-mkdir -p %{buildroot}/opt/etc/dump.d/default.d
-cp %{_builddir}/%{name}-%{version}/dlog_dump.sh %{buildroot}/opt/etc/dump.d/default.d/dlog_dump.sh
+mkdir -p %{buildroot}%{TZ_SYS_ETC}/dump.d/default.d
+cp dlog_dump.sh %{buildroot}%{TZ_SYS_ETC}/dump.d/default.d/dlog_dump.sh
 mkdir -p %{buildroot}/usr/bin/
-cp %{_builddir}/%{name}-%{version}/dlogctrl %{buildroot}/usr/bin/dlogctrl
+cp dlogctrl %{buildroot}/usr/bin/dlogctrl
 
-mkdir -p %{buildroot}%{_unitdir}/basic.target.wants
 mkdir -p %{buildroot}%{_unitdir}/multi-user.target.wants
 
 install -m 0644 %SOURCE101 %{buildroot}%{_unitdir}
 install -m 0644 %SOURCE102 %{buildroot}%{_unitdir}
 
-ln -s ../dlog-main.service %{buildroot}%{_unitdir}/multi-user.target.wants/dlog-main.service
-ln -s ../dlog-radio.service %{buildroot}%{_unitdir}/multi-user.target.wants/dlog-radio.service
-
+%install_service multi-user.target.wants dlog-main.service
+%install_service multi-user.target.wants dlog-radio.service
 
 %preun -n dlogutil
 if [ $1 == 0 ]; then
@@ -97,7 +96,7 @@ systemctl daemon-reload
 %files  -n dlogutil
 %manifest %{name}.manifest
 %license LICENSE.APLv2
-%attr(755,root,root) /opt/etc/dump.d/default.d/dlog_dump.sh
+%attr(755,root,root) %{TZ_SYS_ETC}/dump.d/default.d/dlog_dump.sh
 %attr(755,root,app_logging) %{_bindir}/dlogutil
 %attr(755,root,app_logging) %{_bindir}/dlogctrl
 %{_unitdir}/dlog-main.service

diff --git a/proto-meta-Tizen_generic/specfile-initial/lua/packaging/lua.spec b/proto-meta-Tizen_generic/specfile-initial/lua/packaging/lua.spec
index 92f4760..5de7a96 100644 (file)
--- a/proto-meta-Tizen_generic/specfile-initial/lua/packaging/lua.spec
+++ b/proto-meta-Tizen_generic/specfile-initial/lua/packaging/lua.spec
@@ -80,7 +80,7 @@ cp %{SOURCE1001} .
 
 %build
 sed -i 's:LUA_ROOT2 "LIBDIR/lua/%{major_version}/":LUA_ROOT2 \"%{_lib}/lua/%{major_version}/":' src/luaconf.h
-make %{?_smp_mflags} -C src CC="gcc" MYCFLAGS="%{optflags} -fPIC -DLUA_USE_LINUX" MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" V=%{major_version} all
+make %{?_smp_mflags} -C src CC="%{__cc}" MYCFLAGS="%{optflags} -fPIC -DLUA_USE_LINUX" MYLIBS="-Wl,-E -ldl -lreadline -lhistory -lncurses" V=%{major_version} all
 
 %install
 make install INSTALL_TOP="%{buildroot}%{_prefix}" INSTALL_LIB="%{buildroot}%{_libdir}" INSTALL_CMOD=%{buildroot}%{_libdir}/lua/%{major_version} INSTALL_MAN="%{buildroot}%{_mandir}/man1"

diff --git a/tools/spec2yocto.py b/tools/spec2yocto.py
index d5ce547..bd9b856 100755 (executable)
--- a/tools/spec2yocto.py
+++ b/tools/spec2yocto.py
@@ -1419,7 +1419,6 @@ Group: devel
         return the line of every build requires.
         '''
         package_replacement = SPEC2YOCTO_CONFIG.get_substitute()
-
         build_requires_res = []
         for line in lines:
             build_requires = re.findall( RePattern.buildRequiresPackage, line )
@@ -1915,7 +1914,6 @@ class MetaSpec:
             file_d.write( "DEPENDS = \"\"\n" )
 
             res_depends = set()
-
             for k_provide in depends_dico.keys():
                 if len( depends_dico[k_provide] ) > 0:
                     file_d.write( "#DEPENDS of %s \n" % k_provide )
@@ -1965,7 +1963,7 @@ class MetaSpec:
                     file_d.write( "inherit gettext\n" )
                 elif pkg_yocto_name in native_depend_list:
                     file_d.write( "DEPENDS_append_class-native = \" %s-native\"\n" % pkg_yocto_name )
-                    #file_d.write( "DEPENDS_append_class-target = \" %s\"\n" % pkg_yocto_name )
+                    file_d.write( "DEPENDS_append_class-target = \" %s-native\"\n" % pkg_yocto_name )
                 elif pkg_yocto_name in cross_depend_list:
                     file_d.write( "DEPENDS += \"%s-cross\"\n" % pkg_yocto_name )
                 elif pkg_yocto_name in ignore_depend_list: