summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorDongxiao Xu <dongxiao.xu@intel.com>2011-01-21 13:51:11 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-21 16:44:09 +0000
commit9e7eb5955af578256e5ccd6a45406f4fa6220dde (patch)
treee5a15cf62f7031b36d3f8bf92e26c0734e2af4dc /meta/classes
parentf3677d679e5c74f9877f36cdb170bbfea9b7b9bb (diff)
downloadpoky-9e7eb5955af578256e5ccd6a45406f4fa6220dde.tar.gz
package_ipk: Do not depend on the existence of "D" to create ipk package
If build from sstate results, the ${D} will not be installed. In this case the creation of ipk package will be skipped, which will cause the build failure. Fix the issue by removing the judgement of ${D} existence. Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/package_ipk.bbclass7
1 files changed, 1 insertions, 6 deletions
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 5ddd6c66ea..fdf326205b 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -133,17 +133,12 @@ python do_package_ipk () {
133 133
134 workdir = bb.data.getVar('WORKDIR', d, True) 134 workdir = bb.data.getVar('WORKDIR', d, True)
135 outdir = bb.data.getVar('PKGWRITEDIRIPK', d, True) 135 outdir = bb.data.getVar('PKGWRITEDIRIPK', d, True)
136 dvar = bb.data.getVar('D', d, True)
137 tmpdir = bb.data.getVar('TMPDIR', d, True) 136 tmpdir = bb.data.getVar('TMPDIR', d, True)
138 pkgdest = bb.data.getVar('PKGDEST', d, True) 137 pkgdest = bb.data.getVar('PKGDEST', d, True)
139 if not workdir or not outdir or not dvar or not tmpdir: 138 if not workdir or not outdir or not tmpdir:
140 bb.error("Variables incorrectly set, unable to package") 139 bb.error("Variables incorrectly set, unable to package")
141 return 140 return
142 141
143 if not os.path.exists(dvar):
144 bb.debug(1, "Nothing installed, nothing to do")
145 return
146
147 packages = bb.data.getVar('PACKAGES', d, True) 142 packages = bb.data.getVar('PACKAGES', d, True)
148 if not packages or packages == '': 143 if not packages or packages == '':
149 bb.debug(1, "No packages; nothing to do") 144 bb.debug(1, "No packages; nothing to do")