[oe-commits] org.oe.dev packaged-staging.bbclass: Put ipk/deb files in the correct directories
rpurdie commit
oe at amethyst.openembedded.net
Fri Mar 28 17:15:07 UTC 2008
packaged-staging.bbclass: Put ipk/deb files in the correct directories
Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 5b6dcfdf9baa0245dd7475bb40c1ffec9aa2b753
ViewMTN: http://monotone.openembedded.org/revision/info/5b6dcfdf9baa0245dd7475bb40c1ffec9aa2b753
Files:
1
classes/packaged-staging.bbclass
Diffs:
#
# mt diff -r4c5ff2d2d2cef2221b5b390b8ea792221e754584 -r5b6dcfdf9baa0245dd7475bb40c1ffec9aa2b753
#
#
#
# patch "classes/packaged-staging.bbclass"
# from [569c1cd9a850336fcc5f596fc1e32a5f8252576c]
# to [af2dc7a8ccc45ac795724160291eddb776b619b5]
#
============================================================
--- classes/packaged-staging.bbclass 569c1cd9a850336fcc5f596fc1e32a5f8252576c
+++ classes/packaged-staging.bbclass af2dc7a8ccc45ac795724160291eddb776b619b5
@@ -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
More information about the Openembedded-commits
mailing list