annotations.git
17 months agodoc: add LICENSE file
Andrea Righi [Fri, 16 Jun 2023 08:48:34 +0000 (10:48 +0200)]
doc: add LICENSE file

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
17 months agoannotations: include sanitize-annotations into kconfig
Andrea Righi [Fri, 16 Jun 2023 09:13:51 +0000 (11:13 +0200)]
annotations: include sanitize-annotations into kconfig

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
17 months agosnap: add snapcraft.yaml
Andrea Righi [Fri, 16 Jun 2023 07:32:32 +0000 (09:32 +0200)]
snap: add snapcraft.yaml

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
17 months agodeb: update package description
Andrea Righi [Fri, 16 Jun 2023 06:50:56 +0000 (08:50 +0200)]
deb: update package description

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
17 months agocreate pylint.yml for github
Andrea Righi [Fri, 16 Jun 2023 10:14:00 +0000 (12:14 +0200)]
create pylint.yml for github

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
17 months agointegrate coding style checks in setup.py
Andrea Righi [Fri, 16 Jun 2023 06:09:54 +0000 (08:09 +0200)]
integrate coding style checks in setup.py

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
17 months agosetup.py: run coding style checks as part of the build
Andrea Righi [Thu, 15 Jun 2023 16:00:53 +0000 (18:00 +0200)]
setup.py: run coding style checks as part of the build

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
17 months agofix pylint warnings
Andrea Righi [Thu, 15 Jun 2023 15:54:55 +0000 (17:54 +0200)]
fix pylint warnings

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
17 months agoupdate .gitignore
Andrea Righi [Thu, 15 Jun 2023 15:40:32 +0000 (17:40 +0200)]
update .gitignore

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
17 months agoannotations: add command line autocompletion
Andrea Righi [Thu, 15 Jun 2023 15:36:35 +0000 (17:36 +0200)]
annotations: add command line autocompletion

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
17 months agopackaging: provide debian packaging info
Andrea Righi [Thu, 15 Jun 2023 15:25:08 +0000 (17:25 +0200)]
packaging: provide debian packaging info

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
17 months agopackaging: provide a proper packaging (pip) for the tool
Andrea Righi [Thu, 15 Jun 2023 15:14:32 +0000 (17:14 +0200)]
packaging: provide a proper packaging (pip) for the tool

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
17 months agodoc: add some refrences to README.rst
Andrea Righi [Thu, 15 Jun 2023 15:00:34 +0000 (17:00 +0200)]
doc: add some refrences to README.rst

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
17 months agodoc: rename README.md to README.rst
Andrea Righi [Thu, 15 Jun 2023 14:57:48 +0000 (16:57 +0200)]
doc: rename README.md to README.rst

The README is really an rst file, so rename it properly.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
17 months agosanitize-annotations: move the script to the top folder
Andrea Righi [Thu, 15 Jun 2023 14:57:25 +0000 (16:57 +0200)]
sanitize-annotations: move the script to the top folder

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
17 months agokconfig: fix incompatibility with python < 3.9
Andrea Righi [Fri, 2 Jun 2023 13:27:30 +0000 (15:27 +0200)]
kconfig: fix incompatibility with python < 3.9

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
17 months agomove sanitize-annotations into tools/
Andrea Righi [Wed, 31 May 2023 13:38:08 +0000 (15:38 +0200)]
move sanitize-annotations into tools/

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
17 months agofix a bunch of pylint warnings
Andrea Righi [Wed, 31 May 2023 13:32:51 +0000 (15:32 +0200)]
fix a bunch of pylint warnings

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
18 months agoannotations: never drop configs that have notes different than the parent
Andrea Righi [Thu, 25 May 2023 16:59:10 +0000 (18:59 +0200)]
annotations: never drop configs that have notes different than the parent

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
18 months agointroduce sanitize-annotations.py
Andrea Righi [Wed, 24 May 2023 15:02:16 +0000 (17:02 +0200)]
introduce sanitize-annotations.py

