diff options
| -rw-r--r-- | meta/classes/packaged-staging.bbclass | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass index 66197b7e9c..a98b4a71a5 100644 --- a/meta/classes/packaged-staging.bbclass +++ b/meta/classes/packaged-staging.bbclass | |||
| @@ -41,6 +41,8 @@ PSTAGE_NATIVEDEPENDS = "\ | |||
| 41 | stagemanager-native \ | 41 | stagemanager-native \ |
| 42 | " | 42 | " |
| 43 | 43 | ||
| 44 | BB_STAMP_WHITELIST = "${PSTAGE_NATIVEDEPENDS}" | ||
| 45 | |||
| 44 | python () { | 46 | python () { |
| 45 | import bb | 47 | import bb |
| 46 | pstage_allowed = True | 48 | pstage_allowed = True |
| @@ -307,11 +309,10 @@ python do_package_stage () { | |||
| 307 | if bb.data.inherits_class('package_ipk', d): | 309 | if bb.data.inherits_class('package_ipk', d): |
| 308 | srcname = bb.data.expand(pkgname + "_${PV}-" + pr + "_" + arch + ".ipk", d) | 310 | srcname = bb.data.expand(pkgname + "_${PV}-" + pr + "_" + arch + ".ipk", d) |
| 309 | srcfile = bb.data.expand("${DEPLOY_DIR_IPK}/" + arch + "/" + srcname, d) | 311 | srcfile = bb.data.expand("${DEPLOY_DIR_IPK}/" + arch + "/" + srcname, d) |
| 310 | if not os.path.exists(srcfile): | 312 | if os.path.exists(srcfile): |
| 311 | bb.fatal("Package %s does not exist yet it should" % srcfile) | 313 | destpath = ipkpath + "/" + arch + "/" |
| 312 | destpath = ipkpath + "/" + arch + "/" | 314 | bb.mkdirhier(destpath) |
| 313 | bb.mkdirhier(destpath) | 315 | bb.copyfile(srcfile, destpath + srcname) |
| 314 | bb.copyfile(srcfile, destpath + srcname) | ||
| 315 | 316 | ||
| 316 | if bb.data.inherits_class('package_deb', d): | 317 | if bb.data.inherits_class('package_deb', d): |
| 317 | if arch == 'all': | 318 | if arch == 'all': |
| @@ -319,11 +320,10 @@ python do_package_stage () { | |||
| 319 | else: | 320 | else: |
| 320 | srcname = bb.data.expand(pkgname + "_${PV}-" + pr + "_${DPKG_ARCH}.deb", d) | 321 | srcname = bb.data.expand(pkgname + "_${PV}-" + pr + "_${DPKG_ARCH}.deb", d) |
| 321 | srcfile = bb.data.expand("${DEPLOY_DIR_DEB}/" + arch + "/" + srcname, d) | 322 | srcfile = bb.data.expand("${DEPLOY_DIR_DEB}/" + arch + "/" + srcname, d) |
| 322 | if not os.path.exists(srcfile): | 323 | if os.path.exists(srcfile): |
| 323 | bb.fatal("Package %s does not exist yet it should" % srcfile) | 324 | destpath = debpath + "/" + arch + "/" |
| 324 | destpath = debpath + "/" + arch + "/" | 325 | bb.mkdirhier(destpath) |
| 325 | bb.mkdirhier(destpath) | 326 | bb.copyfile(srcfile, destpath + srcname) |
| 326 | bb.copyfile(srcfile, destpath + srcname) | ||
| 327 | 327 | ||
| 328 | # | 328 | # |
| 329 | # Handle stamps/ files | 329 | # Handle stamps/ files |
| @@ -333,7 +333,7 @@ python do_package_stage () { | |||
| 333 | bb.mkdirhier(destdir) | 333 | bb.mkdirhier(destdir) |
| 334 | # We need to include the package_stage stamp in the staging package so create one | 334 | # We need to include the package_stage stamp in the staging package so create one |
| 335 | bb.build.make_stamp("do_package_stage", d) | 335 | bb.build.make_stamp("do_package_stage", d) |
| 336 | os.system("cp %s.do_* %s/" % (stampfn, destdir)) | 336 | os.system("cp -dpR %s.do_* %s/" % (stampfn, destdir)) |
| 337 | 337 | ||
| 338 | bb.build.exec_func("staging_helper", d) | 338 | bb.build.exec_func("staging_helper", d) |
| 339 | bb.build.exec_func("staging_packager", d) | 339 | bb.build.exec_func("staging_packager", d) |
