From 16f06f7135db18fcabd7e3f320fcfa88bfb5ae15 Mon Sep 17 00:00:00 2001 From: Lianhao Lu Date: Thu, 19 May 2011 10:17:43 +0800 Subject: 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 Signed-off-by: Richard Purdie --- meta/classes/package_deb.bbclass | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'meta/classes/package_deb.bbclass') 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 () { except ValueError: pass if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1": - bb.note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, True), bb.data.getVar('PR', localdata, True))) + bb.note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PKGV', localdata, True), bb.data.getVar('PKGR', localdata, True))) bb.utils.unlockfile(lf) continue @@ -288,11 +288,11 @@ python do_package_deb () { raise bb.build.FuncFailed("unable to open control file for writing.") fields = [] - pe = bb.data.getVar('PE', d, True) + pe = bb.data.getVar('PKGE', d, True) if pe and int(pe) > 0: - fields.append(["Version: %s:%s-%s\n", ['PE', 'PV', 'PR']]) + fields.append(["Version: %s:%s-%s\n", ['PKGE', 'PKGV', 'PKGR']]) else: - fields.append(["Version: %s-%s\n", ['PV', 'PR']]) + fields.append(["Version: %s-%s\n", ['PKGV', 'PKGR']]) fields.append(["Description: %s\n", ['DESCRIPTION']]) fields.append(["Section: %s\n", ['SECTION']]) fields.append(["Priority: %s\n", ['PRIORITY']]) -- cgit v1.2.3-54-g00ecf