- resolve circulard dep.
authorRonan Le Martret <ronan@fridu.net>
Thu, 4 Apr 2013 15:31:43 +0000 (17:31 +0200)
committerRonan Le Martret <ronan@fridu.net>
Thu, 4 Apr 2013 15:31:43 +0000 (17:31 +0200)
Tizen_TZ_package/recipes-Tizen-IVI-Wayland/package-provided-extra
Tizen_TZ_package/spec2yocto.py
meta-tizen-ivi/recipes-tizen/acl/acl.inc
meta-tizen-ivi/recipes-tizen/attr/attr.inc
meta-tizen-ivi/recipes-tizen/device-mapper/device-mapper.inc
meta-tizen-ivi/recipes-tizen/kernel/kernel-depends.inc
meta-tizen-ivi/recipes-tizen/mesa/mesa-rdepends.inc
meta-tizen-ivi/recipes-tizen/mpfr/mpfr-depends.inc
meta-tizen-ivi/recipes-tizen/perl/perl-depends.inc
meta-tizen-ivi/recipes-tizen/telephony-daemon/telephony-daemon.inc
meta-tizen-ivi/recipes-tizen/xorg-x11-server/xorg-x11-server-rdepends.inc

index c771428..acf4d2a 100755 (executable)
@@ -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":
index 89c5835..009983c 100644 (file)
@@ -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"
 
index 6ad6ad6..26dd2e3 100644 (file)
@@ -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}"
index a170475..a660303 100644 (file)
@@ -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 = ""
 
index c92e5dc..60776a6 100644 (file)
@@ -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"
index 4a23e8f..24c0d8b 100644 (file)
@@ -3,4 +3,3 @@ DEPENDS = ""
 DEPENDS += "gmp"
 DEPENDS += "autoconf-native"
 DEPENDS += "libtool-native"
-DEPENDS += "mpfr"
index 6daeba0..b8f62e3 100644 (file)
@@ -3,4 +3,3 @@ DEPENDS = ""
 DEPENDS += "groff"
 DEPENDS += "gdbm"
 DEPENDS += "zlib"
-DEPENDS += "perl"
index e28a767..4f85159 100644 (file)
@@ -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}"
 
index 9791f25..690aee1 100644 (file)
@@ -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"