* [PATCH 1/2] package classes: count dotfiles as non-empty
@ 2009-07-11 5:31 Michael Smith
2009-07-11 5:31 ` [PATCH 2/2] package.bbclass: preserve modes for non-empty dirs Michael Smith
2009-07-11 8:29 ` [PATCH 1/2] package classes: count dotfiles as non-empty Phil Blundell
0 siblings, 2 replies; 4+ messages in thread
From: Michael Smith @ 2009-07-11 5:31 UTC (permalink / raw)
To: openembedded-devel
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 | 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, '.'))
--
1.6.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] package.bbclass: preserve modes for non-empty dirs
2009-07-11 5:31 [PATCH 1/2] package classes: count dotfiles as non-empty Michael Smith
@ 2009-07-11 5:31 ` Michael Smith
2009-07-11 8:29 ` [PATCH 1/2] package classes: count dotfiles as non-empty Phil Blundell
1 sibling, 0 replies; 4+ messages in thread
From: Michael Smith @ 2009-07-11 5:31 UTC (permalink / raw)
To: openembedded-devel
Extend commit b1cbbae1 by setting the mode for all dirs, not just
empty dirs.
Signed-off-by: Michael Smith <msmith@cbnco.com>
---
classes/package.bbclass | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/classes/package.bbclass b/classes/package.bbclass
index f6bd7c5..fc12932 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -377,10 +377,14 @@ python populate_packages () {
file = '.' + file
if not os.path.islink(file):
if os.path.isdir(file):
+ bb.mkdirhier(os.path.join(root,file))
+ os.chmod(os.path.join(root,file),
+ os.stat(file).st_mode)
newfiles = [ os.path.join(file,x) for x in os.listdir(file) ]
if newfiles:
files += newfiles
- continue
+ continue
+
globbed = glob.glob(file)
if globbed:
if [ file ] != globbed:
@@ -395,10 +399,6 @@ python populate_packages () {
if file in seen:
continue
seen.append(file)
- if os.path.isdir(file) and not os.path.islink(file):
- bb.mkdirhier(os.path.join(root,file))
- os.chmod(os.path.join(root,file), os.stat(file).st_mode)
- continue
fpath = os.path.join(root,file)
dpath = os.path.dirname(fpath)
bb.mkdirhier(dpath)
--
1.6.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] package classes: count dotfiles as non-empty
2009-07-11 5:31 [PATCH 1/2] package classes: count dotfiles as non-empty Michael Smith
2009-07-11 5:31 ` [PATCH 2/2] package.bbclass: preserve modes for non-empty dirs Michael Smith
@ 2009-07-11 8:29 ` Phil Blundell
2009-07-13 2:25 ` Michael Smith
1 sibling, 1 reply; 4+ messages in thread
From: Phil Blundell @ 2009-07-11 8:29 UTC (permalink / raw)
To: openembedded-devel
On Sat, 2009-07-11 at 01:31 -0400, Michael Smith wrote:
> 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 | 2 +-
> classes/package_deb.bbclass | 2 +-
> classes/package_ipk.bbclass | 2 +-
> classes/package_tar.bbclass | 2 +-
> 4 files changed, 4 insertions(+), 4 deletions(-)
Thanks, I checked this in. It makes me wonder whether there is some way
that this logic could be abstracted out into package.bbclass rather than
maintained separately for each format, but I guess that's a problem for
another day.
p.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] package classes: count dotfiles as non-empty
2009-07-11 8:29 ` [PATCH 1/2] package classes: count dotfiles as non-empty Phil Blundell
@ 2009-07-13 2:25 ` Michael Smith
0 siblings, 0 replies; 4+ messages in thread
From: Michael Smith @ 2009-07-13 2:25 UTC (permalink / raw)
To: openembedded-devel
On Sat, 11 Jul 2009, Phil Blundell wrote:
> Thanks, I checked this in.
Thanks. Please ignore the second patch -- it causes lots of empty .debug
directories to appear in non-debug packages. It'd be nice if
populate_packages() could preserve the permissions of the directories
above the files it copies, but for now it's easy enough to work around in
a populate_packages_append for the rare cases where it matters.
Mike
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2009-07-13 2:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-07-11 5:31 [PATCH 1/2] package classes: count dotfiles as non-empty Michael Smith
2009-07-11 5:31 ` [PATCH 2/2] package.bbclass: preserve modes for non-empty dirs Michael Smith
2009-07-11 8:29 ` [PATCH 1/2] package classes: count dotfiles as non-empty Phil Blundell
2009-07-13 2:25 ` Michael Smith
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.