From f906608f68bb0640b61bb4f4986d77b6f30df0f9 Mon Sep 17 00:00:00 2001 From: Lianhao Lu Date: Fri, 27 May 2011 14:31:46 +0800 Subject: 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. (From OE-Core rev: ad00ad1d530074dc3a0f3376f96ad5a88a7b24e2) Signed-off-by: Lianhao Lu Signed-off-by: Richard Purdie --- meta/conf/bitbake.conf | 20 ++++++++++++++++---- meta/recipes-core/udev/udev-new.inc | 2 +- meta/recipes-graphics/xcb/libpthread-stubs_0.3.bb | 2 +- meta/recipes-graphics/xcb/xcb-proto.inc | 2 +- .../xorg-proto/xorg-proto-common.inc | 2 +- .../recipes-graphics/xorg-util/util-macros_1.13.0.bb | 2 +- .../linux-libc-headers/linux-libc-headers.inc | 2 +- 7 files changed, 22 insertions(+), 10 deletions(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index d30738597a..8ec0a86e2c 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" diff --git a/meta/recipes-core/udev/udev-new.inc b/meta/recipes-core/udev/udev-new.inc index d1abf39074..1b94f1bc9b 100644 --- a/meta/recipes-core/udev/udev-new.inc +++ b/meta/recipes-core/udev/udev-new.inc @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \ DEPENDS = "acl glib-2.0 libusb usbutils pciutils linux-libc-headers gperf-native libxslt-native" RPROVIDES_${PN} = "hotplug" RRECOMMENDS_${PN} += "udev-extraconf udev-cache usbutils-ids pciutils-ids" -RDEPENDS_libudev = "${PN} (= ${EXTENDPV})" +RDEPENDS_libudev = "${PN} (= ${EXTENDPKGV})" SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ file://run.rules \ diff --git a/meta/recipes-graphics/xcb/libpthread-stubs_0.3.bb b/meta/recipes-graphics/xcb/libpthread-stubs_0.3.bb index 038c00f6c6..40c47da560 100644 --- a/meta/recipes-graphics/xcb/libpthread-stubs_0.3.bb +++ b/meta/recipes-graphics/xcb/libpthread-stubs_0.3.bb @@ -20,4 +20,4 @@ SRC_URI[sha256sum] = "35b6d54e3cc6f3ba28061da81af64b9a92b7b757319098172488a660e3 inherit autotools pkgconfig RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta/recipes-graphics/xcb/xcb-proto.inc b/meta/recipes-graphics/xcb/xcb-proto.inc index ae4028298a..d51134145f 100644 --- a/meta/recipes-graphics/xcb/xcb-proto.inc +++ b/meta/recipes-graphics/xcb/xcb-proto.inc @@ -16,7 +16,7 @@ inherit autotools pkgconfig FILES_${PN}-dev += "${datadir}/xcb/*.xml" RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" DEPENDS_append_virtclass-native = " python-native" BBCLASSEXTEND = "native" diff --git a/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc b/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc index ab1af28311..765e30a3aa 100644 --- a/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc +++ b/meta/recipes-graphics/xorg-proto/xorg-proto-common.inc @@ -18,4 +18,4 @@ EXTRA_OECONF = "--with-fop=no" # ${PN} is empty so we need to tweak -dev and -dbg package dependencies RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/meta/recipes-graphics/xorg-util/util-macros_1.13.0.bb b/meta/recipes-graphics/xorg-util/util-macros_1.13.0.bb index a708ed0cc9..a6f5402276 100644 --- a/meta/recipes-graphics/xorg-util/util-macros_1.13.0.bb +++ b/meta/recipes-graphics/xorg-util/util-macros_1.13.0.bb @@ -16,7 +16,7 @@ DEPENDS_virtclass-native = "gettext" DEPENDS_virtclass-nativesdk = "gettext" RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" BBCLASSEXTEND = "native nativesdk" diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc index 8c5dc76849..014024f460 100644 --- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc +++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers.inc @@ -7,4 +7,4 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/kernel/v2.6/linux-${PV}.tar.bz2" #DEPENDS = "cross-linkage" RDEPENDS_${PN}-dev = "" -RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPV})" +RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" -- cgit v1.2.3-54-g00ecf