update spec2yocto.py

Change-Id: I22eda92af95a64db35169eabee5fbca19d86bb51
Signed-off-by: Ronan Le Martret <ronan@fridu.net>

diff --git a/proto-meta-Tizen_generic/.spec2yoctorc b/proto-meta-Tizen_generic/.spec2yoctorc
index 5d213e0..cada550 100644 (file)
--- a/proto-meta-Tizen_generic/.spec2yoctorc
+++ b/proto-meta-Tizen_generic/.spec2yoctorc
@@ -339,4 +339,5 @@ xkeyboard-config=pkgconfig(xkeyboard-config)
 qt5-qtdeclarative=pkgconfig(Qt5QmlDevTools), qtdeclarative
 qt5=pkgconfig(Qt5Core), pkgconfig(Qt5Gui), pkgconfig(Qt5OpenGL), pkgconfig(Qt5PlatformSupport), qtbase, qt-default
 qt5-qtxmlpatterns=qt5-qtxmlpatterns-devel
-cups=cups-devel
\ No newline at end of file
+cups=cups-devel
+libinput=pkgconfig(libinput)
\ No newline at end of file

diff --git a/proto-meta-Tizen_generic/rpm_tizen_macro/lib/tizen_macros b/proto-meta-Tizen_generic/rpm_tizen_macro/lib/tizen_macros
index 602b947..80d7749 100644 (file)
--- a/proto-meta-Tizen_generic/rpm_tizen_macro/lib/tizen_macros
+++ b/proto-meta-Tizen_generic/rpm_tizen_macro/lib/tizen_macros
@@ -5,10 +5,15 @@
 %_localstatedir         %{_buildPrefix}${localstatedir}
 %_defaultdocdir         %{_usr}/share/doc/packages
 
+#use for systemd
 %_rootprefix /
 %_unitdir_user %{_prefix}/lib/systemd/user
 %_unitdir ${systemd_unitdir}/system
 
+#use for PAM
+%_base_libdir ${base_libdir}
+
+
 # package build macros
 # %make_install           make install DESTDIR=%{?buildroot}
 # %makeinstall            make DESTDIR=%{?buildroot:%{buildroot}} install

diff --git a/tools/spec2yocto.py b/tools/spec2yocto.py
index 5f52cca..2f8303f 100755 (executable)
--- a/tools/spec2yocto.py
+++ b/tools/spec2yocto.py
@@ -904,7 +904,7 @@ class SpecParser:
                             setup_id = splited_line[i].replace( "-a", "" )
                         else:
                             setup_id = splited_line[i + 1]
-                        res_prep_section += "#extracte source %s \n" % setup_id
+                        res_prep_section += "#extracte source %s\n" % setup_id
                         res_prep_section += "pushd ${S}\n"
                         source = os.path.basename( pattern_source_dico[setup_id] )
                         # not a good way to do this
@@ -912,7 +912,7 @@ class SpecParser:
                             res_prep_section += "cp ${S}/packaging/%s .\n" % source
                         else:
                             file_name = os.path.basename( pattern_source_dico[setup_id] )
-                            res_prep_section += "unp ${S}/packaging/%s \n" % file_name
+                            res_prep_section += "tar -zxf  ${S}/packaging/%s\n" % file_name
                         res_prep_section += "popd \n"
 
                     elif splited_line[i].startswith( "-b" ):
@@ -920,15 +920,15 @@ class SpecParser:
                             setup_id = splited_line[i].replace( "-b", "" )
                         else:
                             setup_id = splited_line[i + 1]
-
-                        res_prep_section += "#extracte source %s \n" % ( setup_id )
-                        res_prep_section += "pushd ${S}/../\n"
-                        source = os.path.basename( pattern_source_dico[setup_id] )
-                        if source.endswith( "rpmlintrc" ):
-                            res_prep_section += "cp ${S}/packaging/%s .\n" % source
-                        else:
-                            res_prep_section += "unp ${S}/packaging/%s \n" % source
-                        res_prep_section += "popd \n"
+                        if setup_id != "0":
+                            res_prep_section += "#extracte source %s\n" % ( setup_id )
+                            res_prep_section += "pushd ${S}/../\n"
+                            source = os.path.basename( pattern_source_dico[setup_id] )
+                            if source.endswith( "rpmlintrc" ):
+                                 res_prep_section += "cp ${S}/packaging/%s .\n" % source
+                            else:
+                                 res_prep_section += "tar -zxf ${S}/packaging/%s\n" % source
+                            res_prep_section += "popd\n"
 
                 res_prep_section += "chmod -Rf a+rX,u+w,g-w,o-w ${S}\n"
 
@@ -1729,7 +1729,8 @@ class MetaSpec:
         '''
         code=code.replace("/sbin/ldconfig","[ \"x$D\" == \"x\" ] && ldconfig")
         code=code.replace("${prefix}","$D${prefix}")
-
+        code=code.replace("${systemd_unitdir}","$D${systemd_unitdir}")
+        code=code.replace("${sysconfdir}","$D${sysconfdir}")
 
         file_d.write("%s%s() {\n" % (recipe_section, package_name))
         file_d.write("    #!/bin/sh -e\n\n")