diff options
author | Lianhao Lu <lianhao.lu@intel.com> | 2011-05-19 10:17:43 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-27 17:55:49 +0100 |
commit | 16f06f7135db18fcabd7e3f320fcfa88bfb5ae15 (patch) | |
tree | b7f981f612e55feefeff15f270d2c2b3590e8c1e /meta/classes/package_deb.bbclass | |
parent | 66d27435beb471d883355cc942f1d4489ebdad68 (diff) | |
download | poky-16f06f7135db18fcabd7e3f320fcfa88bfb5ae15.tar.gz |
classes/package_xxx.class: Use PKGE/PKGV/PKGR.
Use PKGE/PKGV/PKGR to build various package feed in tasks of pacakge_write_xxx.
(From OE-Core rev: c2872315905fcdf6e4bf11fe96e5ca62af3475f8)
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package_deb.bbclass')
-rw-r--r-- | meta/classes/package_deb.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 000d9ee8dc..fb502cbc99 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass | |||
@@ -272,7 +272,7 @@ python do_package_deb () { | |||
272 | except ValueError: | 272 | except ValueError: |
273 | pass | 273 | pass |
274 | if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1": | 274 | if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1": |
275 | bb.note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, True), bb.data.getVar('PR', localdata, True))) | 275 | bb.note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PKGV', localdata, True), bb.data.getVar('PKGR', localdata, True))) |
276 | bb.utils.unlockfile(lf) | 276 | bb.utils.unlockfile(lf) |
277 | continue | 277 | continue |
278 | 278 | ||
@@ -288,11 +288,11 @@ python do_package_deb () { | |||
288 | raise bb.build.FuncFailed("unable to open control file for writing.") | 288 | raise bb.build.FuncFailed("unable to open control file for writing.") |
289 | 289 | ||
290 | fields = [] | 290 | fields = [] |
291 | pe = bb.data.getVar('PE', d, True) | 291 | pe = bb.data.getVar('PKGE', d, True) |
292 | if pe and int(pe) > 0: | 292 | if pe and int(pe) > 0: |
293 | fields.append(["Version: %s:%s-%s\n", ['PE', 'PV', 'PR']]) | 293 | fields.append(["Version: %s:%s-%s\n", ['PKGE', 'PKGV', 'PKGR']]) |
294 | else: | 294 | else: |
295 | fields.append(["Version: %s-%s\n", ['PV', 'PR']]) | 295 | fields.append(["Version: %s-%s\n", ['PKGV', 'PKGR']]) |
296 | fields.append(["Description: %s\n", ['DESCRIPTION']]) | 296 | fields.append(["Description: %s\n", ['DESCRIPTION']]) |
297 | fields.append(["Section: %s\n", ['SECTION']]) | 297 | fields.append(["Section: %s\n", ['SECTION']]) |
298 | fields.append(["Priority: %s\n", ['PRIORITY']]) | 298 | fields.append(["Priority: %s\n", ['PRIORITY']]) |