summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-10-22 12:56:20 +0100
committerSaul Wold <Saul.Wold@intel.com>2010-10-22 11:13:22 -0700
commit73be41e4758949c635ace76603d61f16b9c76753 (patch)
tree02bec92bf7a868cf069bcbb9e2547c3da779330c
parentb96412845dd03f76539cc2f2cdcc08ddb090e17b (diff)
downloadpoky-73be41e4758949c635ace76603d61f16b9c76753.tar.gz
package_rpm: Don't check for the existence of dvar as its never used
If a sstate package exists for the package task but not for the rpm packaging task, the output from the package task will be used. The directory pointed to by dvar will not exist under this scenario. Since the directory is never used by the packaging process remove the check, substituting the pkgd variable which is always present and used. Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/classes/package_rpm.bbclass7
1 files changed, 1 insertions, 6 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index b31830f945..0af93e7b74 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -437,18 +437,13 @@ python do_package_rpm () {
437 437
438 workdir = bb.data.getVar('WORKDIR', d, True) 438 workdir = bb.data.getVar('WORKDIR', d, True)
439 outdir = bb.data.getVar('DEPLOY_DIR_IPK', d, True) 439 outdir = bb.data.getVar('DEPLOY_DIR_IPK', d, True)
440 dvar = bb.data.getVar('D', d, True)
441 tmpdir = bb.data.getVar('TMPDIR', d, True) 440 tmpdir = bb.data.getVar('TMPDIR', d, True)
442 pkgd = bb.data.getVar('PKGD', d, True) 441 pkgd = bb.data.getVar('PKGD', d, True)
443 pkgdest = bb.data.getVar('PKGDEST', d, True) 442 pkgdest = bb.data.getVar('PKGDEST', d, True)
444 if not workdir or not outdir or not dvar or not tmpdir: 443 if not workdir or not outdir or not pkgd or not tmpdir:
445 bb.error("Variables incorrectly set, unable to package") 444 bb.error("Variables incorrectly set, unable to package")
446 return 445 return
447 446
448 if not os.path.exists(dvar):
449 bb.debug(1, "Nothing installed, nothing to do")
450 return
451
452 packages = bb.data.getVar('PACKAGES', d, True) 447 packages = bb.data.getVar('PACKAGES', d, True)
453 if not packages or packages == '': 448 if not packages or packages == '':
454 bb.debug(1, "No packages; nothing to do") 449 bb.debug(1, "No packages; nothing to do")