diff options
| -rw-r--r-- | meta/classes/package.bbclass | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 1732a114f4..a267403295 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass | |||
| @@ -79,6 +79,8 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst | |||
| 79 | packages = [pkg] + packages | 79 | packages = [pkg] + packages |
| 80 | else: | 80 | else: |
| 81 | packages.append(pkg) | 81 | packages.append(pkg) |
| 82 | oldfiles = bb.data.getVar('FILES_' + pkg, d, 1) | ||
| 83 | if not oldfiles: | ||
| 82 | the_files = [os.path.join(root, o)] | 84 | the_files = [os.path.join(root, o)] |
| 83 | if aux_files_pattern: | 85 | if aux_files_pattern: |
| 84 | if type(aux_files_pattern) is list: | 86 | if type(aux_files_pattern) is list: |
| @@ -106,9 +108,6 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst | |||
| 106 | if postrm: | 108 | if postrm: |
| 107 | bb.data.setVar('pkg_postrm_' + pkg, postrm, d) | 109 | bb.data.setVar('pkg_postrm_' + pkg, postrm, d) |
| 108 | else: | 110 | else: |
| 109 | oldfiles = bb.data.getVar('FILES_' + pkg, d, 1) | ||
| 110 | if not oldfiles: | ||
| 111 | bb.fatal("Package '%s' exists but has no files" % pkg) | ||
| 112 | bb.data.setVar('FILES_' + pkg, oldfiles + " " + os.path.join(root, o), d) | 111 | bb.data.setVar('FILES_' + pkg, oldfiles + " " + os.path.join(root, o), d) |
| 113 | if callable(hook): | 112 | if callable(hook): |
| 114 | hook(f, pkg, file_regex, output_pattern, m.group(1)) | 113 | hook(f, pkg, file_regex, output_pattern, m.group(1)) |