| Message ID | f07d4d2f301a92ad0380c6de3e947739265bc23d.1468750623.git.yann.morin.1998@free.fr |
|---|---|
| State | Changes Requested |
| Headers | show |
Hi Yann, I already replied to patch 12-13, where BR2_EXTERNAL should be renamed to _BR_EXTERNAL. Le 17/07/2016 à 12:34, Yann E. MORIN a écrit : > When using BR2_EXTERNAL, generate the list of packages from there. > > This is currently effectively unused for now, as BR2_EXTERNAL is not > available (not exported in the environment); that will be updated in a > later patch. Reviewed-by: Romain Naour <romain.naour@gmail.com> Best regards, Romain > > Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> > Cc: Samuel Martin <s.martin49@gmail.com> > Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> > Cc: Peter Korsgaard <jacmet@uclibc.org> > Cc: Thomas De Schampheleire <patrickdepinguin@gmail.com> > --- > support/scripts/gen-manual-lists.py | 24 +++++++++++++++++++----- > 1 file changed, 19 insertions(+), 5 deletions(-) > > diff --git a/support/scripts/gen-manual-lists.py b/support/scripts/gen-manual-lists.py > index d231eda..a672b7b 100644 > --- a/support/scripts/gen-manual-lists.py > +++ b/support/scripts/gen-manual-lists.py > @@ -141,7 +141,6 @@ class Buildroot: > > """ > root_config = "Config.in" > - package_dirname = "package" > package_prefixes = ["BR2_PACKAGE_", "BR2_PACKAGE_HOST_"] > re_pkg_prefix = re.compile(r"^(" + "|".join(package_prefixes) + ").*") > deprecated_symbol = "BR2_DEPRECATED" > @@ -182,12 +181,22 @@ class Buildroot: > 'format': "_format_symbol_prompt_location", > 'sorted': False, > }, > + 'external': { > + 'filename': "br2-external-package-list", > + 'root_menu': "User-provided options", > + 'filter': "_is_real_package", > + 'format': "_format_symbol_prompt_location", > + 'sorted': True, > + }, > } > > def __init__(self): > self.base_dir = os.environ.get("TOPDIR") > self.output_dir = os.environ.get("O") > - self.package_dir = os.path.join(self.base_dir, self.package_dirname) > + self.package_dirs = [] > + self.package_dirs.append(os.path.join(self.base_dir, "package")) > + if os.getenv('BR2_EXTERNAL'): > + self.package_dirs.extend(os.environ["BR2_EXTERNAL"].split()) > self.config = kconfiglib.Config(os.path.join(self.base_dir, > self.root_config), > self.base_dir) > @@ -259,9 +268,10 @@ class Buildroot: > # symbol. > if not hasattr(self, "_package_list"): > pkg_list = [] > - for _, _, files in os.walk(self.package_dir): > - for file_ in (f for f in files if f.endswith(".mk")): > - pkg_list.append(re.sub(r"(.*?)\.mk", r"\1", file_)) > + for d in self.package_dirs: > + for _, _, files in os.walk(d): > + for file_ in (f for f in files if f.endswith(".mk")): > + pkg_list.append(re.sub(r"(.*?)\.mk", r"\1", file_)) > setattr(self, "_package_list", pkg_list) > for pkg in getattr(self, "_package_list"): > if type == 'real': > @@ -491,6 +501,8 @@ class Buildroot: > > if __name__ == '__main__': > list_types = ['target-packages', 'host-packages', 'virtual-packages', 'deprecated'] > + if os.getenv('BR2_EXTERNAL'): > + list_types.append('external') > parser = ArgumentParser() > parser.add_argument("list_type", nargs="?", choices=list_types, > help="""\ > @@ -505,6 +517,8 @@ Generate the given list (generate all lists if unspecified)""") > help="Output virtual package file") > parser.add_argument("--output-deprecated", dest="output_deprecated", > help="Output deprecated file") > + parser.add_argument("--output-external", dest="output_external", > + help="Output br2-external file") > args = parser.parse_args() > lists = [args.list_type] if args.list_type else list_types > buildroot = Buildroot() >
diff --git a/support/scripts/gen-manual-lists.py b/support/scripts/gen-manual-lists.py index d231eda..a672b7b 100644 --- a/support/scripts/gen-manual-lists.py +++ b/support/scripts/gen-manual-lists.py @@ -141,7 +141,6 @@ class Buildroot: """ root_config = "Config.in" - package_dirname = "package" package_prefixes = ["BR2_PACKAGE_", "BR2_PACKAGE_HOST_"] re_pkg_prefix = re.compile(r"^(" + "|".join(package_prefixes) + ").*") deprecated_symbol = "BR2_DEPRECATED" @@ -182,12 +181,22 @@ class Buildroot: 'format': "_format_symbol_prompt_location", 'sorted': False, }, + 'external': { + 'filename': "br2-external-package-list", + 'root_menu': "User-provided options", + 'filter': "_is_real_package", + 'format': "_format_symbol_prompt_location", + 'sorted': True, + }, } def __init__(self): self.base_dir = os.environ.get("TOPDIR") self.output_dir = os.environ.get("O") - self.package_dir = os.path.join(self.base_dir, self.package_dirname) + self.package_dirs = [] + self.package_dirs.append(os.path.join(self.base_dir, "package")) + if os.getenv('BR2_EXTERNAL'): + self.package_dirs.extend(os.environ["BR2_EXTERNAL"].split()) self.config = kconfiglib.Config(os.path.join(self.base_dir, self.root_config), self.base_dir) @@ -259,9 +268,10 @@ class Buildroot: # symbol. if not hasattr(self, "_package_list"): pkg_list = [] - for _, _, files in os.walk(self.package_dir): - for file_ in (f for f in files if f.endswith(".mk")): - pkg_list.append(re.sub(r"(.*?)\.mk", r"\1", file_)) + for d in self.package_dirs: + for _, _, files in os.walk(d): + for file_ in (f for f in files if f.endswith(".mk")): + pkg_list.append(re.sub(r"(.*?)\.mk", r"\1", file_)) setattr(self, "_package_list", pkg_list) for pkg in getattr(self, "_package_list"): if type == 'real': @@ -491,6 +501,8 @@ class Buildroot: if __name__ == '__main__': list_types = ['target-packages', 'host-packages', 'virtual-packages', 'deprecated'] + if os.getenv('BR2_EXTERNAL'): + list_types.append('external') parser = ArgumentParser() parser.add_argument("list_type", nargs="?", choices=list_types, help="""\ @@ -505,6 +517,8 @@ Generate the given list (generate all lists if unspecified)""") help="Output virtual package file") parser.add_argument("--output-deprecated", dest="output_deprecated", help="Output deprecated file") + parser.add_argument("--output-external", dest="output_external", + help="Output br2-external file") args = parser.parse_args() lists = [args.list_type] if args.list_type else list_types buildroot = Buildroot()
When using BR2_EXTERNAL, generate the list of packages from there. This is currently effectively unused for now, as BR2_EXTERNAL is not available (not exported in the environment); that will be updated in a later patch. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Samuel Martin <s.martin49@gmail.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Peter Korsgaard <jacmet@uclibc.org> Cc: Thomas De Schampheleire <patrickdepinguin@gmail.com> --- support/scripts/gen-manual-lists.py | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-)