diff options
| author | Saul Wold <Saul.Wold@windriver.com> | 2022-02-21 10:36:13 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-02-21 23:37:27 +0000 |
| commit | 0b46552625959b829d7f2712b642ef52003e5534 (patch) | |
| tree | 14d683ba1ca85aed9f273a908006763dd014de61 /meta/lib | |
| parent | 2b22c16376abdd66ae4319a2561cc0fad56ec5e8 (diff) | |
| download | poky-0b46552625959b829d7f2712b642ef52003e5534.tar.gz | |
meta: Rename LICENSE_FLAGS variable
(From OE-Core rev: 5c5b3bc563059ba728dc9724656cc69669f8e25f)
Signed-off-by: Saul Wold <saul.wold@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/distrodata.py | 4 | ||||
| -rw-r--r-- | meta/lib/oeqa/selftest/cases/reproducible.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oeqa/selftest/cases/distrodata.py b/meta/lib/oeqa/selftest/cases/distrodata.py index 908979804a..03f31e9fcb 100644 --- a/meta/lib/oeqa/selftest/cases/distrodata.py +++ b/meta/lib/oeqa/selftest/cases/distrodata.py | |||
| @@ -18,7 +18,7 @@ class Distrodata(OESelftestTestCase): | |||
| 18 | Product: oe-core | 18 | Product: oe-core |
| 19 | Author: Alexander Kanavin <alex.kanavin@gmail.com> | 19 | Author: Alexander Kanavin <alex.kanavin@gmail.com> |
| 20 | """ | 20 | """ |
| 21 | feature = 'LICENSE_FLAGS_WHITELIST += " commercial"\n' | 21 | feature = 'LICENSE_FLAGS_ACCEPTED += " commercial"\n' |
| 22 | self.write_config(feature) | 22 | self.write_config(feature) |
| 23 | 23 | ||
| 24 | pkgs = oe.recipeutils.get_recipe_upgrade_status() | 24 | pkgs = oe.recipeutils.get_recipe_upgrade_status() |
| @@ -99,7 +99,7 @@ The following recipes do not have a DESCRIPTION. Please add an entry for DESCRIP | |||
| 99 | return True | 99 | return True |
| 100 | return False | 100 | return False |
| 101 | 101 | ||
| 102 | feature = 'require conf/distro/include/maintainers.inc\nLICENSE_FLAGS_WHITELIST += " commercial"\nPARSE_ALL_RECIPES = "1"\nPACKAGE_CLASSES = "package_ipk package_deb package_rpm"\n' | 102 | feature = 'require conf/distro/include/maintainers.inc\nLICENSE_FLAGS_ACCEPTED += " commercial"\nPARSE_ALL_RECIPES = "1"\nPACKAGE_CLASSES = "package_ipk package_deb package_rpm"\n' |
| 103 | self.write_config(feature) | 103 | self.write_config(feature) |
| 104 | 104 | ||
| 105 | with bb.tinfoil.Tinfoil() as tinfoil: | 105 | with bb.tinfoil.Tinfoil() as tinfoil: |
diff --git a/meta/lib/oeqa/selftest/cases/reproducible.py b/meta/lib/oeqa/selftest/cases/reproducible.py index e539365031..7caf8c3e7d 100644 --- a/meta/lib/oeqa/selftest/cases/reproducible.py +++ b/meta/lib/oeqa/selftest/cases/reproducible.py | |||
| @@ -206,7 +206,7 @@ class ReproducibleTests(OESelftestTestCase): | |||
| 206 | PACKAGE_CLASSES = "{package_classes}" | 206 | PACKAGE_CLASSES = "{package_classes}" |
| 207 | INHIBIT_PACKAGE_STRIP = "1" | 207 | INHIBIT_PACKAGE_STRIP = "1" |
| 208 | TMPDIR = "{tmpdir}" | 208 | TMPDIR = "{tmpdir}" |
| 209 | LICENSE_FLAGS_WHITELIST = "commercial" | 209 | LICENSE_FLAGS_ACCEPTED = "commercial" |
| 210 | DISTRO_FEATURES:append = ' systemd pam' | 210 | DISTRO_FEATURES:append = ' systemd pam' |
| 211 | USERADDEXTENSION = "useradd-staticids" | 211 | USERADDEXTENSION = "useradd-staticids" |
| 212 | USERADD_ERROR_DYNAMIC = "skip" | 212 | USERADD_ERROR_DYNAMIC = "skip" |
