[oe-commits] Michael Smith : package.bbclass: copy dotfiles in root D to PKGD

[git version control]

Module: openembedded.git
Branch: master
Commit: 463a4f992db344a39861bd67600e79e30fe41b18
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=463a4f992db344a39861bd67600e79e30fe41b18

Author: Michael Smith <msmith at cbnco.com>
Date:   Mon Oct 18 12:41:45 2010 -0400

package.bbclass: copy dotfiles in root D to PKGD

The previous system("cp %s/* ...") missed dotfiles/dirs at the
top-level.

Signed-off-by: Michael Smith <msmith at cbnco.com>
Signed-off-by: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>
Acked-by: Khem Raj <raj.khem at gmail.com>
Cc: Enrico Scholz <enrico.scholz at sigma-chemnitz.de>
Cc: Graham Gower <graham.gower at gmail.com>
Cc: Frans Meulenbroeks <fransmeulenbroeks at gmail.com>

---

 classes/package.bbclass |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/classes/package.bbclass b/classes/package.bbclass
index e2a61bf..2769595 100644
--- a/classes/package.bbclass
+++ b/classes/package.bbclass
@@ -356,15 +356,15 @@ python package_do_split_locales() {
 }
 
 python perform_packagecopy () {
-	dest = bb.data.getVar('D', d, True)
-	dvar = bb.data.getVar('PKGD', d, True)
+	installdest = bb.data.getVar('D', d, True)
+	pkgcopy = bb.data.getVar('PKGD', d, True)
 
-	bb.mkdirhier(dvar)
+	bb.mkdirhier(pkgcopy)
 
 	# 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))
+	os.system('rm -rf %s/*' % (pkgcopy))
+	os.system('cp -pPR %s/. %s/' % (installdest, pkgcopy))
 }
 
 python populate_packages () {