Add a script to (try to) automatically sanitize old annotations files by
dropping all the deprecated flags, arbitrary enforcements rules, etc.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
18 months agokconfig/annotations.py: support older way of merging dicts
Andrea Righi [Tue, 23 May 2023 06:28:41 +0000 (08:28 +0200)]
kconfig/annotations.py: support older way of merging dicts

The '|=' update operator for merging dicts is available starting in
python 3.9 however in focal we have python 3.8, which causes the
annotation parsing script to crash.

Support also the old way of merging dicts available since python 3.5
that uses dict unpacking, e.g. dict1 = {**dict1, **dict2}

Signed-off-by: Luke Nowakowski-Krijger <luke.nowakowskikrijger@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
18 months agoannotations: use python3 in the shebang
Andrea Righi [Fri, 5 May 2023 06:40:17 +0000 (08:40 +0200)]
annotations: use python3 in the shebang

Make sure to not depend on python-is-python3 and explicitly use python3
for the main script.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
19 months agoannotations: prevent duplicate include lines
Andrea Righi [Tue, 28 Mar 2023 10:48:03 +0000 (12:48 +0200)]
annotations: prevent duplicate include lines

Includes are always parsed recursively, but when we save them (e.g.,
when the annotations file is updated) we should always save only the
top-level includes, without repeating the recursive ones.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
20 months agodoc: resync README.md with the one in the main kernel
Andrea Righi [Thu, 9 Mar 2023 21:18:50 +0000 (22:18 +0100)]
doc: resync README.md with the one in the main kernel

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
21 months agokconfig: Fix pylint violations
Juerg Haefliger [Fri, 10 Feb 2023 14:19:50 +0000 (15:19 +0100)]
kconfig: Fix pylint violations

Fix the following:
R0205: Class 'Config' inherits from object, can be safely removed from bases in python3 (useless-object-inheritance)
E1101: Instance of 'Config' has no '_parse' member (no-member)
W0613: Unused argument 'arch' (unused-argument)
W0613: Unused argument 'flavour' (unused-argument)
W1514: Using open without explicitly specifying an encoding (unspecified-encoding)
R0201: Method could be a function (no-self-use)
E1101: Instance of 'Config' has no 'config' member (no-member)
W0707: Consider explicitly re-raising using the 'from' keyword (raise-missing-from)
W0105: String statement has no effect (pointless-string-statement)
W0123: Use of eval (eval-used)
W0102: Dangerous default value [] as argument (dangerous-default-value)
R1723: Unnecessary "elif" after "break" (no-else-break)
R1705: Unnecessary "elif" after "return" (no-else-return)
R1704: Redefining argument with the local name 'arch' (redefined-argument-from-local)

Signed-off-by: Juerg Haefliger <juergh@proton.me>
21 months agoannotations: Fix pylint violations
Juerg Haefliger [Fri, 10 Feb 2023 09:31:51 +0000 (10:31 +0100)]
annotations: Fix pylint violations

Fix the following:
R1722: Consider using sys.exit() (consider-using-sys-exit)
C0209: Formatting a regular string which could be a f-string (consider-using-f-string)
W0703: Catching too general exception Exception (broad-except)
W1514: Using open without explicitly specifying an encoding (unspecified-encoding)
C0411: standard import "from signal import signal, SIGPIPE, SIG_DFL" should be placed before "from kconfig.annotations import Annotation, KConfig" (wrong-import-order)

Signed-off-by: Juerg Haefliger <juergh@proton.me>
21 months agosetup.cfg: Disable some overly conservative pylint checks
Juerg Haefliger [Sat, 11 Feb 2023 08:11:50 +0000 (09:11 +0100)]
setup.cfg: Disable some overly conservative pylint checks

Disable some 'too-many-<foo>' and 'too-few-<bar>' checks which we don't
really care about too much :-).

Signed-off-by: Juerg Haefliger <juergh@proton.me>
21 months agoAdd 'pylint' target and config section
Juerg Haefliger [Fri, 10 Feb 2023 09:19:58 +0000 (10:19 +0100)]
Add 'pylint' target and config section

Signed-off-by: Juerg Haefliger <juergh@proton.me>
21 months agoFix flake8 violations
Juerg Haefliger [Fri, 10 Feb 2023 07:34:13 +0000 (08:34 +0100)]
Fix flake8 violations

