diff options
Diffstat (limited to 'meta/lib/oeqa/selftest/cases/distrodata.py')
-rw-r--r-- | meta/lib/oeqa/selftest/cases/distrodata.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/meta/lib/oeqa/selftest/cases/distrodata.py b/meta/lib/oeqa/selftest/cases/distrodata.py index e1cfc3b621..ad952c004b 100644 --- a/meta/lib/oeqa/selftest/cases/distrodata.py +++ b/meta/lib/oeqa/selftest/cases/distrodata.py | |||
@@ -1,11 +1,10 @@ | |||
1 | # | 1 | # |
2 | # Copyright OpenEmbedded Contributors | ||
3 | # | ||
2 | # SPDX-License-Identifier: MIT | 4 | # SPDX-License-Identifier: MIT |
3 | # | 5 | # |
4 | 6 | ||
5 | from oeqa.selftest.case import OESelftestTestCase | 7 | from oeqa.selftest.case import OESelftestTestCase |
6 | from oeqa.utils.commands import runCmd, bitbake, get_bb_var, get_bb_vars | ||
7 | from oeqa.utils.decorators import testcase | ||
8 | from oeqa.utils.ftools import write_file | ||
9 | 8 | ||
10 | import oe.recipeutils | 9 | import oe.recipeutils |
11 | 10 | ||
@@ -18,7 +17,7 @@ class Distrodata(OESelftestTestCase): | |||
18 | Product: oe-core | 17 | Product: oe-core |
19 | Author: Alexander Kanavin <alex.kanavin@gmail.com> | 18 | Author: Alexander Kanavin <alex.kanavin@gmail.com> |
20 | """ | 19 | """ |
21 | feature = 'LICENSE_FLAGS_WHITELIST += " commercial"\n' | 20 | feature = 'LICENSE_FLAGS_ACCEPTED += " commercial"\n' |
22 | self.write_config(feature) | 21 | self.write_config(feature) |
23 | 22 | ||
24 | pkgs = oe.recipeutils.get_recipe_upgrade_status() | 23 | pkgs = oe.recipeutils.get_recipe_upgrade_status() |
@@ -49,21 +48,21 @@ but their recipes claim otherwise by setting UPSTREAM_VERSION_UNKNOWN. Please re | |||
49 | Author: Alexander Kanavin <alex.kanavin@gmail.com> | 48 | Author: Alexander Kanavin <alex.kanavin@gmail.com> |
50 | """ | 49 | """ |
51 | def is_exception(pkg): | 50 | def is_exception(pkg): |
52 | exceptions = ["packagegroup-", "initramfs-", "systemd-machine-units", "target-sdk-provides-dummy"] | 51 | exceptions = ["packagegroup-",] |
53 | for i in exceptions: | 52 | for i in exceptions: |
54 | if i in pkg: | 53 | if i in pkg: |
55 | return True | 54 | return True |
56 | return False | 55 | return False |
57 | 56 | ||
58 | def is_maintainer_exception(entry): | 57 | def is_maintainer_exception(entry): |
59 | exceptions = ["musl", "newlib", "linux-yocto", "linux-dummy", "mesa-gl", "libgfortran", | 58 | exceptions = ["musl", "newlib", "linux-yocto", "linux-dummy", "mesa-gl", "libgfortran", "libx11-compose-data", |
60 | "cve-update-db-native"] | 59 | "cve-update-nvd2-native",] |
61 | for i in exceptions: | 60 | for i in exceptions: |
62 | if i in entry: | 61 | if i in entry: |
63 | return True | 62 | return True |
64 | return False | 63 | return False |
65 | 64 | ||
66 | feature = 'require conf/distro/include/maintainers.inc\nLICENSE_FLAGS_WHITELIST += " commercial"\nPARSE_ALL_RECIPES = "1"\n' | 65 | feature = 'require conf/distro/include/maintainers.inc\nLICENSE_FLAGS_ACCEPTED += " commercial"\nPARSE_ALL_RECIPES = "1"\nPACKAGE_CLASSES = "package_ipk package_deb package_rpm"\n' |
67 | self.write_config(feature) | 66 | self.write_config(feature) |
68 | 67 | ||
69 | with bb.tinfoil.Tinfoil() as tinfoil: | 68 | with bb.tinfoil.Tinfoil() as tinfoil: |
@@ -74,7 +73,7 @@ but their recipes claim otherwise by setting UPSTREAM_VERSION_UNKNOWN. Please re | |||
74 | 73 | ||
75 | missing_recipes = [] | 74 | missing_recipes = [] |
76 | recipes = [] | 75 | recipes = [] |
77 | prefix = "RECIPE_MAINTAINER_pn-" | 76 | prefix = "RECIPE_MAINTAINER:pn-" |
78 | 77 | ||
79 | # We could have used all_recipes() here, but this method will find | 78 | # We could have used all_recipes() here, but this method will find |
80 | # every recipe if we ever move to setting RECIPE_MAINTAINER in recipe files | 79 | # every recipe if we ever move to setting RECIPE_MAINTAINER in recipe files |