diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2008-03-28 17:12:42 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2008-03-28 17:12:42 +0000 |
| commit | e71991698d74fe738094be8f9a4a73b4e5cd8c51 (patch) | |
| tree | daaf2034912d415a76a27609b0c2bfcfdb936e47 /classes | |
| parent | 60e75ce2dd9170eba0d649ca7a5cd1f9a5f19a64 (diff) | |
packaged-staging.bbclass: Put ipk/deb files in the correct directories
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/packaged-staging.bbclass | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index 1c717b415e..ddd97ffe6d 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -257,10 +257,8 @@ python do_package_stage () { if len(packages) > 0: if bb.data.inherits_class('package_ipk', d): ipkpath = bb.data.getVar('DEPLOY_DIR_IPK', d, True).replace(tmpdir, stagepath) - bb.mkdirhier(ipkpath) if bb.data.inherits_class('package_deb', d): debpath = bb.data.getVar('DEPLOY_DIR_DEB', d, True).replace(tmpdir, stagepath) - bb.mkdirhier(debpath) for pkg in packages: pkgname = bb.data.getVar('PKG_%s' % pkg, d, 1) @@ -279,7 +277,10 @@ python do_package_stage () { srcfile = bb.data.expand("${DEPLOY_DIR_IPK}/" + arch + "/" + srcname, d) if not os.path.exists(srcfile): bb.fatal("Package %s does not exist yet it should" % srcfile) - bb.copyfile(srcfile, ipkpath + "/" + srcname) + destpath = ipkpath + "/" + arch + "/" + bb.mkdirhier(destpath) + bb.copyfile(srcfile, destpath + srcname) + if bb.data.inherits_class('package_deb', d): if arch == 'all': srcname = bb.data.expand(pkgname + "_${PV}-" + pr + "_all.deb", d) @@ -288,7 +289,9 @@ python do_package_stage () { srcfile = bb.data.expand("${DEPLOY_DIR_DEB}/" + arch + "/" + srcname, d) if not os.path.exists(srcfile): bb.fatal("Package %s does not exist yet it should" % srcfile) - bb.copyfile(srcfile, debpath + "/" + srcname) + destpath = debpath + "/" + arch + "/" + bb.mkdirhier(destpath) + bb.copyfile(srcfile, destpath + srcname) # # Handle stamps/ files |