Signed-off-by: Juerg Haefliger <juergh@proton.me>
21 months agoAdd Makefile with initial 'lint' target
Juerg Haefliger [Fri, 10 Feb 2023 07:09:51 +0000 (08:09 +0100)]
Add Makefile with initial 'lint' target

Signed-off-by: Juerg Haefliger <juergh@proton.me>
21 months agoannotations: Check validity of FLAVOUR_DEP
Andrea Righi [Wed, 8 Feb 2023 07:53:48 +0000 (08:53 +0100)]
annotations: Check validity of FLAVOUR_DEP

FLAVOUR_DEP is used to map flavors from the main annotations file to
flavors from includes. Currently, there is no check that any of the
listed flavors exists or is valid so the resulting behavior is
(probably) undefined/unexpected. Add a sanity check to verify the
FLAVOUR_DEP flavors.

Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
21 months agoannotations: cleanups + always save configs with note at the top
Andrea Righi [Wed, 8 Feb 2023 07:53:06 +0000 (08:53 +0100)]
annotations: cleanups + always save configs with note at the top

Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
21 months agoannotations: support single-line rules
Andrea Righi [Wed, 8 Feb 2023 06:40:15 +0000 (07:40 +0100)]
annotations: support single-line rules

The old annotations scheme allowed single-line rules like:
CONFIG_FOO  policy<{..}> note<..>

With the switch to the new annotations script, we lost that capability.
This change brings it back.

Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
21 months agoannotations: fix _remove_entry() logic
Andrea Righi [Fri, 3 Feb 2023 10:55:55 +0000 (11:55 +0100)]
annotations: fix _remove_entry() logic

Drop unnecessary delete statements and fix the code to properly remove
the entry in _remove_entry().

Reported-by: Juerg Haefliger <juerg.haefliger@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
21 months agoannotations: do not drop undefined configs in derivatives
Andrea Righi [Tue, 31 Jan 2023 13:47:15 +0000 (14:47 +0100)]
annotations: do not drop undefined configs in derivatives

Prevent dropping configs that are undefined across all the supported
architectures in annotations that have includes, because we may want to
use them to override configs imported from other annotations.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
21 months agoannotations: make sure to always drop undefined configs
Andrea Righi [Mon, 30 Jan 2023 08:11:54 +0000 (09:11 +0100)]
annotations: make sure to always drop undefined configs

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
21 months agoannotations: add CONFIG_GCC_VERSION to the list of skipped configs
Andrea Righi [Wed, 18 Jan 2023 15:49:02 +0000 (16:49 +0100)]
annotations: add CONFIG_GCC_VERSION to the list of skipped configs

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
21 months agoannotations: remove configs that are undefined across all arches/flavours
Andrea Righi [Tue, 3 Jan 2023 09:10:57 +0000 (10:10 +0100)]
annotations: remove configs that are undefined across all arches/flavours

Sometimes certain config options are removed in new kernels, so when
annotations is updated these options result to be undefined across all
architectures and flavours, in this case it's much more clean to simply
drop them from annotations (considering that the kernel doesn't support
them anymore).

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
21 months agoannotations: compact same value across all flavour within the same arch
Andrea Righi [Thu, 15 Dec 2022 08:46:20 +0000 (09:46 +0100)]
annotations: compact same value across all flavour within the same arch

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
21 months agoannotations: do not add constraints on toolchain
Andrea Righi [Tue, 13 Dec 2022 15:45:51 +0000 (16:45 +0100)]
annotations: do not add constraints on toolchain

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
21 months agoannotations: do not enforce toolchain versions
Andrea Righi [Mon, 12 Dec 2022 16:06:02 +0000 (17:06 +0100)]
annotations: do not enforce toolchain versions

Allow to use different versions of gcc, as and ld in the build ppa,
respect to the version used to produce the kernel packages.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
21 months agoannotations: add missing CONFIG_ prefix in main()
Masahiro Yamada [Tue, 6 Dec 2022 00:43:50 +0000 (09:43 +0900)]
annotations: add missing CONFIG_ prefix in main()

