[oe-commits] Michael Smith : package classes: count dotfiles as non-empty

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: f0d8b8301f8a3c9f8ef73b3d5a876d341b8b3370
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=f0d8b8301f8a3c9f8ef73b3d5a876d341b8b3370

Author: Michael Smith <msmith at cbnco.com>
Date:   Sat Jul 11 01:31:06 2009 -0400

package classes: count dotfiles as non-empty

Allow a package to be built that contains only dotfiles or
dot directories under '/'.

Signed-off-by: Michael Smith <msmith at cbnco.com>

---

 classes/package.bbclass     |    2 +-
 classes/package_deb.bbclass |    2 +-
 classes/package_ipk.bbclass |    2 +-
 classes/package_tar.bbclass |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/classes/package.bbclass b/classes/package.bbclass
index 3360dcb..f6bd7c5 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -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()
diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass
index 5127d32..e5339a9 100644
--- a/classes/package_deb.bbclass
+++ b/classes/package_deb.bbclass
@@ -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')]
diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass
index 1f1b5c9..e3a7522 100644
--- a/classes/package_ipk.bbclass
+++ b/classes/package_ipk.bbclass
@@ -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')]
diff --git a/classes/package_tar.bbclass b/classes/package_tar.bbclass
index 76f48ca..cb70a5f 100644
--- a/classes/package_tar.bbclass
+++ b/classes/package_tar.bbclass
@@ -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, '.'))