Update drivers

[vuplus_openembedded] / classes / package_deb.bbclass

diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass
index e59d194..9fb1674 100644 (file)
--- a/classes/package_deb.bbclass
+++ b/classes/package_deb.bbclass
@@ -1,5 +1,5 @@
 #
-# Copyright 2006-2007 OpenedHand Ltd.
+# Copyright 2006-2008 OpenedHand Ltd.
 #
 
 inherit package
@@ -17,13 +17,11 @@ DPKG_ARCH_i686 ?= "i386"
 DPKG_ARCH_pentium ?= "i386"
 
 python package_deb_fn () {
-    from bb import data
     bb.data.setVar('PKGFN', bb.data.getVar('PKG',d), d)
 }
 
 addtask package_deb_install
 python do_package_deb_install () {
-    import os, sys
     pkg = bb.data.getVar('PKG', d, 1)
     pkgfn = bb.data.getVar('PKGFN', d, 1)
     rootfs = bb.data.getVar('IMAGE_ROOTFS', d, 1)
@@ -39,6 +37,7 @@ python do_package_deb_install () {
             os.makedirs(rootfs)
         os.chdir(rootfs)
     except OSError:
+        import sys
         raise bb.build.FuncFailed(str(sys.exc_value))
 
     # update packages file
@@ -69,14 +68,13 @@ python do_package_deb_install () {
 }
 
 python do_package_deb () {
-    import sys, re, copy
+    import re, copy
 
     workdir = bb.data.getVar('WORKDIR', d, 1)
     if not workdir:
         bb.error("WORKDIR not defined, unable to package")
         return
 
-    import os # path manipulations
     outdir = bb.data.getVar('DEPLOY_DIR_DEB', d, 1)
     if not outdir:
         bb.error("DEPLOY_DIR_DEB not defined, unable to package")
@@ -88,7 +86,6 @@ python do_package_deb () {
         return
     bb.mkdirhier(dvar)
 
-
     tmpdir = bb.data.getVar('TMPDIR', d, 1)
 
     if os.access(os.path.join(tmpdir, "stamps", "DEB_PACKAGE_INDEX_CLEAN"),os.R_OK):
@@ -123,7 +120,7 @@ python do_package_deb () {
 
         os.chdir(root)
         from glob import glob
-        g = glob('*')
+        g = glob('*') + glob('.[!.]*')
         try:
             del g[g.index('DEBIAN')]
             del g[g.index('./DEBIAN')]
@@ -131,7 +128,7 @@ python do_package_deb () {
             pass
         if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1":
             from bb import note
-            note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1)))
+            note("Not creating empty archive for %s-%s" % (pkg, bb.data.expand('${PV}-${PR}${DISTRO_PR}', localdata, True)))
             bb.utils.unlockfile(lf)
             continue
 
@@ -149,9 +146,9 @@ python do_package_deb () {
         fields = []
         pe = bb.data.getVar('PE', d, 1)
         if pe and int(pe) > 0:
-            fields.append(["Version: %s:%s-%s\n", ['PE', 'PV', 'PR']])
+            fields.append(["Version: %s:%s-%s%s\n", ['PE', 'PV', 'PR', 'DISTRO_PR']])
         else:
-            fields.append(["Version: %s-%s\n", ['PV', 'PR']])
+            fields.append(["Version: %s-%s%s\n", ['PV', 'PR', 'DISTRO_PR']])
         fields.append(["Description: %s\n", ['DESCRIPTION']])
         fields.append(["Section: %s\n", ['SECTION']])
         fields.append(["Priority: %s\n", ['PRIORITY']])
@@ -181,6 +178,7 @@ python do_package_deb () {
             for (c, fs) in fields:
                 ctrlfile.write(unicode(c % tuple(pullData(fs, localdata))))
         except KeyError:
+            import sys
             (type, value, traceback) = sys.exc_info()
             bb.utils.unlockfile(lf)
             ctrlfile.close()
@@ -236,28 +234,24 @@ python do_package_deb () {
                 conffiles.write('%s\n' % f)
             conffiles.close()
 
+        try:
+            write_package_md5sums(root, os.path.join(controldir, 'md5sums'),
+                                  ['DEBIAN'])
+        except:
+            bb.utils.unlockfile(lf)
+            raise
+
         os.chdir(basedir)
         ret = os.system("PATH=\"%s\" fakeroot dpkg-deb -b %s %s" % (bb.data.getVar("PATH", localdata, 1), root, pkgoutdir))
         if ret != 0:
             bb.utils.unlockfile(lf)
             raise bb.build.FuncFailed("dpkg-deb execution failed")
 
-        for script in ["preinst", "postinst", "prerm", "postrm", "control" ]:
-            scriptfile = os.path.join(controldir, script)
-            try:
-                os.remove(scriptfile)
-            except OSError:
-                pass
-        try:
-            os.rmdir(controldir)
-        except OSError:
-            pass
-
+        bb.utils.prunedir(controldir)
         bb.utils.unlockfile(lf)
 }
 
 python () {
-    import bb
     if bb.data.getVar('PACKAGES', d, True) != '':
         deps = (bb.data.getVarFlag('do_package_write_deb', 'depends', d) or "").split()
         deps.append('dpkg-native:do_populate_staging')