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 5559592..bcd9c98 100644 (file)
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -166,7 +166,7 @@ def runstrip(file, d):
     # If the file is in a .debug directory it was already stripped,
     # don't do it again...
     if os.path.dirname(file).endswith(".debug"):
-        bb.note("Already ran strip")
+        bb.debug(2, "Already ran strip on %s" % file)
         return 0
 
     strip = bb.data.getVar("STRIP", d, 1)
@@ -384,10 +384,16 @@ python populate_packages () {
                        globbed = glob.glob(file)
                        if globbed:
                                if [ file ] != globbed:
-                                       files += globbed
-                                       continue
+                                       if not file in globbed:
+                                               files += globbed
+                                               continue
+                                       else:
+                                               globbed.remove(file)
+                                               files += globbed
                        if (not os.path.islink(file)) and (not os.path.exists(file)):
                                continue
+                       if file[-4:] == '.pyc':
+                               continue
                        if file in seen:
                                continue
                        seen.append(file)
@@ -483,6 +489,11 @@ python emit_pkgdata() {
                val = bb.data.getVar('%s_%s' % (var, pkg), d, 1)
                if val:
                        f.write('%s_%s: %s\n' % (var, pkg, encode(val)))
+                       return
+               val = bb.data.getVar('%s' % (var), d, 1)
+               if val:
+                       f.write('%s: %s\n' % (var, encode(val)))
+               return
 
        packages = bb.data.getVar('PACKAGES', d, True)
        pkgdatadir = bb.data.getVar('PKGDATA_DIR', d, True)
@@ -503,6 +514,7 @@ python emit_pkgdata() {
                subdata_file = pkgdatadir + "/runtime/%s" % pkg
                sf = open(subdata_file, 'w')
                write_if_exists(sf, pkg, 'PN')
+               write_if_exists(sf, pkg, 'PV')
                write_if_exists(sf, pkg, 'PR')
                write_if_exists(sf, pkg, 'DESCRIPTION')
                write_if_exists(sf, pkg, 'RDEPENDS')
@@ -554,7 +566,7 @@ python package_do_shlibs() {
 
        exclude_shlibs = bb.data.getVar('EXCLUDE_FROM_SHLIBS', d, 0)
        if exclude_shlibs:
-               bb.note("not generating shlibs")
+               bb.debug(1, "not generating shlibs")
                return
                
        lib_re = re.compile("^lib.*\.so")