diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-02 10:30:37 +0000 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-01-02 10:30:37 +0000 |
commit | 01ceeedc798ae5f47af6449ac2c91cc2371ef3b4 (patch) | |
tree | d55314bc393404c3c48484daa191b10f0818b925 /meta/conf | |
parent | 94c895aad5ad286f172b04bc33ba670220d5eba8 (diff) | |
download | poky-01ceeedc798ae5f47af6449ac2c91cc2371ef3b4.tar.gz |
bitbake.conf: Rename DEBPV to EXTENDPV to sync up with OE
Diffstat (limited to 'meta/conf')
-rw-r--r-- | meta/conf/bitbake.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 4387ef061c..b622b5abce 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -141,7 +141,7 @@ PR = "${@bb.parse.BBHandler.vars_from_file(bb.data.getVar('FILE',d),d)[2] or 'r0 | |||
141 | PF = "${PN}-${EXTENDPE}${PV}-${PR}" | 141 | PF = "${PN}-${EXTENDPE}${PV}-${PR}" |
142 | EXTENDPE = "${@['','${PE\x7d_'][bb.data.getVar('PE',d,1) > 0]}" | 142 | EXTENDPE = "${@['','${PE\x7d_'][bb.data.getVar('PE',d,1) > 0]}" |
143 | EXTENDPEVER = "${@['','${PE\x7d:'][bb.data.getVar('PE',d,1) > 0]}" | 143 | EXTENDPEVER = "${@['','${PE\x7d:'][bb.data.getVar('PE',d,1) > 0]}" |
144 | DEBPV = "${EXTENDPEVER}${PV}-${PR}" | 144 | EXTENDPV = "${EXTENDPEVER}${PV}-${PR}" |
145 | P = "${PN}-${PV}" | 145 | P = "${PN}-${PV}" |
146 | 146 | ||
147 | # Base package name | 147 | # Base package name |
@@ -203,14 +203,14 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ | |||
203 | ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal" | 203 | ${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal" |
204 | SECTION_${PN}-dev = "devel" | 204 | SECTION_${PN}-dev = "devel" |
205 | ALLOW_EMPTY_${PN}-dev = "1" | 205 | ALLOW_EMPTY_${PN}-dev = "1" |
206 | RDEPENDS_${PN}-dev = "${PN} (= ${DEBPV})" | 206 | RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPV})" |
207 | 207 | ||
208 | FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \ | 208 | FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \ |
209 | ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug ${libdir}/${PN}/.debug \ | 209 | ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug ${libdir}/${PN}/.debug \ |
210 | ${libdir}/matchbox-panel/.debug" | 210 | ${libdir}/matchbox-panel/.debug" |
211 | SECTION_${PN}-dbg = "devel" | 211 | SECTION_${PN}-dbg = "devel" |
212 | ALLOW_EMPTY_${PN}-dbg = "1" | 212 | ALLOW_EMPTY_${PN}-dbg = "1" |
213 | RRECOMMENDS_${PN}-dbg = "${PN} (= ${DEBPV})" | 213 | RRECOMMENDS_${PN}-dbg = "${PN} (= ${EXTENDPV})" |
214 | 214 | ||
215 | FILES_${PN}-locale = "${datadir}/locale" | 215 | FILES_${PN}-locale = "${datadir}/locale" |
216 | 216 | ||