Merge branch 'org.openembedded.dev' of git@git.openembedded.net:/openembedded into...

[vuplus_openembedded] / classes / package.bbclass

diff --git a/classes/package.bbclass b/classes/package.bbclass
index 0601885..a6f4512 100644 (file)
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -398,6 +398,8 @@ python populate_packages () {
                                        continue
                        if (not os.path.islink(file)) and (not os.path.exists(file)):
                                continue
+                       if file[-4:] == '.pyo':
+                               continue
                        if file in seen:
                                continue
                        seen.append(file)
@@ -459,7 +461,7 @@ python populate_packages () {
        for pkg in package_list:
                rdepends = explode_deps(bb.data.getVar('RDEPENDS_' + pkg, d, 0) or bb.data.getVar('RDEPENDS', d, 0) or "")
 
-               remstr = "${PN} (= ${DEBPV})"
+               remstr = "${PN} (= ${EXTENDPV})"
                if main_is_empty and remstr in rdepends:
                        rdepends.remove(remstr)
                for l in dangling_links[pkg]:
@@ -551,7 +553,9 @@ emit_pkgdata[dirs] = "${PKGDATA_DIR}/runtime"
 
 ldconfig_postinst_fragment() {
 if [ x"$D" = "x" ]; then
-       [ -x /sbin/ldconfig ] && /sbin/ldconfig
+       if [ -e /etc/ld.so.conf ] ; then
+               [ -x /sbin/ldconfig ] && /sbin/ldconfig
+       fi
 fi
 }