diff options
author | Patrick Vacek <patrickvacek@gmail.com> | 2018-05-29 18:01:42 +0200 |
---|---|---|
committer | Patrick Vacek <patrickvacek@gmail.com> | 2018-05-30 10:19:11 +0200 |
commit | 46505e1fdef91e2a5654fa2d8972419e3b3fc987 (patch) | |
tree | d7be7ff82e77fbaff64fe4d003a17e9899de08a4 | |
parent | 6b63dd4c8a591666db64ef25e3dda97391d2ee6b (diff) | |
download | meta-updater-46505e1fdef91e2a5654fa2d8972419e3b3fc987.tar.gz |
find_packages.py: Ignore packages in ASSUME_PROVIDED.
There will not be recipes for those packages, so don't go looking for
them. We don't need them, anyway.
-rwxr-xr-x | scripts/find_packages.py | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/scripts/find_packages.py b/scripts/find_packages.py index 970a25a..7a60a17 100755 --- a/scripts/find_packages.py +++ b/scripts/find_packages.py | |||
@@ -15,11 +15,9 @@ def print_deps(tinfoil, abcd_file, rn): | |||
15 | try: | 15 | try: |
16 | info = tinfoil.get_recipe_info(rn) | 16 | info = tinfoil.get_recipe_info(rn) |
17 | except Exception: | 17 | except Exception: |
18 | # fails on hostperl-runtime-native, virtual/libintl-native, grep-native, virtual/libiconv-native | ||
19 | print('Failed to get recipe info for: %s' % rn) | 18 | print('Failed to get recipe info for: %s' % rn) |
20 | return [] | 19 | return [] |
21 | if not info: | 20 | if not info: |
22 | # fails on the above and virtual/crypt-native | ||
23 | print('No recipe info found for: %s' % rn) | 21 | print('No recipe info found for: %s' % rn) |
24 | return [] | 22 | return [] |
25 | append_files = tinfoil.get_file_appends(info.fn) | 23 | append_files = tinfoil.get_file_appends(info.fn) |
@@ -88,6 +86,11 @@ def main(): | |||
88 | abcd_manifest = 'manifest.abcd' | 86 | abcd_manifest = 'manifest.abcd' |
89 | with open(abcd_manifest, "w") as abcd_file, bb.tinfoil.Tinfoil() as tinfoil: | 87 | with open(abcd_manifest, "w") as abcd_file, bb.tinfoil.Tinfoil() as tinfoil: |
90 | tinfoil.prepare() | 88 | tinfoil.prepare() |
89 | # These are the packages that bitbake assumes are provided by the host | ||
90 | # system. They do not have recipes, so searching tinfoil for them will | ||
91 | # not work. Anyway, by nature they are not included in code we release, | ||
92 | # only used by it. | ||
93 | assume_provided = tinfoil.config_data.getVar('ASSUME_PROVIDED').split() | ||
91 | abcd_file.write('packages:\n') | 94 | abcd_file.write('packages:\n') |
92 | 95 | ||
93 | # Does NOT include garage-sign, anything used only for testing (i.e. | 96 | # Does NOT include garage-sign, anything used only for testing (i.e. |
@@ -114,7 +117,7 @@ def main(): | |||
114 | for recipe in recipes_to_check: | 117 | for recipe in recipes_to_check: |
115 | depends = print_deps(tinfoil, abcd_file, recipe) | 118 | depends = print_deps(tinfoil, abcd_file, recipe) |
116 | for dep in depends: | 119 | for dep in depends: |
117 | if dep not in recipes_to_check: | 120 | if dep not in recipes_to_check and dep not in assume_provided: |
118 | recipes_to_check.append(dep) | 121 | recipes_to_check.append(dep) |
119 | 122 | ||
120 | 123 | ||