mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

Fix PE handling in version strings

Browse Source 
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3141 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie
2007-11-13 19:21:52 +00:00
parent 320be50c50
commit 18f2e2772a
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/conf/bitbake.conf
+4 -2
View File
@@ -115,6 +115,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'}" PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}"
PF = "${PN}-${EXTENDPE}${PV}-${PR}" PF = "${PN}-${EXTENDPE}${PV}-${PR}"
EXTENDPE = "${@['','${PE\x7d_'][bb.data.getVar('PE',d,1) > 0]}" 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}" P = "${PN}-${PV}"
# Package info. # Package info.
@@ -160,14 +162,14 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal" ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
SECTION_${PN}-dev = "devel" SECTION_${PN}-dev = "devel"
ALLOW_EMPTY_${PN}-dev = "1" ALLOW_EMPTY_${PN}-dev = "1"
RDEPENDS_${PN}-dev = "${PN} (= ${PE}:${PV}-${PR})" RDEPENDS_${PN}-dev = "${PN} (= ${DEBPV})"
FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \ FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \
${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug ${libdir}/${PN}/.debug \ ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug ${libdir}/${PN}/.debug \
${libdir}/matchbox-panel/.debug" ${libdir}/matchbox-panel/.debug"
SECTION_${PN}-dbg = "devel" SECTION_${PN}-dbg = "devel"
ALLOW_EMPTY_${PN}-dbg = "1" ALLOW_EMPTY_${PN}-dbg = "1"
RRECOMMENDS_${PN}-dbg = "${PN} (= ${PE}:${PV}-${PR})" RRECOMMENDS_${PN}-dbg = "${PN} (= ${DEBPV})"
FILES_${PN}-locale = "${datadir}/locale" FILES_${PN}-locale = "${datadir}/locale"
meta/packages/linux-libc-headers/linux-libc-headers.inc
+1 -1
View File
@@ -4,4 +4,4 @@ LICENSE = "GPL"
#DEPENDS = "cross-linkage" #DEPENDS = "cross-linkage"
RDEPENDS_${PN}-dev = "" RDEPENDS_${PN}-dev = ""
RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${PV}-${PR})" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})"
meta/packages/xorg-proto/xorg-proto-common.inc
+1 -1
View File
@@ -13,7 +13,7 @@ inherit autotools pkgconfig
# ${PN} is empty so we need to tweak -dev and -dbg package dependencies # ${PN} is empty so we need to tweak -dev and -dbg package dependencies
RDEPENDS_${PN}-dev = "" RDEPENDS_${PN}-dev = ""
RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${PE}:${PV}-${PR})" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${DEBPV})"
do_stage() { do_stage() {
autotools_stage_all autotools_stage_all