diff options
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index a1cd4d750e..707384aa68 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
| @@ -941,16 +941,21 @@ class BBCooker: | |||
| 941 | collectlog.error("no recipe files to build, check your BBPATH and BBFILES?") | 941 | collectlog.error("no recipe files to build, check your BBPATH and BBFILES?") |
| 942 | bb.event.fire(CookerExit(), self.configuration.event_data) | 942 | bb.event.fire(CookerExit(), self.configuration.event_data) |
| 943 | 943 | ||
| 944 | newfiles = set() | 944 | # Can't use set here as order is important |
| 945 | newfiles = [] | ||
| 945 | for f in files: | 946 | for f in files: |
| 946 | if os.path.isdir(f): | 947 | if os.path.isdir(f): |
| 947 | dirfiles = self.find_bbfiles(f) | 948 | dirfiles = self.find_bbfiles(f) |
| 948 | newfiles.update(dirfiles) | 949 | for g in dirfiles: |
| 950 | if g not in newfiles: | ||
| 951 | newfiles.append(g) | ||
| 949 | else: | 952 | else: |
| 950 | globbed = glob.glob(f) | 953 | globbed = glob.glob(f) |
| 951 | if not globbed and os.path.exists(f): | 954 | if not globbed and os.path.exists(f): |
| 952 | globbed = [f] | 955 | globbed = [f] |
| 953 | newfiles.update(globbed) | 956 | for g in globbed: |
| 957 | if g not in newfiles: | ||
| 958 | newfiles.append(g) | ||
| 954 | 959 | ||
| 955 | bbmask = bb.data.getVar('BBMASK', self.configuration.data, 1) | 960 | bbmask = bb.data.getVar('BBMASK', self.configuration.data, 1) |
| 956 | 961 | ||
