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

3 files changed, 14 insertions, 5 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
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 334148219b..0cdd941f41 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -141,13 +141,17 @@ 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']])
                 fields.append(["Maintainer: %s\n", ['MAINTAINER']])
                 fields.append(["Architecture: %s\n", ['PACKAGE_ARCH']])
-                fields.append(["OE: %s\n", ['P']])
+                fields.append(["OE: %s\n", ['PN']])
                 fields.append(["Homepage: %s\n", ['HOMEPAGE']])
 
                 def pullData(l, d):
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index cb5069ab67..296f2c9abd 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -82,7 +82,8 @@ ASSUME_PROVIDED = "cvs-native svn-native bzip2-native diffstat-native patch-nati
 PN = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0] or 'defaultpkgname'}"
 PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1.0'}"
 PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}"
-PF = "${PN}-${PV}-${PR}"
+PF = "${PN}-${EXTENDPE}${PV}-${PR}"
+EXTENDPE = "${@['','${PE\x7d_'][bb.data.getVar('PE',d,1) > 0]}"
 P = "${PN}-${PV}"
 
 # Package info.