diff options
| author |   Michael Smith <msmith@cbnco.com> | 2010-10-18 08:05:42 -0400 |
|---|---|---|
| committer | Michael Smith <msmith@cbnco.com> | 2010-10-18 08:05:42 -0400 |
| commit | cdb6be238adaf57a57ea41cc6ba1777773f52502 (patch) | |
| tree | 4cdc42e4d39d69d28799a50f7e680624a71d2d34 /classes | |
| parent | 91283c97244b2c7885e7f7d8188b0d8aaa0d4951 (diff) | |
| download | openembedded-cdb6be238adaf57a57ea41cc6ba1777773f52502.tar.gz | |
Revert "package.bbclass: copy dotfiles in root D to PKGD"
This reverts commit 5fc5e69f026bccc43cb5e5a46da63e3dd148be3d.
lirc do_package was hanging because shutil.copytree() doesn't handle
named pipes.
Thread:
http://news.gmane.org/find-root.php?message_id=%3cAANLkTikYuii4mEWxWh7HahgFVzYgaUz%2dDADyUyibqa4d%40mail.gmail.com%3e
http://bugs.python.org/issue3002
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/package.bbclass | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/classes/package.bbclass b/classes/package.bbclass index 6a290eea5e..e2a61bf3a7 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -356,20 +356,15 @@ python package_do_split_locales() { } python perform_packagecopy () { - import shutil - - installdest = bb.data.getVar('D', d, True) - pkgcopy = bb.data.getVar('PKGD', d, True) + dest = bb.data.getVar('D', d, True) + dvar = bb.data.getVar('PKGD', d, True) - # Start package population by taking a copy of the installed - # files to operate on. Create missing parent directories of - # pkgcopy first (shutil.copytree() does this automatically but only - # in Python 2.5+). - bb.mkdirhier(pkgcopy) - shutil.rmtree(pkgcopy, True) + bb.mkdirhier(dvar) - # Preserve symlinks. - shutil.copytree(installdest, pkgcopy, symlinks=True) + # Start by package population by taking a copy of the installed + # files to operate on + os.system('rm -rf %s/*' % (dvar)) + os.system('cp -pPR %s/* %s/' % (dest, dvar)) } python populate_packages () { |