This is common for do_query(), do_note(), do_write() (and whatever
command might be added in the future).

Move it to main().

Signed-off-by: Masahiro Yamada <masahiro.yamada@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
21 months agoannotations: introduce --source
Andrea Righi [Mon, 5 Dec 2022 17:06:38 +0000 (18:06 +0100)]
annotations: introduce --source

Add an option to jump to the definition of a specific config option in
the kernel source code (this requires a prior `make tags` to work).

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
21 months agoannotations: add an option to enable config autocompletion in bash
Andrea Righi [Mon, 5 Dec 2022 16:48:39 +0000 (17:48 +0100)]
annotations: add an option to enable config autocompletion in bash

Type `source <(annotations --autocomplete)` to enable auto-completion of
config options (without the CONFIG_ prefix) in bash when running
annotations script commands.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
21 months agoannotations: allow to specify --write and --note at the same time
Andrea Righi [Mon, 5 Dec 2022 15:38:13 +0000 (16:38 +0100)]
annotations: allow to specify --write and --note at the same time

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
21 months agoannotations: prevent python broken pipe errors
Andrea Righi [Mon, 5 Dec 2022 15:07:38 +0000 (16:07 +0100)]
annotations: prevent python broken pipe errors

Prevent broken pipe errors when showing output in pipe to other tools
(less for example).

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
21 months agoannotations: prevent generating .pyc files on import
Andrea Righi [Mon, 5 Dec 2022 11:45:53 +0000 (12:45 +0100)]
annotations: prevent generating .pyc files on import

We may end up adding these files to our git repos by mistake, so simply
prevent generating them in advance.

There's a tiny performance penalty with this change, because python
needs to re-generate the bytecode on-the-fly every time the annotations
script is called, but this overhead is absolutely negligible compared
the rest of the kernel build time.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
21 months agoannotations: catch syntax errors in annotations
Andrea Righi [Mon, 5 Dec 2022 08:06:53 +0000 (09:06 +0100)]
annotations: catch syntax errors in annotations

Trigger a syntax error when a policy or note rule is not properly
closed.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
21 months agoannotations: properly support multiple levels of inclusion
Andrea Righi [Mon, 5 Dec 2022 07:35:16 +0000 (08:35 +0100)]
annotations: properly support multiple levels of inclusion

Moreover, do some refactoring to optimize parsing.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
21 months agoannotations: clarify error message with --import
Andrea Righi [Mon, 5 Dec 2022 06:53:20 +0000 (07:53 +0100)]
annotations: clarify error message with --import

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
21 months agoannotations: accept config options with or without CONFIG_ prefix
Andrea Righi [Mon, 5 Dec 2022 06:44:25 +0000 (07:44 +0100)]
annotations: accept config options with or without CONFIG_ prefix

Allow to specify config options with or without CONFIG_ prefix in the
commands --write and --note, to be consistent with --query that already
accepts both formats.

Reported-by: Masahiro Yamada <masahiro.yamada@canonical.com>
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
23 months agoannotations: properly merge configs with includes
Andrea Righi [Mon, 5 Dec 2022 06:28:49 +0000 (07:28 +0100)]
annotations: properly merge configs with includes

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
23 months agoannotations: support flavour dependencies (flavour inheritance)
Andrea Righi [Sat, 3 Dec 2022 12:06:03 +0000 (13:06 +0100)]
annotations: support flavour dependencies (flavour inheritance)

Allow to define flavour inheritance relationship in the annotations
file, such as:

  # FLAVOUR_DEP: {'amd64-lowlatency': 'amd64-generic', 'arm64-lowlatency': 'arm64-generic', 'arm64-lowlatency-64k': 'arm64-lowlatency-64k'}

In this case, for example, -lowlatency flavours inherits the config
values from -generic (both for amd64 and arm64) and -lowlatency-64
inherits the value from -generic-64k (only on arm64).

