[oe-commits] org.oe.dev bitbake.conf: Set verion dependencies of -dbg and -dev packages more correctly (from Poky)

[rpurdie commit]

bitbake.conf: Set verion dependencies of -dbg and -dev packages more correctly (from Poky)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 6bfc2ae8e41cfdc650adb742d0b9959952a88c9e
ViewMTN: http://monotone.openembedded.org/revision/info/6bfc2ae8e41cfdc650adb742d0b9959952a88c9e
Files:
1
conf/bitbake.conf
Diffs:

#
# mt diff -rf685529b729d043eda09b16df494e6b6e3670b52 -r6bfc2ae8e41cfdc650adb742d0b9959952a88c9e
#
# 
# 
# patch "conf/bitbake.conf"
#  from [8f16ea0cf38da032893952e183028d445464eedb]
#    to [96dc19c09efab3d59ce99ccc5fdceaf3cf20a61d]
# 
============================================================
--- conf/bitbake.conf	8f16ea0cf38da032893952e183028d445464eedb
+++ conf/bitbake.conf	96dc19c09efab3d59ce99ccc5fdceaf3cf20a61d
@@ -118,6 +118,8 @@ EXTENDPE = "${@['','${PE\x7d_'][bb.data.
 PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}"
 PF = "${PN}-${EXTENDPE}${PV}-${PR}"
 EXTENDPE = "${@['','${PE\x7d_'][bb.data.getVar('PE',d,1) > 0]}"
+EXTENDPEVER = "${@['','${PE\x7d:'][bb.data.getVar('PE',d,1) > 0]}"
+DEBPV = "${EXTENDPEVER}${PV}-${PR}"
 P = "${PN}-${PV}"
 
 # Package info.
@@ -163,14 +165,14 @@ ALLOW_EMPTY_${PN}-dev = "1"
                 ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
 SECTION_${PN}-dev = "devel"
 ALLOW_EMPTY_${PN}-dev = "1"
-RDEPENDS_${PN}-dev = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}"
+RDEPENDS_${PN}-dev = "${@['', '${PN} (>= ${DEBPV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}"
 
 FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \
             ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug ${libdir}/${PN}/.debug \
             ${libdir}/matchbox-panel/.debug"
 SECTION_${PN}-dbg = "devel"
 ALLOW_EMPTY_${PN}-dbg = "1"
-RRECOMMENDS_${PN}-dbg = "${@['', '${PN} (>= ${PV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}"
+RRECOMMENDS_${PN}-dbg = "${@['', '${PN} (>= ${DEBPV})'][packaged(bb.data.getVar('PN', d, 1), d) == True]}"
 
 FILES_${PN}-locale = "${datadir}/locale"