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 c436867..a6f4512 100644 (file)
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -4,13 +4,6 @@
 
 PKGDEST = "${WORKDIR}/install"
 
-def build_package_revision(d):
-       import bb
-       file_pr = bb.data.getVar('PR', d, True)
-       distro_pr = bb.data.getVar('DISTRO_PR', d, True) or ""
-       return "%s%s" % (file_pr, distro_pr)
-
-
 def legitimize_package_name(s):
        """
        Make sure package names are legitimate strings
@@ -468,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]:
@@ -560,7 +553,9 @@ emit_pkgdata[dirs] = "${PKGDATA_DIR}/runtime"
 
 ldconfig_postinst_fragment() {
 if [ x"$D" = "x" ]; then
-       [ -x /sbin/ldconfig ] && [ -e /etc/ld.so.conf ] && /sbin/ldconfig
+       if [ -e /etc/ld.so.conf ] ; then
+               [ -x /sbin/ldconfig ] && /sbin/ldconfig
+       fi
 fi
 }