From: Ronan Le Martret Date: Tue, 13 May 2014 09:35:21 +0000 (+0200) Subject: update spec2yocto createRecipes X-Git-Tag: rev_0.4~88 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ad77322c5fbbd0dd31d12099198eb0771e09a517;p=scm%2Fbb%2Ftizen.git update spec2yocto createRecipes Change-Id: I7404eea4d2820e2ca47b06a723a666cb2823983e --- diff --git a/proto-meta-Tizen_generic/.spec2yoctorc b/proto-meta-Tizen_generic/.spec2yoctorc index 3595f40..653e23c 100644 --- a/proto-meta-Tizen_generic/.spec2yoctorc +++ b/proto-meta-Tizen_generic/.spec2yoctorc @@ -27,7 +27,7 @@ default_git_src=review.tizen.org priority=1 [whitelist_tizen_common] -list=smack, rpm, uthash, lua, weston-common, pwdutils, fdupes, doxygen, crosswalk, location-manager, vconf, appcore-agent, dlog, common, libslp-sysman, aul-1, librua, libhaptic, pkgmgr-info, libdevice-node, xdgmime, libprivilege-control, ail, bundle, app-checker, privacy-manager, libslp-pm, vconf-internal-keys, system-info, libiri, sound-manager, iniparser, libmm-sound, libmm-session, libmm-common, libmm-log, heynoti, security-server, audio-session-manager, avsystem, libmm-ta +list=smack, rpm, uthash, lua, weston-common, pwdutils, fdupes, doxygen, crosswalk, location-manager, vconf, appcore-agent, dlog, common, libslp-sysman, aul-1, librua, libhaptic, pkgmgr-info, libdevice-node, xdgmime, libprivilege-control, ail, bundle, app-checker, privacy-manager, libslp-pm, vconf-internal-keys, system-info, libiri, sound-manager, iniparser, libmm-sound, libmm-session, libmm-common, libmm-log, heynoti, security-server, audio-session-manager, avsystem, libmm-ta, slp-pkgmgr, app-core, libslp-sensor, libsf-common, tizen-platform-config, application, libslp-db-util, tizen-platform-wrapper, app-svc, notification, alarm-manager, eina, com-core, libtapi, libtapi-legacy [substitute] pkgconfig(zlib)=zlib-devel @@ -64,7 +64,7 @@ blacklist= ignore=coreutils,tizen-coreutils,glibc-devel-32bit, eglibc, glibc, kernel-headers, linux-kernel-headers, pkg-config #some buildRequire mean depends on native package not runtime #ex: automake will be replace by automake-native -native=automake, fdupes, intltool, autoconf, pkgconfig, help2man, bison, texinfo, readline +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 cross=gcc,libtool @@ -84,10 +84,9 @@ ignore= glibc-devel-32bit, gdm, tk, subversion-perl, cvsps, perl-DBD-SQLite, cvs [tizen-provided-extra] acl=libacl-devel ail=pkgconfig(ail) -alsa=pkgconfig(alsa) +alsa-lib=pkgconfig(alsa) alsa-state=pkgconfig(libascenario) app-checker=pkgconfig(app-checker), pkgconfig(app-checker-server) -appcore-agent=pkgconfig(appcore-common) application=pkgconfig(capi-appfw-application) attr=libattr-devel audio-session-manager=pkgconfig(audio-session-mgr) @@ -99,7 +98,7 @@ common=pkgconfig(capi-base-common) dbus=pkgconfig(dbus-glib-1), pkgconfig(dbus-1) dlog=pkgconfig(dlog) ecore=pkgconfig(ecore-input), pkgconfig(ecore-wayland), pkgconfig(ecore) -eglibc=glibc-devel +eglibc=glibc-devel, /sbin/ldconfig elfutils=libelf-devel expat=expat-devel file=file-devel @@ -159,13 +158,13 @@ readline=readline-devel security-server=pkgconfig(security-server) smack=pkgconfig(libsmack) sound-manager=pkgconfig(capi-media-sound-manager) -sqlite3=pkgconfig(sqlite3) +sqlite3=pkgconfig(sqlite3), /usr/bin/sqlite3 system-info=pkgconfig(capi-system-info) -systemd=pkgconfig(libsystemd-login), pkgconfig(libsystemd-daemon) +systemd=pkgconfig(libsystemd-login), pkgconfig(libsystemd-daemon), /usr/bin/systemctl tizen-platform-config=pkgconfig(libtzplatform-config) udev=pkgconfig(libudev) uthash=uthash-devel -vconf=pkgconfig(vconf), pkgconfig(wayland-cursor), vconf-keys-devel +vconf=pkgconfig(vconf), pkgconfig(wayland-cursor), vconf-keys-devel, /usr/bin/vconftool vconf-internal-keys=pkgconfig(vconf-internal-keys) wayland=pkgconfig(wayland-client), pkgconfig(wayland-egl), pkgconfig(wayland-server), weston=pkgconfig(weston) @@ -173,3 +172,15 @@ xdgmime=pkgconfig(xdgmime), xdgmime-devel xz=xz-devel zlib=zlib-devel bundle=pkgconfig(bundle) +slp-pkgmgr=pkgconfig(pkgmgr-installer) +app-core=pkgconfig(appcore-efl),pkgconfig(appcore-common) +elementary=pkgconfig(elementary) +libsf-common=pkgconfig(sf_common) +app-svc=pkgconfig(appsvc) +notification=pkgconfig(notification) +alarm-manager =pkgconfig(alarm-service) +eina=pkgconfig(eina) +com-core=pkgconfig(com-core) +libtapi-legacy=pkgconfig(tapi) +libtapi=pkgconfig(tapi-3.0) +libsoup-2.4=pkgconfig(libsoup-2.4) \ No newline at end of file diff --git a/tools/spec2yocto.py b/tools/spec2yocto.py index 791b1e5..b7f394f 100755 --- a/tools/spec2yocto.py +++ b/tools/spec2yocto.py @@ -1930,10 +1930,8 @@ class MetaSpec: if pp_provide in MetaSpec.mProvidesDico[k] or pp_provide == k: res = k break - for k_package_provide in MetaSpec.mExtraRProvidesDico.keys(): - if pp_provide in MetaSpec.mExtraRProvidesDico[k_package_provide] \ - or pp_provide == k: + if pp_provide in MetaSpec.mExtraRProvidesDico[k_package_provide]: res = k_package_provide break @@ -1966,7 +1964,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\"\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: @@ -2432,7 +2430,6 @@ class manifestCollection: if k_package not in MetaSpec.mExtraRProvidesDico.keys(): MetaSpec.mExtraRProvidesDico[k_package] = [] - MetaSpec.mExtraRProvidesDico[k_package].extend( raw_list ) TERMINAL_COLORS = {"black": "\033[30;1m",