From a9daaa99c66d6ec48399ea8399e28a17963e35ed Mon Sep 17 00:00:00 2001 From: Ronan Le Martret Date: Thu, 4 Apr 2013 17:31:43 +0200 Subject: [PATCH] - resolve circulard dep. --- Tizen_TZ_package/recipes-Tizen-IVI-Wayland/package-provided-extra | 3 +++ Tizen_TZ_package/spec2yocto.py | 4 ++-- meta-tizen-ivi/recipes-tizen/acl/acl.inc | 2 +- meta-tizen-ivi/recipes-tizen/attr/attr.inc | 4 ++-- meta-tizen-ivi/recipes-tizen/device-mapper/device-mapper.inc | 2 +- meta-tizen-ivi/recipes-tizen/kernel/kernel-depends.inc | 1 - meta-tizen-ivi/recipes-tizen/mesa/mesa-rdepends.inc | 4 ++-- meta-tizen-ivi/recipes-tizen/mpfr/mpfr-depends.inc | 1 - meta-tizen-ivi/recipes-tizen/perl/perl-depends.inc | 1 - meta-tizen-ivi/recipes-tizen/telephony-daemon/telephony-daemon.inc | 2 +- .../recipes-tizen/xorg-x11-server/xorg-x11-server-rdepends.inc | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Tizen_TZ_package/recipes-Tizen-IVI-Wayland/package-provided-extra b/Tizen_TZ_package/recipes-Tizen-IVI-Wayland/package-provided-extra index e69de29..b0ff757 100644 --- a/Tizen_TZ_package/recipes-Tizen-IVI-Wayland/package-provided-extra +++ b/Tizen_TZ_package/recipes-Tizen-IVI-Wayland/package-provided-extra @@ -0,0 +1,3 @@ +mesa-libEGL::::libEGL.so.1 +mesa-libGLESv2::::libGLESv2.so.2 +libdrm::::libdrm2 \ No newline at end of file diff --git a/Tizen_TZ_package/spec2yocto.py b/Tizen_TZ_package/spec2yocto.py index c771428..acf4d2a 100755 --- a/Tizen_TZ_package/spec2yocto.py +++ b/Tizen_TZ_package/spec2yocto.py @@ -1164,8 +1164,8 @@ class metaSpec: if res is None: print "No direct provider for package DEPENDS %s : %s" % (self.__package_name,pp) res=pp - - resDepends.add(res) + if res != self.__package_name : + resDepends.add(res) for res in resDepends: if res == "gettext": diff --git a/meta-tizen-ivi/recipes-tizen/acl/acl.inc b/meta-tizen-ivi/recipes-tizen/acl/acl.inc index 89c5835..009983c 100644 --- a/meta-tizen-ivi/recipes-tizen/acl/acl.inc +++ b/meta-tizen-ivi/recipes-tizen/acl/acl.inc @@ -15,7 +15,7 @@ libaclfiles = "/lib/libacl.so.*" acl-docsfiles = "" -libacl-develfiles = "/lib/libacl.so ${base_prefix}/usr/include/acl ${base_prefix}/usr/include/sys/acl.h ${base_prefix}/usr/lib/libacl.*" +libacl-develfiles = "/lib/libacl.so ${base_prefix}/usr/include/acl ${base_prefix}/usr/include/sys/acl.h ${base_prefix}/lib/libacl.*" aclfiles = "${base_prefix}/usr/bin/chacl ${base_prefix}/usr/bin/getfacl ${base_prefix}/usr/bin/setfacl ${base_prefix}/usr/share/locale/*/LC_MESSAGES/*.mo" diff --git a/meta-tizen-ivi/recipes-tizen/attr/attr.inc b/meta-tizen-ivi/recipes-tizen/attr/attr.inc index 6ad6ad6..26dd2e3 100644 --- a/meta-tizen-ivi/recipes-tizen/attr/attr.inc +++ b/meta-tizen-ivi/recipes-tizen/attr/attr.inc @@ -10,11 +10,11 @@ PACKAGES += "libattr-devel" PACKAGES += "attr" PACKAGES += "libattr" -libattr-develfiles = "${base_prefix}/usr/lib/libattr.so ${base_prefix}/usr/include/attr/*.h" +libattr-develfiles = "/lib/libattr.so ${base_prefix}/lib/libattr.so ${base_prefix}/usr/include/attr/*.h" attrfiles = "${base_prefix}/usr/bin/* ${base_prefix}/usr/share/locale/*/LC_MESSAGES/attr.mo" -libattrfiles = "${base_prefix}/usr/lib/libattr.so.*" +libattrfiles = "/lib/libattr.so.*" FILES_libattr-devel = "${libattr-develfiles}" FILES_attr = "${attrfiles}" diff --git a/meta-tizen-ivi/recipes-tizen/device-mapper/device-mapper.inc b/meta-tizen-ivi/recipes-tizen/device-mapper/device-mapper.inc index a170475..a660303 100644 --- a/meta-tizen-ivi/recipes-tizen/device-mapper/device-mapper.inc +++ b/meta-tizen-ivi/recipes-tizen/device-mapper/device-mapper.inc @@ -12,7 +12,7 @@ PACKAGES += "device-mapper-libs" device-mapperfiles = "${base_prefix}/usr/share/man/man8/dmsetup.8.gz" -device-mapper-develfiles = "${base_prefix}/usr/include/libdevmapper.h ${base_prefix}/usr/lib/pkgconfig/*.pc" +device-mapper-develfiles = "${base_prefix}/usr/include/libdevmapper.h //lib/pkgconfig/*.pc" device-mapper-libsfiles = "" diff --git a/meta-tizen-ivi/recipes-tizen/kernel/kernel-depends.inc b/meta-tizen-ivi/recipes-tizen/kernel/kernel-depends.inc index 0afcaa2..8a5e8b9 100644 --- a/meta-tizen-ivi/recipes-tizen/kernel/kernel-depends.inc +++ b/meta-tizen-ivi/recipes-tizen/kernel/kernel-depends.inc @@ -1,4 +1,3 @@ DEPENDS = "" #DEPENDS of kernel -DEPENDS += "kernel" DEPENDS += "eglibc" diff --git a/meta-tizen-ivi/recipes-tizen/mesa/mesa-rdepends.inc b/meta-tizen-ivi/recipes-tizen/mesa/mesa-rdepends.inc index c92e5dc..60776a6 100644 --- a/meta-tizen-ivi/recipes-tizen/mesa/mesa-rdepends.inc +++ b/meta-tizen-ivi/recipes-tizen/mesa/mesa-rdepends.inc @@ -1,6 +1,6 @@ RDEPENDS = "" #RDEPENDS of mesa-libEGL-compat -RDEPENDS_mesa-libEGL-compat += "libEGL.so.1" +RDEPENDS_mesa-libEGL-compat += "mesa-libEGL" #RDEPENDS of mesa-libGLESv1-devel RDEPENDS_mesa-libGLESv1-devel += "mesa-libGLESv1" @@ -16,7 +16,7 @@ RDEPENDS_mesa-libGL-devel += "libx11-dev" RDEPENDS_mesa-libGL-devel += "mesa-libGL" #RDEPENDS of mesa-libGLESv2-compat -RDEPENDS_mesa-libGLESv2-compat += "libGLESv2.so.2" +RDEPENDS_mesa-libGLESv2-compat += "mesa-libGLESv2" #RDEPENDS of mesa-libwayland-egl-devel RDEPENDS_mesa-libwayland-egl-devel += "libwayland-egl" diff --git a/meta-tizen-ivi/recipes-tizen/mpfr/mpfr-depends.inc b/meta-tizen-ivi/recipes-tizen/mpfr/mpfr-depends.inc index 4a23e8f..24c0d8b 100644 --- a/meta-tizen-ivi/recipes-tizen/mpfr/mpfr-depends.inc +++ b/meta-tizen-ivi/recipes-tizen/mpfr/mpfr-depends.inc @@ -3,4 +3,3 @@ DEPENDS = "" DEPENDS += "gmp" DEPENDS += "autoconf-native" DEPENDS += "libtool-native" -DEPENDS += "mpfr" diff --git a/meta-tizen-ivi/recipes-tizen/perl/perl-depends.inc b/meta-tizen-ivi/recipes-tizen/perl/perl-depends.inc index 6daeba0..b8f62e3 100644 --- a/meta-tizen-ivi/recipes-tizen/perl/perl-depends.inc +++ b/meta-tizen-ivi/recipes-tizen/perl/perl-depends.inc @@ -3,4 +3,3 @@ DEPENDS = "" DEPENDS += "groff" DEPENDS += "gdbm" DEPENDS += "zlib" -DEPENDS += "perl" diff --git a/meta-tizen-ivi/recipes-tizen/telephony-daemon/telephony-daemon.inc b/meta-tizen-ivi/recipes-tizen/telephony-daemon/telephony-daemon.inc index e28a767..4f85159 100644 --- a/meta-tizen-ivi/recipes-tizen/telephony-daemon/telephony-daemon.inc +++ b/meta-tizen-ivi/recipes-tizen/telephony-daemon/telephony-daemon.inc @@ -8,7 +8,7 @@ PROVIDES = "" PACKAGES = "" PACKAGES += "telephony-daemon" -telephony-daemonfiles = "${base_prefix}/usr/bin/telephony-daemon ${base_prefix}/etc/rc.d/init.d/telephony-daemon ${base_prefix}/etc/rc.d/rc3.d/S30telephony-daemon ${base_prefix}/etc/rc.d/rc5.d/S30telephony-daemon" +telephony-daemonfiles = "${base_prefix}/usr/bin/telephony-daemon ${base_prefix}/etc/rc.d/rc3.d/S30telephony-daemon ${base_prefix}/etc/rc.d/rc5.d/S30telephony-daemon" FILES_telephony-daemon = "${telephony-daemonfiles}" diff --git a/meta-tizen-ivi/recipes-tizen/xorg-x11-server/xorg-x11-server-rdepends.inc b/meta-tizen-ivi/recipes-tizen/xorg-x11-server/xorg-x11-server-rdepends.inc index 9791f25..690aee1 100644 --- a/meta-tizen-ivi/recipes-tizen/xorg-x11-server/xorg-x11-server-rdepends.inc +++ b/meta-tizen-ivi/recipes-tizen/xorg-x11-server/xorg-x11-server-rdepends.inc @@ -8,7 +8,7 @@ RDEPENDS_xorg-x11-server-devel += "pixman-dev" RDEPENDS_xorg-x11-server-devel += "libpciaccess-dev" #RDEPENDS of xorg-x11-server -RDEPENDS_xorg-x11-server += "libdrm2" +RDEPENDS_xorg-x11-server += "libdrm" #RDEPENDS of xorg-x11-server-common RDEPENDS_xorg-x11-server-common += "xkeyboard-config" -- 2.7.4