diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-03-29 13:10:58 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-03-29 13:10:58 +0000 |
| commit | 136fd5b056088e2f71e2baf9b17a623575e856e8 (patch) | |
| tree | 539f2e55d5ee7d4fceb4aaac19021cfb09f2913e /classes | |
| parent | 422076569aeb070ddd92af6650231aeadf75b159 (diff) | |
| parent | d1406ee2bd3dcb5136d2d96daefd1e93505eaac6 (diff) | |
merge of '33a1439ed0925b6fdb7b29081cfb7c2481aebdd3'
and 'c3806da7db88d5cd14b6cc7ed62c575f1269f6d4'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/package_deb.bbclass | 6 | ||||
| -rw-r--r-- | classes/package_ipk.bbclass | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass index 9697426d5d..388f9819bd 100644 --- a/classes/package_deb.bbclass +++ b/classes/package_deb.bbclass @@ -138,7 +138,11 @@ 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']]) diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 70bcdf6b7f..19c082d978 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -142,7 +142,11 @@ python do_package_ipk () { 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']]) |