[PULL] [L/unstable] merge configs into annotations

[Masahiro Yamada]

Hi Andrea,


On Mon, Dec 5, 2022 at 5:10 PM Andrea Righi <andrea.righi at canonical.com> wrote:
> > --query requires a config option __without__ 'CONFIG_' prefix
> > but --write requires __with__ 'CONFIG' prefix.
> >
> > This is really confusing. The policy should be consistent.
> >
> > Or, you can support both ways.
> >
> >
> > args.config if args.config.startswith('CONFIG') else 'CONFIG_' + args.config.
> >
> >
> > FWIW, the upstream scripts/config supports with/without 'CONFIG_' prefix:
> >
> >   https://github.com/torvalds/linux/blob/v6.0/scripts/config#L60
>
> Done.
>
> Changed in linux-unstable to support both formats (w/wo CONFIG_ prefix),
> so we are consistent with upstream.


Thanks for the improvement.

You can do it in the main() function to deduplicate the code.
Please see the attachment.


I did not fix up do_source() because I could not understand the
point of the --source option.


The --source option does not get access to the annotation database.


"annotations --source --config RUST" is just an alias of
"vim -t CONFIG_RUST".

It forks more processes, and makes the user type more chars.
That's it.







>
> BTW, I'm also maintaining the annotations script in a separate git repo
> (git.launchpad.net/~arighi/+git/annotations-tools), so it's easy to
> review/keep track of the latest changes across all kernels.


Ah, OK.

BTW, where is our central repository for developing the debian/ directory?


Ubuntu maintains the debianized-kernel tree (kernel + debian/ directory)
in the same git repository.
We do this for more than 50 kernel trees.
I have no idea how diverged the debian/ is among different kernel trees.

In contrast, the Debian kernel maintains debian/ directory by git.
(https://salsa.debian.org/kernel-team/linux.git)
They track diffs from the upstream code.


How do we do this?
Commit [Packaging] patches to lunar/unstable, then
port them to older stable kernels as needed?
-------------- next part --------------
A non-text attachment was scrubbed...
Name: 0001-Add-missing-CONFIG_-prefix-in-main.patch
Type: text/x-patch
Size: 3170 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20221206/60d63455/attachment-0001.bin>