From c0b6dd9b41279ff00c5a90e49108945a0fee9cdd Mon Sep 17 00:00:00 2001 From: Holger Hans Peter Freyther Date: Wed, 15 Oct 2008 10:56:42 +0200 Subject: bb files: Revert the introduction of FILE_PR This is a partial revert of aa03004ace2fabb135a6208ef8c2d2b312aa7b0b. The approach that was taken leads to disagreement and the change was pushed too early. DISTRO_PR is going to say and will be used inside the package creation. There will be more disucssion on the list about where to continue from here. --- conf/bitbake.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'conf') diff --git a/conf/bitbake.conf b/conf/bitbake.conf index 071c1efdc9..c5feb09be0 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -135,8 +135,7 @@ ASSUME_PROVIDED = "\ ################################################################## PN = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[0] or 'defaultpkgname'}" PV = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[1] or '1.0'}" -FILE_PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0'}" -PR = "${FILE_PR}${DISTRO_PR}" +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]}" -- cgit v1.2.3