summaryrefslogtreecommitdiff
path: root/conf/bitbake.conf
diff options
context:
space:
mode:
authorRobert Schuster <thebohemian@openembedded.org>2008-10-17 11:41:20 +0200
committerRobert Schuster <thebohemian@openembedded.org>2008-10-22 14:52:09 +0200
commit9c991af9e1fb60fafa3c12d31ba87990b410e39f (patch)
treee2999881ab522132c779126bfb79d71f1ef147eb /conf/bitbake.conf
parentc4cfa290f4e64299870ef9883aa9d3dd30f0e672 (diff)
Added BPN/BP functionality (see #11716)
base.bbclass: Added base_package_name python function. java-library.bbclass: Removed java_back_package_name function. bitbake.conf: Set BP/BPN and use it in FILESPATH and S
Diffstat (limited to 'conf/bitbake.conf')
-rw-r--r--conf/bitbake.conf13
1 files changed, 7 insertions, 6 deletions
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 071c1efdc9..93064b0a30 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -143,10 +143,11 @@ EXTENDPEVER = "${@['','${PE\x7d:'][bb.data.getVar('PE',d,1) > 0]}"
DEBPV = "${EXTENDPEVER}${PV}-${PR}"
P = "${PN}-${PV}"
-##################################################################
-# Distro default
-##################################################################
-DISTRO_PR ?= ""
+# Base package name
+# Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial"
+# otherwise it is the same as PN and P
+BPN = "${@base_package_name(d)}"
+BP = "${BPN}-${PV}"
# Package info.
@@ -217,7 +218,7 @@ FILES_${PN}-locale = "${datadir}/locale"
export MANIFEST = "${FILESDIR}/manifest"
FILE_DIRNAME = "${@os.path.dirname(bb.data.getVar('FILE', d))}"
-FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
+FILESPATH = "${FILE_DIRNAME}/${PF}:${FILE_DIRNAME}/${P}:${FILE_DIRNAME}/${PN}:${FILE_DIRNAME}/${BP}:${FILE_DIRNAME}/${BPN}:${FILE_DIRNAME}/files:${FILE_DIRNAME}"
FILESDIR = "${@bb.which(bb.data.getVar('FILESPATH', d, 1), '.')}"
##################################################################
@@ -237,7 +238,7 @@ STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PF}"
WORKDIR = "${TMPDIR}/work/${MULTIMACH_TARGET_SYS}/${PF}"
T = "${WORKDIR}/temp"
D = "${WORKDIR}/image"
-S = "${WORKDIR}/${P}"
+S = "${WORKDIR}/${BP}"
B = "${S}"
STAGING_DIR = "${TMPDIR}/staging"