diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/base.bbclass | 10 | ||||
-rw-r--r-- | meta/conf/bitbake.conf | 9 |
2 files changed, 17 insertions, 2 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 12a3f98f04..fd1308295e 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass | |||
@@ -149,6 +149,14 @@ def base_both_contain(variable1, variable2, checkvalue, d): | |||
149 | 149 | ||
150 | DEPENDS_prepend="${@base_dep_prepend(d)} " | 150 | DEPENDS_prepend="${@base_dep_prepend(d)} " |
151 | 151 | ||
152 | def base_prune_suffix(var, suffixes, d): | ||
153 | # See if var ends with any of the suffixes listed and | ||
154 | # remove it if found | ||
155 | for suffix in suffixes: | ||
156 | if var.endswith(suffix): | ||
157 | return var.replace(suffix, "") | ||
158 | return var | ||
159 | |||
152 | def base_set_filespath(path, d): | 160 | def base_set_filespath(path, d): |
153 | import os, bb | 161 | import os, bb |
154 | filespath = [] | 162 | filespath = [] |
@@ -159,7 +167,7 @@ def base_set_filespath(path, d): | |||
159 | filespath.append(os.path.join(p, o)) | 167 | filespath.append(os.path.join(p, o)) |
160 | return ":".join(filespath) | 168 | return ":".join(filespath) |
161 | 169 | ||
162 | FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ], d)}" | 170 | FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/${BP}", "${FILE_DIRNAME}/${BPN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ], d)}" |
163 | 171 | ||
164 | def oe_filter(f, str, d): | 172 | def oe_filter(f, str, d): |
165 | from re import match | 173 | from re import match |
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index c8f4b8dfe2..dc3352bf54 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -135,6 +135,13 @@ EXTENDPEVER = "${@['','${PE\x7d:'][bb.data.getVar('PE',d,1) > 0]}" | |||
135 | DEBPV = "${EXTENDPEVER}${PV}-${PR}" | 135 | DEBPV = "${EXTENDPEVER}${PV}-${PR}" |
136 | P = "${PN}-${PV}" | 136 | P = "${PN}-${PV}" |
137 | 137 | ||
138 | # Base package name | ||
139 | # Automatically derives "foo" from "foo-native", "foo-cross" or "foo-initial" | ||
140 | # otherwise it is the same as PN and P | ||
141 | SPECIAL_PKGSUFFIX = "-native -cross-sdk -cross -sdk -initial -intermediate" | ||
142 | BPN = "${@base_prune_suffix(bb.data.getVar('PN', d, True), bb.data.getVar('SPECIAL_PKGSUFFIX', d, True).split(), d)}" | ||
143 | BP = "${BPN}-${PV}" | ||
144 | |||
138 | # Package info. | 145 | # Package info. |
139 | 146 | ||
140 | SECTION = "base" | 147 | SECTION = "base" |
@@ -217,7 +224,7 @@ STAMP = "${TMPDIR}/stamps/${PF}" | |||
217 | WORKDIR = "${TMPDIR}/work/${PF}" | 224 | WORKDIR = "${TMPDIR}/work/${PF}" |
218 | T = "${WORKDIR}/temp" | 225 | T = "${WORKDIR}/temp" |
219 | D = "${WORKDIR}/image" | 226 | D = "${WORKDIR}/image" |
220 | S = "${WORKDIR}/${P}" | 227 | S = "${WORKDIR}/${BP}" |
221 | B = "${S}" | 228 | B = "${S}" |
222 | 229 | ||
223 | STAGING_DIR = "${TMPDIR}/staging" | 230 | STAGING_DIR = "${TMPDIR}/staging" |