diff options
| author | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-10-18 18:16:39 +0200 |
|---|---|---|
| committer | Holger Hans Peter Freyther <zecke@selfish.org> | 2008-10-18 18:16:39 +0200 |
| commit | 245f7d129f3dba351b3c8ef284df69a86261904c (patch) | |
| tree | 258f2fcd46890f805f861094e80688e08a40bc7f /classes/package_ipk.bbclass | |
| parent | c0b6dd9b41279ff00c5a90e49108945a0fee9cdd (diff) | |
WorkInProgress: Mangle the DISTRO_PR into the package revisions
Diffstat (limited to 'classes/package_ipk.bbclass')
| -rw-r--r-- | classes/package_ipk.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index f05b7449cf..438d4a15da 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -178,7 +178,7 @@ python do_package_ipk () { pass if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1": from bb import note - note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1))) + note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), build_package_revision(localdata))) bb.utils.unlockfile(lf) continue @@ -193,9 +193,9 @@ python do_package_ipk () { fields = [] pe = bb.data.getVar('PE', d, 1) if pe and int(pe) > 0: - fields.append(["Version: %s:%s-%s\n", ['PE', 'PV', 'PR']]) + fields.append(["Version: %s:%s-%s%s\n", ['PE', 'PV', 'PR', 'DISTRO_PR']]) else: - fields.append(["Version: %s-%s\n", ['PV', 'PR']]) + fields.append(["Version: %s-%s%s\n", ['PV', 'PR', 'DISTRO_PR']]) fields.append(["Description: %s\n", ['DESCRIPTION']]) fields.append(["Section: %s\n", ['SECTION']]) fields.append(["Priority: %s\n", ['PRIORITY']]) |