aboutsummaryrefslogtreecommitdiffstats
path: root/classes/package_rpm.bbclass
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2008-10-18 18:16:39 +0200
committerHolger Hans Peter Freyther <zecke@selfish.org>2008-10-18 18:16:39 +0200
commit245f7d129f3dba351b3c8ef284df69a86261904c (patch)
tree258f2fcd46890f805f861094e80688e08a40bc7f /classes/package_rpm.bbclass
parentc0b6dd9b41279ff00c5a90e49108945a0fee9cdd (diff)
downloadopenembedded-245f7d129f3dba351b3c8ef284df69a86261904c.tar.gz
openembedded-245f7d129f3dba351b3c8ef284df69a86261904c.tar.bz2
openembedded-245f7d129f3dba351b3c8ef284df69a86261904c.zip
WorkInProgress: Mangle the DISTRO_PR into the package revisions
Diffstat (limited to 'classes/package_rpm.bbclass')
-rw-r--r--classes/package_rpm.bbclass8
1 files changed, 4 insertions, 4 deletions
diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
index 6713f8fcad..e10ad90ffc 100644
--- a/classes/package_rpm.bbclass
+++ b/classes/package_rpm.bbclass
@@ -10,7 +10,6 @@ python write_specfile() {
out_vartranslate = {
"PKG": "Name",
"PV": "Version",
- "PR": "Release",
"DESCRIPTION": "%description",
"ROOT": "BuildRoot",
"LICENSE": "License",
@@ -41,7 +40,7 @@ python write_specfile() {
pass
if not files:
from bb import note
- note("Not creating empty archive for %s-%s-%s" % (bb.data.getVar('PKG',d, 1), bb.data.getVar('PV', d, 1), bb.data.getVar('PR', d, 1)))
+ note("Not creating empty archive for %s-%s-%s" % (bb.data.getVar('PKG',d, 1), bb.data.getVar('PV', d, 1), build_package_revision(d)))
return
# output .spec using this metadata store
@@ -58,6 +57,7 @@ python write_specfile() {
if out_vartranslate[var][0] == "%":
continue
fd.write("%s\t: %s\n" % (out_vartranslate[var], bb.data.getVar(var, d)))
+ fd.write("Release\t: %s\n" % build_package_revision(d))
fd.write("Summary\t: .\n")
for var in out_vartranslate.keys():
@@ -79,8 +79,8 @@ python write_specfile() {
bb.build.exec_func('BUILDSPEC', d)
# move the rpm into the pkgoutdir
- rpm = bb.data.expand('${RPMBUILDPATH}/RPMS/${TARGET_ARCH}/${PKG}-${PV}-${PR}.${TARGET_ARCH}.rpm', d)
- outrpm = bb.data.expand('${DEPLOY_DIR_RPM}/${PKG}-${PV}-${PR}.${TARGET_ARCH}.rpm', d)
+ rpm = bb.data.expand('${RPMBUILDPATH}/RPMS/${TARGET_ARCH}/${PKG}-${PV}-${PR}${DISTRO_PR}.${TARGET_ARCH}.rpm', d)
+ outrpm = bb.data.expand('${DEPLOY_DIR_RPM}/${PKG}-${PV}-${PR}${DISTRO_PR}.${TARGET_ARCH}.rpm', d)
bb.movefile(rpm, outrpm)
}