diff options
| author | Denis 'Gnutoo' Carikli <GNUtoo@no-log.org> | 2009-07-11 19:18:21 +0200 |
|---|---|---|
| committer | Denis 'Gnutoo' Carikli <GNUtoo@no-log.org> | 2009-07-11 19:18:21 +0200 |
| commit | f5444efce18c3dcf91e8e97dcf7c21d35d2b9337 (patch) | |
| tree | 6e8819e4a042d5c6e07250864ae2ae646aecff90 /classes | |
| parent | a0c04025a9f6cc94ed47db39bf20897b4f01644e (diff) | |
| parent | 10e9113ea840ac9bafa5a4239efbadb8dd287e97 (diff) | |
Merge branch 'org.openembedded.dev' of git://git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/package.bbclass | 2 | ||||
| -rw-r--r-- | classes/package_deb.bbclass | 2 | ||||
| -rw-r--r-- | classes/package_ipk.bbclass | 2 | ||||
| -rw-r--r-- | classes/package_tar.bbclass | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass index 3360dcb2de..f6bd7c5b4a 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 5127d32f33..e5339a9064 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 1f1b5c9a79..e3a7522619 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 76f48ca429..cb70a5fae8 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, '.')) |