diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-15 14:46:11 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-15 14:46:11 +0100 |
| commit | 58884fc059504abafc9126613a7049464ba701e7 (patch) | |
| tree | 61030608675a792923aff657516c48a6a2048693 /classes/package_ipk.bbclass | |
| parent | 75820363234db9d6335997658c6f606654d1588c (diff) | |
| parent | 47d6cb217ff161738488f4f82af9dd8f8c616ce0 (diff) | |
| download | openembedded-58884fc059504abafc9126613a7049464ba701e7.tar.gz | |
Merge commit 'origin/org.openembedded.dev' into martin_jansa/xorg-7.5
Conflicts:
conf/distro/include/angstrom-2008-preferred-versions.inc
Diffstat (limited to 'classes/package_ipk.bbclass')
| -rw-r--r-- | classes/package_ipk.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 3582195393..420c892f10 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -208,9 +208,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%s\n", ['PE', 'PV', 'PR', 'DISTRO_PR']]) + fields.append(["Version: %s:%s-%s\n", ['PE', 'PKGV', 'PKGR']]) else: - fields.append(["Version: %s-%s%s\n", ['PV', 'PR', 'DISTRO_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']]) |