summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-05-31 22:51:19 +0000
committerRichard Purdie <richard@openedhand.com>2007-05-31 22:51:19 +0000
commitc9dc5f07a7bbeb74b625c5114ea2bfbc94ccc69f (patch)
tree1962c4a32b81b6540ea00671c4ea61975a705f88 /meta
parent8a5b785a6de3cab51c553edbdddf2c6cf690d1e1 (diff)
downloadpoky-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')
-rw-r--r--meta/classes/package_deb.bbclass8
-rw-r--r--meta/classes/package_ipk.bbclass8
-rw-r--r--meta/conf/bitbake.conf3
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 () {
141 raise bb.build.FuncFailed("unable to open control file for writing.") 141 raise bb.build.FuncFailed("unable to open control file for writing.")
142 142
143 fields = [] 143 fields = []
144 fields.append(["Version: %s-%s\n", ['PV', 'PR']]) 144 pe = bb.data.getVar('PE', d, 1)
145 if pe and int(pe) > 0:
146 fields.append(["Version: %s:%s-%s\n", ['PE', 'PV', 'PR']])
147 else:
148 fields.append(["Version: %s-%s\n", ['PV', 'PR']])
145 fields.append(["Description: %s\n", ['DESCRIPTION']]) 149 fields.append(["Description: %s\n", ['DESCRIPTION']])
146 fields.append(["Section: %s\n", ['SECTION']]) 150 fields.append(["Section: %s\n", ['SECTION']])
147 fields.append(["Priority: %s\n", ['PRIORITY']]) 151 fields.append(["Priority: %s\n", ['PRIORITY']])
148 fields.append(["Maintainer: %s\n", ['MAINTAINER']]) 152 fields.append(["Maintainer: %s\n", ['MAINTAINER']])
149 fields.append(["Architecture: %s\n", ['TARGET_ARCH']]) 153 fields.append(["Architecture: %s\n", ['TARGET_ARCH']])
150 fields.append(["OE: %s\n", ['P']]) 154 fields.append(["OE: %s\n", ['PN']])
151 fields.append(["Homepage: %s\n", ['HOMEPAGE']]) 155 fields.append(["Homepage: %s\n", ['HOMEPAGE']])
152 156
153# Package, Version, Maintainer, Description - mandatory 157# 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 () {
141 raise bb.build.FuncFailed("unable to open control file for writing.") 141 raise bb.build.FuncFailed("unable to open control file for writing.")
142 142
143 fields = [] 143 fields = []
144 fields.append(["Version: %s-%s\n", ['PV', 'PR']]) 144 pe = bb.data.getVar('PE', d, 1)
145 if pe and int(pe) > 0:
146 fields.append(["Version: %s:%s-%s\n", ['PE', 'PV', 'PR']])
147 else:
148 fields.append(["Version: %s-%s\n", ['PV', 'PR']])
145 fields.append(["Description: %s\n", ['DESCRIPTION']]) 149 fields.append(["Description: %s\n", ['DESCRIPTION']])
146 fields.append(["Section: %s\n", ['SECTION']]) 150 fields.append(["Section: %s\n", ['SECTION']])
147 fields.append(["Priority: %s\n", ['PRIORITY']]) 151 fields.append(["Priority: %s\n", ['PRIORITY']])
148 fields.append(["Maintainer: %s\n", ['MAINTAINER']]) 152 fields.append(["Maintainer: %s\n", ['MAINTAINER']])
149 fields.append(["Architecture: %s\n", ['PACKAGE_ARCH']]) 153 fields.append(["Architecture: %s\n", ['PACKAGE_ARCH']])
150 fields.append(["OE: %s\n", ['P']]) 154 fields.append(["OE: %s\n", ['PN']])
151 fields.append(["Homepage: %s\n", ['HOMEPAGE']]) 155 fields.append(["Homepage: %s\n", ['HOMEPAGE']])
152 156
153 def pullData(l, d): 157 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
82PN = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0] or 'defaultpkgname'}" 82PN = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0] or 'defaultpkgname'}"
83PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1.0'}" 83PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1.0'}"
84PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}" 84PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}"
85PF = "${PN}-${PV}-${PR}" 85PF = "${PN}-${EXTENDPE}${PV}-${PR}"
86EXTENDPE = "${@['','${PE\x7d_'][bb.data.getVar('PE',d,1) > 0]}"
86P = "${PN}-${PV}" 87P = "${PN}-${PV}"
87 88
88# Package info. 89# Package info.