diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2007-11-17 23:22:14 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2007-11-17 23:22:14 +0000 |
| commit | 34ec34b21ba80f5e9ed65fdba84ccaa10249578e (patch) | |
| tree | 0ec3275fe82811c6aed72925d8232822bd9e04e7 | |
| parent | 4b751ba2557d2e3f448f92589ee0c9d5e30f6388 (diff) | |
bitbake.conf: Set verion dependencies of -dbg and -dev packages more correctly (from Poky)
| -rw-r--r-- | conf/bitbake.conf | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 9e10e7405f..d508269060 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -118,6 +118,8 @@ PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1. 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 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \ ${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" |