diff options
| author | Freudiger Raphael <raphael.freudiger@siemens.com> | 2016-04-01 14:54:20 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-03 15:51:34 +0100 |
| commit | 25102393b411e4728de668d82bf94d37f273cec9 (patch) | |
| tree | b14186ceda5197b0fb0e15f84ec6d1c23938a9c5 | |
| parent | 7dcb4c41272e8f611eabea991fa30df79b9e48e3 (diff) | |
| download | poky-25102393b411e4728de668d82bf94d37f273cec9.tar.gz | |
image: Fix debugfs image type recursion loop
The debugfs prefix is striped from t, but not from baset.
Therefore baset never matches t.
(From OE-Core rev: 2862cbf74925cb084d3f9c206d3448112ba6a0aa)
Signed-off-by: Freudiger Raphael <raphael.freudiger@siemens.com>
Signed-off-by: Pascal Bach <pascal.bach@siemens.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/image.bbclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index d9c16106c2..ea77ab8878 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass | |||
| @@ -324,6 +324,7 @@ python () { | |||
| 324 | 324 | ||
| 325 | def _add_type(t): | 325 | def _add_type(t): |
| 326 | baset = _image_base_type(t) | 326 | baset = _image_base_type(t) |
| 327 | input_t = t | ||
| 327 | if baset not in basetypes: | 328 | if baset not in basetypes: |
| 328 | basetypes[baset]= [] | 329 | basetypes[baset]= [] |
| 329 | if t not in basetypes[baset]: | 330 | if t not in basetypes[baset]: |
| @@ -344,9 +345,9 @@ python () { | |||
| 344 | basedep = _image_base_type(dep) | 345 | basedep = _image_base_type(dep) |
| 345 | typedeps[baset].add(basedep) | 346 | typedeps[baset].add(basedep) |
| 346 | 347 | ||
| 347 | if baset != t: | 348 | if baset != input_t: |
| 348 | _add_type(baset) | 349 | _add_type(baset) |
| 349 | 350 | ||
| 350 | for t in alltypes[:]: | 351 | for t in alltypes[:]: |
| 351 | _add_type(t) | 352 | _add_type(t) |
| 352 | 353 | ||
