diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-10-22 17:57:15 +0200 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-10-22 17:57:15 +0200 |
| commit | 6fe9490eac7366d9da691d4129b8d2d23f19a139 (patch) | |
| tree | 46a8cdc9a72a8c414a7824225bd76ec8c241fbdb /conf/bitbake.conf | |
| parent | 3836ac00385216dd47d89ec3cebc12e5446feef9 (diff) | |
| parent | ca7e39e27802da8aecf68d74166ec0d2117c8c70 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'conf/bitbake.conf')
| -rw-r--r-- | conf/bitbake.conf | 13 |
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" |