[oe-commits] Otavio Salvador : bitbake.conf: use base_build_package_revision to ensure DISTRO_PR is used
GIT User account
git at amethyst.openembedded.net
Mon Oct 27 19:41:24 UTC 2008
Module: openembedded.git
Branch: org.openembedded.dev
Commit: 24db7b9bb0aedf06122e14a1ab77e4b541b2df68
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=24db7b9bb0aedf06122e14a1ab77e4b541b2df68
Author: Otavio Salvador <otavio at ossystems.com.br>
Date: Mon Oct 27 14:43:22 2008 -0200
bitbake.conf: use base_build_package_revision to ensure DISTRO_PR is used
While on it, the variable DEBPV has also been renamed to EXTENDPV since
it makes easier to others to read the code.
---
conf/bitbake.conf | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 6207e5b..edb4e4d 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -139,9 +139,8 @@ 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]}"
-DEBPV = "${EXTENDPEVER}${PV}-${PR}"
+EXTENDPV = "${EXTENDPEVER}${PV}-${PR}${DISTRO_PR}"
P = "${PN}-${PV}"
-DISTRO_PR ?= ""
# Base package name
# Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial"
@@ -202,14 +201,14 @@ FILES_${PN}-dev = "${includedir} ${libdir}/lib*.so ${libdir}/*.la \
${base_libdir}/*.a ${base_libdir}/*.o ${datadir}/aclocal"
SECTION_${PN}-dev = "devel"
ALLOW_EMPTY_${PN}-dev = "1"
-RDEPENDS_${PN}-dev = "${PN} (= ${DEBPV})"
+RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPV})"
FILES_${PN}-dbg = "${bindir}/.debug ${sbindir}/.debug ${libexecdir}/.debug ${libdir}/.debug \
${base_bindir}/.debug ${base_sbindir}/.debug ${base_libdir}/.debug ${libdir}/${PN}/.debug \
${libdir}/matchbox-panel/.debug"
SECTION_${PN}-dbg = "devel"
ALLOW_EMPTY_${PN}-dbg = "1"
-RRECOMMENDS_${PN}-dbg = "${PN} (= ${DEBPV})"
+RRECOMMENDS_${PN}-dbg = "${PN} (= ${EXTENDPV})"
FILES_${PN}-locale = "${datadir}/locale"
@@ -595,6 +594,7 @@ IMAGE_ROOTFS_SIZE_ext2 ?= "65536"
IMAGE_ROOTFS_SIZE_ext2.gz ?= "65536"
IMAGE_ROOTFS_SIZE_ext3 ?= "65536"
IMAGE_ROOTFS_SIZE_ext3.gz ?= "65536"
+DISTRO_PR ?= ""
# Forcefully set CACHE now so future changes to things like
# MACHINE don't change the path to the cache
@@ -644,4 +644,3 @@ COMBINED_FEATURES = "\
${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbgadget", d)} \
${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "usbhost", d)} \
${@base_both_contain("DISTRO_FEATURES", "MACHINE_FEATURES", "wifi", d)}"
-
More information about the Openembedded-commits
mailing list