diff options
| author |   Richard Purdie <richard@openedhand.com> | 2007-05-31 22:51:19 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2007-05-31 22:51:19 +0000 |
| commit | c9dc5f07a7bbeb74b625c5114ea2bfbc94ccc69f (patch) | |
| tree | 1962c4a32b81b6540ea00671c4ea61975a705f88 /meta/classes/package_deb.bbclass | |
| parent | 8a5b785a6de3cab51c553edbdddf2c6cf690d1e1 (diff) | |
| download | openembedded-core-contrib-c9dc5f07a7bbeb74b625c5114ea2bfbc94ccc69f.tar.gz | |
classes/conf: Merge missing package epoch (PE) support (from OE), also make OE package field sane
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1839 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta/classes/package_deb.bbclass')
| -rw-r--r-- | meta/classes/package_deb.bbclass | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 907fbd9ebf..655c700c3f 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass @@ -141,13 +141,17 @@ python do_package_deb () { raise bb.build.FuncFailed("unable to open control file for writing.") fields = [] - fields.append(["Version: %s-%s\n", ['PV', 'PR']]) + pe = bb.data.getVar('PE', d, 1) + if pe and int(pe) > 0: + fields.append(["Version: %s:%s-%s\n", ['PE', 'PV', 'PR']]) + else: + fields.append(["Version: %s-%s\n", ['PV', 'PR']]) fields.append(["Description: %s\n", ['DESCRIPTION']]) fields.append(["Section: %s\n", ['SECTION']]) fields.append(["Priority: %s\n", ['PRIORITY']]) fields.append(["Maintainer: %s\n", ['MAINTAINER']]) fields.append(["Architecture: %s\n", ['TARGET_ARCH']]) - fields.append(["OE: %s\n", ['P']]) + fields.append(["OE: %s\n", ['PN']]) fields.append(["Homepage: %s\n", ['HOMEPAGE']]) # Package, Version, Maintainer, Description - mandatory |