From e35579d6a2cd810867a41050c923666a9565da00 Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Fri, 16 May 2014 11:38:45 +0200 Subject: [PATCH] remove python-rpm Change-Id: I224f1ca78826decc3278642cefc4eba06c064229 Signed-off-by: Ronan Le Martret --- proto-meta-Tizen_generic/.spec2yoctorc | 7 ++++--- tools/spec2yocto.py | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/proto-meta-Tizen_generic/.spec2yoctorc b/proto-meta-Tizen_generic/.spec2yoctorc index 1b49c74..9bebc06 100644 --- a/proto-meta-Tizen_generic/.spec2yoctorc +++ b/proto-meta-Tizen_generic/.spec2yoctorc @@ -48,7 +48,7 @@ perl-XML-Parser=libxml-parser-perl list= [native_tizen_common_blacklist] -list=rpm +list= [tizen_common_blacklist] list= @@ -67,7 +67,7 @@ ignore=coreutils,tizen-coreutils,glibc-devel-32bit, eglibc, glibc, kernel-header #ex: automake will be replace by automake-native native=automake, fdupes, intltool, autoconf, pkgconfig, help2man, bison, texinfo, readline, ninja, cmake #some buildRequire mean depends on cross package not runtime -#ex: gcc will be replace by gcc-native +#ex: gcc will be replace by gcc-cross cross=gcc,libtool #some buildRequire mean depends on libtool-cross package not runtime libtool_cross=libtool-ltdl-devel,libtool-ltdl @@ -152,7 +152,7 @@ poppler=pkgconfig(poppler-glib) popt=pkgconfig(popt), popt-devel pulseaudio=pkgconfig(libpulse) pwdutils=/usr/sbin/groupadd -python=python-devel +python=python-devel, pkgconfig(python) readline=readline-devel security-server=pkgconfig(security-server) slp-pkgmgr=pkgconfig(pkgmgr-installer) @@ -184,3 +184,4 @@ com-core=pkgconfig(com-core) libtapi-legacy=pkgconfig(tapi) libtapi=pkgconfig(tapi-3.0) libsoup-2.4=pkgconfig(libsoup-2.4) +libcap=pkgconfig(libcap) \ No newline at end of file diff --git a/tools/spec2yocto.py b/tools/spec2yocto.py index 3db96f4..95a074d 100755 --- a/tools/spec2yocto.py +++ b/tools/spec2yocto.py @@ -1970,7 +1970,8 @@ class MetaSpec: file_d.write( "DEPENDS_append_class-native = \" %s-native\"\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 ) + file_d.write( "DEPENDS_append_class-native = \" %s\"\n" % pkg_yocto_name ) + file_d.write( "DEPENDS_append_class-target = \" %s-cross\"\n" % pkg_yocto_name ) elif pkg_yocto_name in ignore_depend_list: pass elif pkg_yocto_name in SPEC2YOCTO_CONFIG.get_libtool_cross(): @@ -2162,7 +2163,6 @@ class package_def: def make_alias_package( project, packages_dico ): alias_package = {} #TO DO need to be do in conf file. - alias_package["python-rpm"] = "rpm" alias_package["python-libxml2"] = "libxml2" alias_package["python-magic"] = "file" alias_package["cross-arm-binutils"] = "binutils" -- 2.7.4