From 749f44b3735e4ae3657255b373fa55c357501cc5 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Mon, 20 Jan 2020 18:24:53 +0100 Subject: selftest: check maintainers.inc for entries without recipes Also remove a couple of entries found by the test :) Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- meta/conf/distro/include/maintainers.inc | 6 ------ meta/lib/oeqa/selftest/cases/distrodata.py | 34 ++++++++++++++++++++++++++++-- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index ffb6da7dae..01afc25b93 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc @@ -183,7 +183,6 @@ RECIPE_MAINTAINER_pn-flex = "Chen Qi " RECIPE_MAINTAINER_pn-font-alias = "Armin Kuster " RECIPE_MAINTAINER_pn-font-util = "Armin Kuster " RECIPE_MAINTAINER_pn-fontconfig = "Ross Burton " -RECIPE_MAINTAINER_pn-foomatic-filters = "Chen Qi " RECIPE_MAINTAINER_pn-formfactor = "Ross Burton " RECIPE_MAINTAINER_pn-freetype = "Ross Burton " RECIPE_MAINTAINER_pn-fribidi = "Ross Burton " @@ -551,7 +550,6 @@ RECIPE_MAINTAINER_pn-pciutils = "Chen Qi " RECIPE_MAINTAINER_pn-pcmanfm = "Alexander Kanavin " RECIPE_MAINTAINER_pn-perf = "Bruce Ashfield " RECIPE_MAINTAINER_pn-perl = "Alexander Kanavin " -RECIPE_MAINTAINER_pn-perl-native = "Alexander Kanavin " RECIPE_MAINTAINER_pn-piglit = "Ross Burton " RECIPE_MAINTAINER_pn-pigz = "Hongxu Jia " RECIPE_MAINTAINER_pn-pinentry = "Armin Kuster " @@ -574,9 +572,6 @@ RECIPE_MAINTAINER_pn-ptest-runner = "Ross Burton " RECIPE_MAINTAINER_pn-pulseaudio = "Tanu Kaskinen " RECIPE_MAINTAINER_pn-pulseaudio-client-conf-sato = "Tanu Kaskinen " RECIPE_MAINTAINER_pn-puzzles = "Anuj Mittal " -RECIPE_MAINTAINER_pn-python = "Oleksandr Kravchuk " -RECIPE_MAINTAINER_pn-python-native = "Oleksandr Kravchuk " -RECIPE_MAINTAINER_pn-python-setuptools = "Oleksandr Kravchuk " RECIPE_MAINTAINER_pn-python3 = "Oleksandr Kravchuk " RECIPE_MAINTAINER_pn-python3-async = "Oleksandr Kravchuk " RECIPE_MAINTAINER_pn-python3-dbus = "Oleksandr Kravchuk " @@ -586,7 +581,6 @@ RECIPE_MAINTAINER_pn-python3-git = "Oleksandr Kravchuk """ @@ -54,7 +55,16 @@ but their recipes claim otherwise by setting UPSTREAM_VERSION_UNKNOWN. Please re return True return False - feature = 'require conf/distro/include/maintainers.inc\n' + def is_maintainer_exception(entry): + exceptions = ["systemd", "musl", "libpam", "newlib", "linux-yocto", "opensbi", "linux-dummy", + "mesa-gl", "libgfortran", "volatile-binds", "libgloss", "bsd-headers", + "cve-update-db-native", "libssp-nonshared", "argp-standalone", "fts"] + for i in exceptions: + if i in entry: + return True + return False + + feature = 'require conf/distro/include/maintainers.inc\nLICENSE_FLAGS_WHITELIST += " commercial"\n' self.write_config(feature) with bb.tinfoil.Tinfoil() as tinfoil: @@ -62,6 +72,11 @@ but their recipes claim otherwise by setting UPSTREAM_VERSION_UNKNOWN. Please re with_maintainer_list = [] no_maintainer_list = [] + + missing_recipes = [] + recipes = [] + prefix = "RECIPE_MAINTAINER_pn-" + # We could have used all_recipes() here, but this method will find # every recipe if we ever move to setting RECIPE_MAINTAINER in recipe files # instead of maintainers.inc @@ -71,6 +86,7 @@ but their recipes claim otherwise by setting UPSTREAM_VERSION_UNKNOWN. Please re continue rd = tinfoil.parse_recipe_file(fn, appends=False) pn = rd.getVar('PN') + recipes.append(pn) if is_exception(pn): continue if rd.getVar('RECIPE_MAINTAINER'): @@ -78,6 +94,15 @@ but their recipes claim otherwise by setting UPSTREAM_VERSION_UNKNOWN. Please re else: no_maintainer_list.append((pn, fn)) + maintainers = tinfoil.config_data.keys() + for key in maintainers: + if key.startswith(prefix): + recipe = tinfoil.config_data.expand(key[len(prefix):]) + if is_maintainer_exception(recipe): + continue + if recipe not in recipes: + missing_recipes.append(recipe) + if no_maintainer_list: self.fail(""" The following recipes do not have a maintainer assigned to them. Please add an entry to meta/conf/distro/include/maintainers.inc file. @@ -87,3 +112,8 @@ The following recipes do not have a maintainer assigned to them. Please add an e self.fail(""" The list of oe-core recipes with maintainers is empty. This may indicate that the test has regressed and needs fixing. """) + + if missing_recipes: + self.fail(""" +Unable to find recipes for the following entries in maintainers.inc: +""" + "\n".join(['%s' % i for i in missing_recipes])) -- cgit 1.2.3-korg