diff options
| author | Lianhao Lu <lianhao.lu@intel.com> | 2011-05-27 14:31:46 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-05-27 17:06:04 +0100 |
| commit | ad00ad1d530074dc3a0f3376f96ad5a88a7b24e2 (patch) | |
| tree | b1fa3198a08689614533f193d813fc48aca1e188 /meta/conf | |
| parent | b56d984d59b5ea682f115b8ceeb04fbffe01f13c (diff) | |
| download | openembedded-core-ad00ad1d530074dc3a0f3376f96ad5a88a7b24e2.tar.gz openembedded-core-ad00ad1d530074dc3a0f3376f96ad5a88a7b24e2.tar.bz2 openembedded-core-ad00ad1d530074dc3a0f3376f96ad5a88a7b24e2.tar.xz openembedded-core-ad00ad1d530074dc3a0f3376f96ad5a88a7b24e2.zip | |
conf/bitbake.conf: Added variables for PR service.
Added following variables for PR service:
USE_PR_SERV: flag of whether to use the network PR service
PRAUTOINX: search index for the network PR service
PKGE/PKGV/PKGR: epoch, version and revision used in package feed.
EXTENDPKGV: full package version string used in package relationships.
For the following recipes, replace EXTENDPV with EXTENDPKGV:
udev, xcb, xorg-proto, util-macros and linux-libc-headers
then removed the unused EXTENDPV and EXTENDPEVER variables
Users should use EXTENDPKGV instead for package feed generation.
Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
| -rw-r--r-- | meta/conf/bitbake.conf | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index d30738597..8ec0a86e2 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -152,10 +152,17 @@ 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]}" -EXTENDPV = "${EXTENDPEVER}${PV}-${PR}" P = "${PN}-${PV}" +EXTENDPRAUTO = "${@['.${PRAUTO\x7d',''][bb.data.getVar('PRAUTO',d,1) is None]}" +PRAUTOINX = "${PF}" + +PKGV ?= "${PV}" +PKGR ?= "${PR}${EXTENDPRAUTO}" +PKGE ?= "${@['','${PE\x7d'][bb.data.getVar('PE',d,1) > 0]}" +EXTENDPKGEVER = "${@['','${PKGE\x7d:'][bb.data.getVar('PKGE',d,1).strip() != '']}" +EXTENDPKGV ?= "${EXTENDPKGEVER}${PKGV}-${PKGR}" + # Base package name # Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial" # otherwise it is the same as PN and P @@ -163,6 +170,11 @@ SPECIAL_PKGSUFFIX = "-native -cross -initial -intermediate -nativesdk -crosssdk BPN = "${@base_prune_suffix(bb.data.getVar('PN', d, True), bb.data.getVar('SPECIAL_PKGSUFFIX', d, True).split(), d)}" BP = "${BPN}-${PV}" +# +# network based PR service +# +USE_PR_SERV = "${@[1,0][(bb.data.getVar('PRSERV_HOST',d,1) is None) or (bb.data.getVar('PRSERV_PORT',d,1) is None)]}" + # Package info. SECTION = "base" @@ -241,7 +253,7 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*${SOLIBSDEV} ${libdir}/*.la \ ${base_libdir}/*.a ${base_libdir}/*.o" SECTION_${PN}-dev = "devel" ALLOW_EMPTY_${PN}-dev = "1" -RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPV})" +RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPKGV})" DOTDEBUG-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \ ${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug ${libdir}/${PN}/.debug \ @@ -253,7 +265,7 @@ FILES_${PN}-dbg = "${@bb.data.getVar(['DOTDEBUG-dbg', 'DEBUGFILEDIRECTORY-dbg'][ SECTION_${PN}-dbg = "devel" ALLOW_EMPTY_${PN}-dbg = "1" -RRECOMMENDS_${PN}-dbg = "${PN} (= ${EXTENDPV})" +RRECOMMENDS_${PN}-dbg = "${PN} (= ${EXTENDPKGV})" FILES_${PN}-locale = "${datadir}/locale" |