This allows to strongly reduce the size of annotations and helps to
read and review changes in annotations.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
23 months agoannotations: allow to query CONFIG_<option> or just <option>
Andrea Righi [Thu, 1 Dec 2022 10:05:52 +0000 (11:05 +0100)]
annotations: allow to query CONFIG_<option> or just <option>

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
23 months agoannotations: allow to set notes directly and assume --query is the default command
Andrea Righi [Thu, 1 Dec 2022 09:51:11 +0000 (10:51 +0100)]
annotations: allow to set notes directly and assume --query is the default command

Allow to set a note directly to a config option without changing any
value and also assume --query is the default command, so we don't have
to specify --query explicitly to query config options.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
23 months agoannotations: set and delete configs from command line
Andrea Righi [Tue, 29 Nov 2022 08:13:44 +0000 (09:13 +0100)]
annotations: set and delete configs from command line

Allow to set and delete config options from command line using the
'annotations' script (instead of manually editing the annotations file).

This also provides an interface to manage the annotations file from
other scripts.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
23 months agoannotations: report config failures in alphabetical order
Andrea Righi [Mon, 28 Nov 2022 10:37:38 +0000 (11:37 +0100)]
annotations: report config failures in alphabetical order

This allows to review config check failures across multiple
architectures.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoannotations: provide --update command
Andrea Righi [Fri, 18 Nov 2022 10:22:29 +0000 (11:22 +0100)]
annotations: provide --update command

Add a command to import a partial .config (instead of resycning a full
.config as --import does).

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoannotations: compact more redundant arch and flavours settings
Andrea Righi [Wed, 16 Nov 2022 08:57:04 +0000 (09:57 +0100)]
annotations: compact more redundant arch and flavours settings

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agodoc: simplify commands in examples
Andrea Righi [Tue, 15 Nov 2022 16:02:35 +0000 (17:02 +0100)]
doc: simplify commands in examples

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoannotations: avoid generating a KeyError exception
Andrea Righi [Tue, 15 Nov 2022 11:02:56 +0000 (12:02 +0100)]
annotations: avoid generating a KeyError exception

Always try to return None when a config is not defined in annotations
rather then throwing an exception.

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoannotations: allow to import/resync single config option
Andrea Righi [Tue, 15 Nov 2022 09:47:08 +0000 (10:47 +0100)]
annotations: allow to import/resync single config option

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agodoc: update TODO list
Andrea Righi [Tue, 15 Nov 2022 07:58:43 +0000 (08:58 +0100)]
doc: update TODO list

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoannotations: properly handle dropped configs during import
Andrea Righi [Tue, 15 Nov 2022 07:58:30 +0000 (08:58 +0100)]
annotations: properly handle dropped configs during import

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoannotations: check: catch options that are removed from the .config
Andrea Righi [Mon, 14 Nov 2022 22:09:07 +0000 (23:09 +0100)]
annotations: check: catch options that are removed from the .config

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoannotations: make action argument mandatory
Andrea Righi [Mon, 14 Nov 2022 20:51:52 +0000 (21:51 +0100)]
annotations: make action argument mandatory

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoannotations: avoid converting null results to kconfig format
Andrea Righi [Mon, 14 Nov 2022 20:49:36 +0000 (21:49 +0100)]
annotations: avoid converting null results to kconfig format

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoannotations: try to compact annotations before saving it
Andrea Righi [Mon, 14 Nov 2022 19:01:43 +0000 (20:01 +0100)]
annotations: try to compact annotations before saving it

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoannotations: automatically detect annotations file location
Andrea Righi [Mon, 14 Nov 2022 18:00:54 +0000 (19:00 +0100)]
annotations: automatically detect annotations file location

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agodoc: add a basic README.md
Andrea Righi [Mon, 14 Nov 2022 10:25:27 +0000 (11:25 +0100)]
doc: add a basic README.md

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoadd a .gitignore
Andrea Righi [Mon, 14 Nov 2022 10:25:20 +0000 (11:25 +0100)]
add a .gitignore

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
2 years agoinitial version
Andrea Righi [Mon, 14 Nov 2022 10:25:14 +0000 (11:25 +0100)]
initial version

Signed-off-by: Andrea Righi <andrea.righi@canonical.com>