diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-02-10 18:13:25 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-02-16 09:10:42 +0000 |
commit | c4da9b949a09f6fcf4091f247a05cea78175571a (patch) | |
tree | 3e79639e36e69caaf5ebb37ba206eb0bcf823d7b /bitbake/lib/bb/utils.py | |
parent | 758dc92abd8a9af00e3f2b20cba9ca4c7cfca3e0 (diff) | |
download | poky-c4da9b949a09f6fcf4091f247a05cea78175571a.tar.gz |
bitbake: cooker: rework LAYERDEPENDS versioning so that it is actually useful
We've had versioned dependency support in LAYERDEPENDS for quite a long
time, but I can say with pretty good certainty that almost nobody has
used it up to now because it was too strict - the specified version had
to exactly match the version in your configuration or you would get an
error; there was no "greater than or equal" option, which is usually
what you will want given that LAYERVERSION does get bumped from time to
time.
However, users mismatching layer branches and then having their builds
fail later on with some incomprehensible error is still a pretty common
problem. We can't simply use the git branch because not everyone is
always on a branch and the branch names don't always match up (and
that's not an issue). To provide a practical means to address branch
mismatching, I have reworked LAYERDEPENDS version specifications to use
the more familiar "dependency (>= version)" syntax as used with package
dependencies, support non-integer versions, and clarified the error
message a little. If we then take care to bump the version on every
breaking change, it is at least possible to have layers depend on these
changes when they update to match; we can now even support a major.minor
scheme to allow retrospectively adding a version limiter to old branches
when a new branch is created and yet still allow the old branch minor
version to be bumped if needed.
Fixes [YOCTO #5991].
(Bitbake rev: 408be9cdf2b1e32e64ea488d8051a546fb54c144)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/utils.py')
-rw-r--r-- | bitbake/lib/bb/utils.py | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index 7ba1234578..5ac9bcfbd4 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py | |||
@@ -131,6 +131,28 @@ def vercmp_string(a, b): | |||
131 | tb = split_version(b) | 131 | tb = split_version(b) |
132 | return vercmp(ta, tb) | 132 | return vercmp(ta, tb) |
133 | 133 | ||
134 | def vercmp_string_op(a, b, op): | ||
135 | """ | ||
136 | Compare two versions and check if the specified comparison operator matches the result of the comparison. | ||
137 | This function is fairly liberal about what operators it will accept since there are a variety of styles | ||
138 | depending on the context. | ||
139 | """ | ||
140 | res = vercmp_string(a, b) | ||
141 | if op in ('=', '=='): | ||
142 | return res == 0 | ||
143 | elif op == '<=': | ||
144 | return res <= 0 | ||
145 | elif op == '>=': | ||
146 | return res >= 0 | ||
147 | elif op in ('>', '>>'): | ||
148 | return res > 0 | ||
149 | elif op in ('<', '<<'): | ||
150 | return res < 0 | ||
151 | elif op == '!=': | ||
152 | return res != 0 | ||
153 | else: | ||
154 | raise VersionStringException('Unsupported comparison operator "%s"' % op) | ||
155 | |||
134 | def explode_deps(s): | 156 | def explode_deps(s): |
135 | """ | 157 | """ |
136 | Take an RDEPENDS style string of format: | 158 | Take an RDEPENDS style string of format: |