package classes: count dotfiles as non-empty
authorMichael Smith <msmith@cbnco.com>
Sat, 11 Jul 2009 05:31:06 +0000 (01:31 -0400)
committerPhil Blundell <philb@gnu.org>
Sat, 11 Jul 2009 08:29:11 +0000 (09:29 +0100)
Allow a package to be built that contains only dotfiles or
dot directories under '/'.

Signed-off-by: Michael Smith <msmith@cbnco.com>
classes/package.bbclass
classes/package_deb.bbclass
classes/package_ipk.bbclass
classes/package_tar.bbclass

index 3360dcb..f6bd7c5 100644 (file)
@@ -539,7 +539,7 @@ python emit_pkgdata() {
                        allow_empty = bb.data.getVar('ALLOW_EMPTY', d, 1)
                root = "%s/install/%s" % (workdir, pkg)
                os.chdir(root)
-               g = glob('*')
+               g = glob('*') + glob('.[!.]*')
                if g or allow_empty == "1":
                        packagedfile = pkgdatadir + '/runtime/%s.packaged' % pkg
                        file(packagedfile, 'w').close()
index 5127d32..e5339a9 100644 (file)
@@ -130,7 +130,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')]
index 1f1b5c9..e3a7522 100644 (file)
@@ -186,7 +186,7 @@ python do_package_ipk () {
                bb.mkdirhier(pkgoutdir)
                os.chdir(root)
                from glob import glob
-               g = glob('*')
+               g = glob('*') + glob('.[!.]*')
                try:
                        del g[g.index('CONTROL')]
                        del g[g.index('./CONTROL')]
index 76f48ca..cb70a5f 100644 (file)
@@ -84,7 +84,7 @@ python do_package_tar () {
                tarfn = bb.data.getVar('PKGFN', localdata, 1)
                os.chdir(root)
                from glob import glob
-               if not glob('*'):
+               if not glob('*') + glob('.[!.]*'):
                        bb.note("Not creating empty archive for %s-%s" % (pkg, bb.data.expand('${PV}-${PR}${DISTRO_PR}', d, True)))
                        continue
                ret = os.system("tar -czf %s %s" % (tarfn, '.'))