diff options
| author |   Richard Purdie <rpurdie@linux.intel.com> | 2010-10-22 12:56:20 +0100 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-10-22 12:56:20 +0100 |
| commit | 13f116b1ad6a955b07d4cbaba85879913c30e1ee (patch) | |
| tree | 0784e35129dc3a05e155832c5745416cff0e7351 /meta/classes/package_rpm.bbclass | |
| parent | 6e277cb014a53aef66ae931b5142495f8a02404f (diff) | |
| download | openembedded-core-contrib-13f116b1ad6a955b07d4cbaba85879913c30e1ee.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>
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
| -rw-r--r-- | meta/classes/package_rpm.bbclass | 7 |
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 () { workdir = bb.data.getVar('WORKDIR', d, True) outdir = bb.data.getVar('DEPLOY_DIR_IPK', d, True) - dvar = bb.data.getVar('D', d, True) tmpdir = bb.data.getVar('TMPDIR', d, True) pkgd = bb.data.getVar('PKGD', d, True) pkgdest = bb.data.getVar('PKGDEST', d, True) - if not workdir or not outdir or not dvar or not tmpdir: + if not workdir or not outdir or not pkgd or not tmpdir: bb.error("Variables incorrectly set, unable to package") return - if not os.path.exists(dvar): - bb.debug(1, "Nothing installed, nothing to do") - return - packages = bb.data.getVar('PACKAGES', d, True) if not packages or packages == '': bb.debug(1, "No packages; nothing to do") |