2015-05-20 02:36:07 +00:00
|
|
|
#!/usr/bin/env python2
|
2018-05-06 21:58:06 +00:00
|
|
|
# SPDX-License-Identifier: GPL-2.0+
|
2015-05-20 02:36:07 +00:00
|
|
|
#
|
|
|
|
# Author: Masahiro Yamada <yamada.masahiro@socionext.com>
|
|
|
|
#
|
|
|
|
|
|
|
|
"""
|
|
|
|
Move config options from headers to defconfig files.
|
|
|
|
|
|
|
|
Since Kconfig was introduced to U-Boot, we have worked on moving
|
|
|
|
config options from headers to Kconfig (defconfig).
|
|
|
|
|
|
|
|
This tool intends to help this tremendous work.
|
|
|
|
|
|
|
|
|
|
|
|
Usage
|
|
|
|
-----
|
|
|
|
|
2016-05-19 06:51:58 +00:00
|
|
|
First, you must edit the Kconfig to add the menu entries for the configs
|
2015-05-19 18:21:17 +00:00
|
|
|
you are moving.
|
|
|
|
|
2016-05-19 06:51:58 +00:00
|
|
|
And then run this tool giving CONFIG names you want to move.
|
|
|
|
For example, if you want to move CONFIG_CMD_USB and CONFIG_SYS_TEXT_BASE,
|
|
|
|
simply type as follows:
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2016-05-19 06:51:58 +00:00
|
|
|
$ tools/moveconfig.py CONFIG_CMD_USB CONFIG_SYS_TEXT_BASE
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2016-05-19 06:51:58 +00:00
|
|
|
The tool walks through all the defconfig files and move the given CONFIGs.
|
2015-05-20 02:36:07 +00:00
|
|
|
|
|
|
|
The log is also displayed on the terminal.
|
|
|
|
|
2016-05-19 06:52:02 +00:00
|
|
|
The log is printed for each defconfig as follows:
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2016-05-19 06:52:02 +00:00
|
|
|
<defconfig_name>
|
|
|
|
<action1>
|
|
|
|
<action2>
|
|
|
|
<action3>
|
|
|
|
...
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2016-05-19 06:52:02 +00:00
|
|
|
<defconfig_name> is the name of the defconfig.
|
|
|
|
|
|
|
|
<action*> shows what the tool did for that defconfig.
|
2016-08-21 07:12:36 +00:00
|
|
|
It looks like one of the following:
|
2015-05-20 02:36:07 +00:00
|
|
|
|
|
|
|
- Move 'CONFIG_... '
|
|
|
|
This config option was moved to the defconfig
|
|
|
|
|
tools: moveconfig: do not rely on type and default value given by users
Commit 96464badc794 ("moveconfig: Always run savedefconfig on the
moved config") changed the work flow of this tool a lot from the
original intention when this tool was designed first.
Since then, before running this tool, users must edit the Kconfig to
add the menu entries for the configs they are moving. It means users
had already specified the type and the default value for each CONFIG
via its Kconfig entry. Nevertheless, users are still required to
dictate the same type and the default value in the input file. This
is tedious to use. So, my idea here is to deprecate the latter.
Before moving forward with it, there is one issue worth mentioning;
since the savedefconfig re-sync was introduced, this tool has not
been able to move bool options with "default y". Joe sent a patch
to solve this problem about a year ago, but it was not applied for
some reasons. Now, he came back with an updated patch, so this
problem will be fixed soon.
For other use cases, I see no reason to require redundant dictation
in the input file. Instead, the tool can know the types and default
values by parsing the .config file.
This commit changes the tool to use the CONFIG names, but ignore the
types and default values given by the input file.
This commit also fixes one bug. Prior to this commit, it could not
move an integer-typed CONFIG with value 1.
For example, assume we are moving CONFIG_CONS_INDEX. Please note
this is an integer type option.
Many board headers define this CONFIG as 1.
#define CONFIG_CONS_INDEX 1
It will be converted to
CONFIG_CONS_INDEX=y
and moved to include/autoconf.mk, by the tools/scripts/define2mk.sed.
It will cause "make savedefconfig" to fail due to the type conflict.
This commit takes care of it by detecting the type and converting the
CONFIG value correctly.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
2016-05-19 06:51:56 +00:00
|
|
|
- CONFIG_... is not defined in Kconfig. Do nothing.
|
2016-08-22 13:18:21 +00:00
|
|
|
The entry for this CONFIG was not found in Kconfig. The option is not
|
|
|
|
defined in the config header, either. So, this case can be just skipped.
|
|
|
|
|
|
|
|
- CONFIG_... is not defined in Kconfig (suspicious). Do nothing.
|
|
|
|
This option is defined in the config header, but its entry was not found
|
|
|
|
in Kconfig.
|
tools: moveconfig: do not rely on type and default value given by users
Commit 96464badc794 ("moveconfig: Always run savedefconfig on the
moved config") changed the work flow of this tool a lot from the
original intention when this tool was designed first.
Since then, before running this tool, users must edit the Kconfig to
add the menu entries for the configs they are moving. It means users
had already specified the type and the default value for each CONFIG
via its Kconfig entry. Nevertheless, users are still required to
dictate the same type and the default value in the input file. This
is tedious to use. So, my idea here is to deprecate the latter.
Before moving forward with it, there is one issue worth mentioning;
since the savedefconfig re-sync was introduced, this tool has not
been able to move bool options with "default y". Joe sent a patch
to solve this problem about a year ago, but it was not applied for
some reasons. Now, he came back with an updated patch, so this
problem will be fixed soon.
For other use cases, I see no reason to require redundant dictation
in the input file. Instead, the tool can know the types and default
values by parsing the .config file.
This commit changes the tool to use the CONFIG names, but ignore the
types and default values given by the input file.
This commit also fixes one bug. Prior to this commit, it could not
move an integer-typed CONFIG with value 1.
For example, assume we are moving CONFIG_CONS_INDEX. Please note
this is an integer type option.
Many board headers define this CONFIG as 1.
#define CONFIG_CONS_INDEX 1
It will be converted to
CONFIG_CONS_INDEX=y
and moved to include/autoconf.mk, by the tools/scripts/define2mk.sed.
It will cause "make savedefconfig" to fail due to the type conflict.
This commit takes care of it by detecting the type and converting the
CONFIG value correctly.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
2016-05-19 06:51:56 +00:00
|
|
|
There are two common cases:
|
|
|
|
- You forgot to create an entry for the CONFIG before running
|
|
|
|
this tool, or made a typo in a CONFIG passed to this tool.
|
|
|
|
- The entry was hidden due to unmet 'depends on'.
|
2016-08-22 13:18:21 +00:00
|
|
|
The tool does not know if the result is reasonable, so please check it
|
|
|
|
manually.
|
tools: moveconfig: do not rely on type and default value given by users
Commit 96464badc794 ("moveconfig: Always run savedefconfig on the
moved config") changed the work flow of this tool a lot from the
original intention when this tool was designed first.
Since then, before running this tool, users must edit the Kconfig to
add the menu entries for the configs they are moving. It means users
had already specified the type and the default value for each CONFIG
via its Kconfig entry. Nevertheless, users are still required to
dictate the same type and the default value in the input file. This
is tedious to use. So, my idea here is to deprecate the latter.
Before moving forward with it, there is one issue worth mentioning;
since the savedefconfig re-sync was introduced, this tool has not
been able to move bool options with "default y". Joe sent a patch
to solve this problem about a year ago, but it was not applied for
some reasons. Now, he came back with an updated patch, so this
problem will be fixed soon.
For other use cases, I see no reason to require redundant dictation
in the input file. Instead, the tool can know the types and default
values by parsing the .config file.
This commit changes the tool to use the CONFIG names, but ignore the
types and default values given by the input file.
This commit also fixes one bug. Prior to this commit, it could not
move an integer-typed CONFIG with value 1.
For example, assume we are moving CONFIG_CONS_INDEX. Please note
this is an integer type option.
Many board headers define this CONFIG as 1.
#define CONFIG_CONS_INDEX 1
It will be converted to
CONFIG_CONS_INDEX=y
and moved to include/autoconf.mk, by the tools/scripts/define2mk.sed.
It will cause "make savedefconfig" to fail due to the type conflict.
This commit takes care of it by detecting the type and converting the
CONFIG value correctly.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
2016-05-19 06:51:56 +00:00
|
|
|
|
|
|
|
- 'CONFIG_...' is the same as the define in Kconfig. Do nothing.
|
|
|
|
The define in the config header matched the one in Kconfig.
|
|
|
|
We do not need to touch it.
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2016-05-19 06:51:53 +00:00
|
|
|
- Compiler is missing. Do nothing.
|
|
|
|
The compiler specified for this architecture was not found
|
|
|
|
in your PATH environment.
|
|
|
|
(If -e option is passed, the tool exits immediately.)
|
|
|
|
|
|
|
|
- Failed to process.
|
2015-05-20 02:36:07 +00:00
|
|
|
An error occurred during processing this defconfig. Skipped.
|
|
|
|
(If -e option is passed, the tool exits immediately on error.)
|
|
|
|
|
|
|
|
Finally, you will be asked, Clean up headers? [y/n]:
|
|
|
|
|
|
|
|
If you say 'y' here, the unnecessary config defines are removed
|
|
|
|
from the config headers (include/configs/*.h).
|
|
|
|
It just uses the regex method, so you should not rely on it.
|
|
|
|
Just in case, please do 'git diff' to see what happened.
|
|
|
|
|
|
|
|
|
2016-05-19 06:51:58 +00:00
|
|
|
How does it work?
|
|
|
|
-----------------
|
2015-05-20 02:36:07 +00:00
|
|
|
|
|
|
|
This tool runs configuration and builds include/autoconf.mk for every
|
|
|
|
defconfig. The config options defined in Kconfig appear in the .config
|
|
|
|
file (unless they are hidden because of unmet dependency.)
|
|
|
|
On the other hand, the config options defined by board headers are seen
|
|
|
|
in include/autoconf.mk. The tool looks for the specified options in both
|
2016-05-19 06:51:58 +00:00
|
|
|
of them to decide the appropriate action for the options. If the given
|
|
|
|
config option is found in the .config, but its value does not match the
|
|
|
|
one from the board header, the config option in the .config is replaced
|
|
|
|
with the define in the board header. Then, the .config is synced by
|
|
|
|
"make savedefconfig" and the defconfig is updated with it.
|
2015-05-20 02:36:07 +00:00
|
|
|
|
|
|
|
For faster processing, this tool handles multi-threading. It creates
|
|
|
|
separate build directories where the out-of-tree build is run. The
|
|
|
|
temporary build directories are automatically created and deleted as
|
|
|
|
needed. The number of threads are chosen based on the number of the CPU
|
|
|
|
cores of your system although you can change it via -j (--jobs) option.
|
|
|
|
|
|
|
|
|
|
|
|
Toolchains
|
|
|
|
----------
|
|
|
|
|
|
|
|
Appropriate toolchain are necessary to generate include/autoconf.mk
|
|
|
|
for all the architectures supported by U-Boot. Most of them are available
|
2017-07-10 20:47:47 +00:00
|
|
|
at the kernel.org site, some are not provided by kernel.org. This tool uses
|
|
|
|
the same tools as buildman, so see that tool for setup (e.g. --fetch-arch).
|
2015-05-20 02:36:07 +00:00
|
|
|
|
|
|
|
|
2017-06-02 01:39:00 +00:00
|
|
|
Tips and trips
|
|
|
|
--------------
|
|
|
|
|
|
|
|
To sync only X86 defconfigs:
|
|
|
|
|
|
|
|
./tools/moveconfig.py -s -d <(grep -l X86 configs/*)
|
|
|
|
|
|
|
|
or:
|
|
|
|
|
|
|
|
grep -l X86 configs/* | ./tools/moveconfig.py -s -d -
|
|
|
|
|
|
|
|
To process CONFIG_CMD_FPGAD only for a subset of configs based on path match:
|
|
|
|
|
|
|
|
ls configs/{hrcon*,iocon*,strider*} | \
|
|
|
|
./tools/moveconfig.py -Cy CONFIG_CMD_FPGAD -d -
|
|
|
|
|
|
|
|
|
2017-06-02 01:39:03 +00:00
|
|
|
Finding implied CONFIGs
|
|
|
|
-----------------------
|
|
|
|
|
|
|
|
Some CONFIG options can be implied by others and this can help to reduce
|
|
|
|
the size of the defconfig files. For example, CONFIG_X86 implies
|
|
|
|
CONFIG_CMD_IRQ, so we can put 'imply CMD_IRQ' under 'config X86' and
|
|
|
|
all x86 boards will have that option, avoiding adding CONFIG_CMD_IRQ to
|
|
|
|
each of the x86 defconfig files.
|
|
|
|
|
|
|
|
This tool can help find such configs. To use it, first build a database:
|
|
|
|
|
|
|
|
./tools/moveconfig.py -b
|
|
|
|
|
|
|
|
Then try to query it:
|
|
|
|
|
|
|
|
./tools/moveconfig.py -i CONFIG_CMD_IRQ
|
|
|
|
CONFIG_CMD_IRQ found in 311/2384 defconfigs
|
|
|
|
44 : CONFIG_SYS_FSL_ERRATUM_IFC_A002769
|
|
|
|
41 : CONFIG_SYS_FSL_ERRATUM_A007075
|
|
|
|
31 : CONFIG_SYS_FSL_DDR_VER_44
|
|
|
|
28 : CONFIG_ARCH_P1010
|
|
|
|
28 : CONFIG_SYS_FSL_ERRATUM_P1010_A003549
|
|
|
|
28 : CONFIG_SYS_FSL_ERRATUM_SEC_A003571
|
|
|
|
28 : CONFIG_SYS_FSL_ERRATUM_IFC_A003399
|
|
|
|
25 : CONFIG_SYS_FSL_ERRATUM_A008044
|
|
|
|
22 : CONFIG_ARCH_P1020
|
|
|
|
21 : CONFIG_SYS_FSL_DDR_VER_46
|
|
|
|
20 : CONFIG_MAX_PIRQ_LINKS
|
|
|
|
20 : CONFIG_HPET_ADDRESS
|
|
|
|
20 : CONFIG_X86
|
|
|
|
20 : CONFIG_PCIE_ECAM_SIZE
|
|
|
|
20 : CONFIG_IRQ_SLOT_COUNT
|
|
|
|
20 : CONFIG_I8259_PIC
|
|
|
|
20 : CONFIG_CPU_ADDR_BITS
|
|
|
|
20 : CONFIG_RAMBASE
|
|
|
|
20 : CONFIG_SYS_FSL_ERRATUM_A005871
|
|
|
|
20 : CONFIG_PCIE_ECAM_BASE
|
|
|
|
20 : CONFIG_X86_TSC_TIMER
|
|
|
|
20 : CONFIG_I8254_TIMER
|
|
|
|
20 : CONFIG_CMD_GETTIME
|
|
|
|
19 : CONFIG_SYS_FSL_ERRATUM_A005812
|
|
|
|
18 : CONFIG_X86_RUN_32BIT
|
|
|
|
17 : CONFIG_CMD_CHIP_CONFIG
|
|
|
|
...
|
|
|
|
|
|
|
|
This shows a list of config options which might imply CONFIG_CMD_EEPROM along
|
|
|
|
with how many defconfigs they cover. From this you can see that CONFIG_X86
|
|
|
|
implies CONFIG_CMD_EEPROM. Therefore, instead of adding CONFIG_CMD_EEPROM to
|
|
|
|
the defconfig of every x86 board, you could add a single imply line to the
|
|
|
|
Kconfig file:
|
|
|
|
|
|
|
|
config X86
|
|
|
|
bool "x86 architecture"
|
|
|
|
...
|
|
|
|
imply CMD_EEPROM
|
|
|
|
|
|
|
|
That will cover 20 defconfigs. Many of the options listed are not suitable as
|
|
|
|
they are not related. E.g. it would be odd for CONFIG_CMD_GETTIME to imply
|
|
|
|
CMD_EEPROM.
|
|
|
|
|
|
|
|
Using this search you can reduce the size of moveconfig patches.
|
|
|
|
|
2017-06-16 03:39:33 +00:00
|
|
|
You can automatically add 'imply' statements in the Kconfig with the -a
|
|
|
|
option:
|
|
|
|
|
|
|
|
./tools/moveconfig.py -s -i CONFIG_SCSI \
|
|
|
|
-a CONFIG_ARCH_LS1021A,CONFIG_ARCH_LS1043A
|
|
|
|
|
|
|
|
This will add 'imply SCSI' to the two CONFIG options mentioned, assuming that
|
|
|
|
the database indicates that they do actually imply CONFIG_SCSI and do not
|
|
|
|
already have an 'imply SCSI'.
|
|
|
|
|
|
|
|
The output shows where the imply is added:
|
|
|
|
|
|
|
|
18 : CONFIG_ARCH_LS1021A arch/arm/cpu/armv7/ls102xa/Kconfig:1
|
|
|
|
13 : CONFIG_ARCH_LS1043A arch/arm/cpu/armv8/fsl-layerscape/Kconfig:11
|
|
|
|
12 : CONFIG_ARCH_LS1046A arch/arm/cpu/armv8/fsl-layerscape/Kconfig:31
|
|
|
|
|
|
|
|
The first number is the number of boards which can avoid having a special
|
|
|
|
CONFIG_SCSI option in their defconfig file if this 'imply' is added.
|
|
|
|
The location at the right is the Kconfig file and line number where the config
|
|
|
|
appears. For example, adding 'imply CONFIG_SCSI' to the 'config ARCH_LS1021A'
|
|
|
|
in arch/arm/cpu/armv7/ls102xa/Kconfig at line 1 will help 18 boards to reduce
|
|
|
|
the size of their defconfig files.
|
|
|
|
|
|
|
|
If you want to add an 'imply' to every imply config in the list, you can use
|
|
|
|
|
|
|
|
./tools/moveconfig.py -s -i CONFIG_SCSI -a all
|
|
|
|
|
|
|
|
To control which ones are displayed, use -I <list> where list is a list of
|
|
|
|
options (use '-I help' to see possible options and their meaning).
|
|
|
|
|
|
|
|
To skip showing you options that already have an 'imply' attached, use -A.
|
|
|
|
|
|
|
|
When you have finished adding 'imply' options you can regenerate the
|
|
|
|
defconfig files for affected boards with something like:
|
|
|
|
|
|
|
|
git show --stat | ./tools/moveconfig.py -s -d -
|
|
|
|
|
|
|
|
This will regenerate only those defconfigs changed in the current commit.
|
|
|
|
If you start with (say) 100 defconfigs being changed in the commit, and add
|
|
|
|
a few 'imply' options as above, then regenerate, hopefully you can reduce the
|
|
|
|
number of defconfigs changed in the commit.
|
|
|
|
|
2017-06-02 01:39:03 +00:00
|
|
|
|
2015-05-20 02:36:07 +00:00
|
|
|
Available options
|
|
|
|
-----------------
|
|
|
|
|
|
|
|
-c, --color
|
|
|
|
Surround each portion of the log with escape sequences to display it
|
|
|
|
in color on the terminal.
|
|
|
|
|
2016-09-13 05:18:21 +00:00
|
|
|
-C, --commit
|
|
|
|
Create a git commit with the changes when the operation is complete. A
|
|
|
|
standard commit message is used which may need to be edited.
|
|
|
|
|
2015-05-19 18:21:19 +00:00
|
|
|
-d, --defconfigs
|
2016-10-19 05:39:54 +00:00
|
|
|
Specify a file containing a list of defconfigs to move. The defconfig
|
2017-06-02 01:39:00 +00:00
|
|
|
files can be given with shell-style wildcards. Use '-' to read from stdin.
|
2015-05-19 18:21:19 +00:00
|
|
|
|
2015-05-20 02:36:07 +00:00
|
|
|
-n, --dry-run
|
2016-05-19 06:51:58 +00:00
|
|
|
Perform a trial run that does not make any changes. It is useful to
|
2015-05-20 02:36:07 +00:00
|
|
|
see what is going to happen before one actually runs it.
|
|
|
|
|
|
|
|
-e, --exit-on-error
|
|
|
|
Exit immediately if Make exits with a non-zero status while processing
|
|
|
|
a defconfig file.
|
|
|
|
|
2016-05-19 06:52:08 +00:00
|
|
|
-s, --force-sync
|
|
|
|
Do "make savedefconfig" forcibly for all the defconfig files.
|
|
|
|
If not specified, "make savedefconfig" only occurs for cases
|
|
|
|
where at least one CONFIG was moved.
|
|
|
|
|
2016-08-22 13:18:22 +00:00
|
|
|
-S, --spl
|
|
|
|
Look for moved config options in spl/include/autoconf.mk instead of
|
|
|
|
include/autoconf.mk. This is useful for moving options for SPL build
|
|
|
|
because SPL related options (mostly prefixed with CONFIG_SPL_) are
|
|
|
|
sometimes blocked by CONFIG_SPL_BUILD ifdef conditionals.
|
|
|
|
|
2015-05-19 18:21:20 +00:00
|
|
|
-H, --headers-only
|
|
|
|
Only cleanup the headers; skip the defconfig processing
|
|
|
|
|
2015-05-20 02:36:07 +00:00
|
|
|
-j, --jobs
|
|
|
|
Specify the number of threads to run simultaneously. If not specified,
|
|
|
|
the number of threads is the same as the number of CPU cores.
|
|
|
|
|
2016-06-10 19:53:32 +00:00
|
|
|
-r, --git-ref
|
|
|
|
Specify the git ref to clone for building the autoconf.mk. If unspecified
|
|
|
|
use the CWD. This is useful for when changes to the Kconfig affect the
|
|
|
|
default values and you want to capture the state of the defconfig from
|
|
|
|
before that change was in effect. If in doubt, specify a ref pre-Kconfig
|
|
|
|
changes (use HEAD if Kconfig changes are not committed). Worst case it will
|
|
|
|
take a bit longer to run, but will always do the right thing.
|
|
|
|
|
2015-05-19 18:21:24 +00:00
|
|
|
-v, --verbose
|
|
|
|
Show any build errors as boards are built
|
|
|
|
|
2016-09-13 05:18:20 +00:00
|
|
|
-y, --yes
|
|
|
|
Instead of prompting, automatically go ahead with all operations. This
|
2017-06-02 01:39:00 +00:00
|
|
|
includes cleaning up headers, CONFIG_SYS_EXTRA_OPTIONS, the config whitelist
|
|
|
|
and the README.
|
2016-09-13 05:18:20 +00:00
|
|
|
|
2015-05-20 02:36:07 +00:00
|
|
|
To see the complete list of supported options, run
|
|
|
|
|
|
|
|
$ tools/moveconfig.py -h
|
|
|
|
|
|
|
|
"""
|
|
|
|
|
2017-06-02 01:39:03 +00:00
|
|
|
import collections
|
2016-07-25 10:15:24 +00:00
|
|
|
import copy
|
2016-07-25 10:15:25 +00:00
|
|
|
import difflib
|
2016-05-19 06:52:07 +00:00
|
|
|
import filecmp
|
2015-05-20 02:36:07 +00:00
|
|
|
import fnmatch
|
2016-10-19 05:39:54 +00:00
|
|
|
import glob
|
2015-05-20 02:36:07 +00:00
|
|
|
import multiprocessing
|
|
|
|
import optparse
|
|
|
|
import os
|
2017-06-02 01:39:02 +00:00
|
|
|
import Queue
|
2015-05-20 02:36:07 +00:00
|
|
|
import re
|
|
|
|
import shutil
|
|
|
|
import subprocess
|
|
|
|
import sys
|
|
|
|
import tempfile
|
2017-06-02 01:39:02 +00:00
|
|
|
import threading
|
2015-05-20 02:36:07 +00:00
|
|
|
import time
|
|
|
|
|
2017-06-16 03:39:33 +00:00
|
|
|
sys.path.append(os.path.join(os.path.dirname(__file__), 'buildman'))
|
2017-07-10 20:47:47 +00:00
|
|
|
sys.path.append(os.path.join(os.path.dirname(__file__), 'patman'))
|
|
|
|
import bsettings
|
2017-06-16 03:39:33 +00:00
|
|
|
import kconfiglib
|
2017-07-10 20:47:47 +00:00
|
|
|
import toolchain
|
2017-06-16 03:39:33 +00:00
|
|
|
|
2015-05-20 02:36:07 +00:00
|
|
|
SHOW_GNU_MAKE = 'scripts/show-gnu-make'
|
|
|
|
SLEEP_TIME=0.03
|
|
|
|
|
|
|
|
STATE_IDLE = 0
|
|
|
|
STATE_DEFCONFIG = 1
|
|
|
|
STATE_AUTOCONF = 2
|
2015-05-19 18:21:17 +00:00
|
|
|
STATE_SAVEDEFCONFIG = 3
|
2015-05-20 02:36:07 +00:00
|
|
|
|
|
|
|
ACTION_MOVE = 0
|
tools: moveconfig: do not rely on type and default value given by users
Commit 96464badc794 ("moveconfig: Always run savedefconfig on the
moved config") changed the work flow of this tool a lot from the
original intention when this tool was designed first.
Since then, before running this tool, users must edit the Kconfig to
add the menu entries for the configs they are moving. It means users
had already specified the type and the default value for each CONFIG
via its Kconfig entry. Nevertheless, users are still required to
dictate the same type and the default value in the input file. This
is tedious to use. So, my idea here is to deprecate the latter.
Before moving forward with it, there is one issue worth mentioning;
since the savedefconfig re-sync was introduced, this tool has not
been able to move bool options with "default y". Joe sent a patch
to solve this problem about a year ago, but it was not applied for
some reasons. Now, he came back with an updated patch, so this
problem will be fixed soon.
For other use cases, I see no reason to require redundant dictation
in the input file. Instead, the tool can know the types and default
values by parsing the .config file.
This commit changes the tool to use the CONFIG names, but ignore the
types and default values given by the input file.
This commit also fixes one bug. Prior to this commit, it could not
move an integer-typed CONFIG with value 1.
For example, assume we are moving CONFIG_CONS_INDEX. Please note
this is an integer type option.
Many board headers define this CONFIG as 1.
#define CONFIG_CONS_INDEX 1
It will be converted to
CONFIG_CONS_INDEX=y
and moved to include/autoconf.mk, by the tools/scripts/define2mk.sed.
It will cause "make savedefconfig" to fail due to the type conflict.
This commit takes care of it by detecting the type and converting the
CONFIG value correctly.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
2016-05-19 06:51:56 +00:00
|
|
|
ACTION_NO_ENTRY = 1
|
2016-08-22 13:18:21 +00:00
|
|
|
ACTION_NO_ENTRY_WARN = 2
|
|
|
|
ACTION_NO_CHANGE = 3
|
2015-05-20 02:36:07 +00:00
|
|
|
|
|
|
|
COLOR_BLACK = '0;30'
|
|
|
|
COLOR_RED = '0;31'
|
|
|
|
COLOR_GREEN = '0;32'
|
|
|
|
COLOR_BROWN = '0;33'
|
|
|
|
COLOR_BLUE = '0;34'
|
|
|
|
COLOR_PURPLE = '0;35'
|
|
|
|
COLOR_CYAN = '0;36'
|
|
|
|
COLOR_LIGHT_GRAY = '0;37'
|
|
|
|
COLOR_DARK_GRAY = '1;30'
|
|
|
|
COLOR_LIGHT_RED = '1;31'
|
|
|
|
COLOR_LIGHT_GREEN = '1;32'
|
|
|
|
COLOR_YELLOW = '1;33'
|
|
|
|
COLOR_LIGHT_BLUE = '1;34'
|
|
|
|
COLOR_LIGHT_PURPLE = '1;35'
|
|
|
|
COLOR_LIGHT_CYAN = '1;36'
|
|
|
|
COLOR_WHITE = '1;37'
|
|
|
|
|
2017-06-02 01:39:01 +00:00
|
|
|
AUTO_CONF_PATH = 'include/config/auto.conf'
|
2017-06-02 01:39:02 +00:00
|
|
|
CONFIG_DATABASE = 'moveconfig.db'
|
2017-06-02 01:39:01 +00:00
|
|
|
|
2017-06-16 03:39:33 +00:00
|
|
|
CONFIG_LEN = len('CONFIG_')
|
2017-06-02 01:39:01 +00:00
|
|
|
|
2019-05-15 13:15:52 +00:00
|
|
|
SIZES = {
|
|
|
|
"SZ_1": 0x00000001, "SZ_2": 0x00000002,
|
|
|
|
"SZ_4": 0x00000004, "SZ_8": 0x00000008,
|
|
|
|
"SZ_16": 0x00000010, "SZ_32": 0x00000020,
|
|
|
|
"SZ_64": 0x00000040, "SZ_128": 0x00000080,
|
|
|
|
"SZ_256": 0x00000100, "SZ_512": 0x00000200,
|
|
|
|
"SZ_1K": 0x00000400, "SZ_2K": 0x00000800,
|
|
|
|
"SZ_4K": 0x00001000, "SZ_8K": 0x00002000,
|
|
|
|
"SZ_16K": 0x00004000, "SZ_32K": 0x00008000,
|
|
|
|
"SZ_64K": 0x00010000, "SZ_128K": 0x00020000,
|
|
|
|
"SZ_256K": 0x00040000, "SZ_512K": 0x00080000,
|
|
|
|
"SZ_1M": 0x00100000, "SZ_2M": 0x00200000,
|
|
|
|
"SZ_4M": 0x00400000, "SZ_8M": 0x00800000,
|
|
|
|
"SZ_16M": 0x01000000, "SZ_32M": 0x02000000,
|
|
|
|
"SZ_64M": 0x04000000, "SZ_128M": 0x08000000,
|
|
|
|
"SZ_256M": 0x10000000, "SZ_512M": 0x20000000,
|
|
|
|
"SZ_1G": 0x40000000, "SZ_2G": 0x80000000,
|
|
|
|
"SZ_4G": 0x100000000
|
|
|
|
}
|
|
|
|
|
2015-05-20 02:36:07 +00:00
|
|
|
### helper functions ###
|
|
|
|
def get_devnull():
|
|
|
|
"""Get the file object of '/dev/null' device."""
|
|
|
|
try:
|
|
|
|
devnull = subprocess.DEVNULL # py3k
|
|
|
|
except AttributeError:
|
|
|
|
devnull = open(os.devnull, 'wb')
|
|
|
|
return devnull
|
|
|
|
|
|
|
|
def check_top_directory():
|
|
|
|
"""Exit if we are not at the top of source directory."""
|
|
|
|
for f in ('README', 'Licenses'):
|
|
|
|
if not os.path.exists(f):
|
|
|
|
sys.exit('Please run at the top of source directory.')
|
|
|
|
|
tools: moveconfig: exit with error message for not clean directory
When the source tree is not clean, this tool raises an exception
with a message like follows:
Traceback (most recent call last):
File "tools/moveconfig.py", line 939, in <module>
main()
File "tools/moveconfig.py", line 934, in main
move_config(config_attrs, options)
File "tools/moveconfig.py", line 808, in move_config
while not slots.available():
File "tools/moveconfig.py", line 733, in available
if slot.poll():
File "tools/moveconfig.py", line 645, in poll
self.parser.update_dotconfig(self.defconfig)
File "tools/moveconfig.py", line 503, in update_dotconfig
with open(autoconf_path) as f:
IOError: [Errno 2] No such file or directory: '/tmp/tmpDtzCgl/include/autoconf.mk'
This does not explain what is wrong. Show an appropriate error
message "source tree is not clean, please run 'make mrproper'"
in such a situation.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
2016-05-19 06:51:54 +00:00
|
|
|
def check_clean_directory():
|
|
|
|
"""Exit if the source tree is not clean."""
|
|
|
|
for f in ('.config', 'include/config'):
|
|
|
|
if os.path.exists(f):
|
|
|
|
sys.exit("source tree is not clean, please run 'make mrproper'")
|
|
|
|
|
2015-05-20 02:36:07 +00:00
|
|
|
def get_make_cmd():
|
|
|
|
"""Get the command name of GNU Make.
|
|
|
|
|
|
|
|
U-Boot needs GNU Make for building, but the command name is not
|
|
|
|
necessarily "make". (for example, "gmake" on FreeBSD).
|
|
|
|
Returns the most appropriate command name on your system.
|
|
|
|
"""
|
|
|
|
process = subprocess.Popen([SHOW_GNU_MAKE], stdout=subprocess.PIPE)
|
|
|
|
ret = process.communicate()
|
|
|
|
if process.returncode:
|
|
|
|
sys.exit('GNU Make not found')
|
|
|
|
return ret[0].rstrip()
|
|
|
|
|
2017-06-02 01:38:58 +00:00
|
|
|
def get_matched_defconfig(line):
|
|
|
|
"""Get the defconfig files that match a pattern
|
|
|
|
|
|
|
|
Args:
|
|
|
|
line: Path or filename to match, e.g. 'configs/snow_defconfig' or
|
|
|
|
'k2*_defconfig'. If no directory is provided, 'configs/' is
|
|
|
|
prepended
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
a list of matching defconfig files
|
|
|
|
"""
|
|
|
|
dirname = os.path.dirname(line)
|
|
|
|
if dirname:
|
|
|
|
pattern = line
|
|
|
|
else:
|
|
|
|
pattern = os.path.join('configs', line)
|
|
|
|
return glob.glob(pattern) + glob.glob(pattern + '_defconfig')
|
|
|
|
|
2016-10-19 05:39:54 +00:00
|
|
|
def get_matched_defconfigs(defconfigs_file):
|
2017-06-02 01:38:59 +00:00
|
|
|
"""Get all the defconfig files that match the patterns in a file.
|
|
|
|
|
|
|
|
Args:
|
|
|
|
defconfigs_file: File containing a list of defconfigs to process, or
|
|
|
|
'-' to read the list from stdin
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
A list of paths to defconfig files, with no duplicates
|
|
|
|
"""
|
2016-10-19 05:39:54 +00:00
|
|
|
defconfigs = []
|
2017-06-02 01:38:59 +00:00
|
|
|
if defconfigs_file == '-':
|
|
|
|
fd = sys.stdin
|
|
|
|
defconfigs_file = 'stdin'
|
|
|
|
else:
|
|
|
|
fd = open(defconfigs_file)
|
|
|
|
for i, line in enumerate(fd):
|
2016-10-19 05:39:54 +00:00
|
|
|
line = line.strip()
|
|
|
|
if not line:
|
|
|
|
continue # skip blank lines silently
|
2017-06-16 03:39:31 +00:00
|
|
|
if ' ' in line:
|
|
|
|
line = line.split(' ')[0] # handle 'git log' input
|
2017-06-02 01:38:58 +00:00
|
|
|
matched = get_matched_defconfig(line)
|
2016-10-19 05:39:54 +00:00
|
|
|
if not matched:
|
|
|
|
print >> sys.stderr, "warning: %s:%d: no defconfig matched '%s'" % \
|
|
|
|
(defconfigs_file, i + 1, line)
|
|
|
|
|
|
|
|
defconfigs += matched
|
|
|
|
|
|
|
|
# use set() to drop multiple matching
|
|
|
|
return [ defconfig[len('configs') + 1:] for defconfig in set(defconfigs) ]
|
|
|
|
|
2016-07-25 10:15:28 +00:00
|
|
|
def get_all_defconfigs():
|
|
|
|
"""Get all the defconfig files under the configs/ directory."""
|
|
|
|
defconfigs = []
|
|
|
|
for (dirpath, dirnames, filenames) in os.walk('configs'):
|
|
|
|
dirpath = dirpath[len('configs') + 1:]
|
|
|
|
for filename in fnmatch.filter(filenames, '*_defconfig'):
|
|
|
|
defconfigs.append(os.path.join(dirpath, filename))
|
|
|
|
|
|
|
|
return defconfigs
|
|
|
|
|
2015-05-20 02:36:07 +00:00
|
|
|
def color_text(color_enabled, color, string):
|
|
|
|
"""Return colored string."""
|
|
|
|
if color_enabled:
|
2016-05-19 06:52:02 +00:00
|
|
|
# LF should not be surrounded by the escape sequence.
|
|
|
|
# Otherwise, additional whitespace or line-feed might be printed.
|
|
|
|
return '\n'.join([ '\033[' + color + 'm' + s + '\033[0m' if s else ''
|
|
|
|
for s in string.split('\n') ])
|
2015-05-20 02:36:07 +00:00
|
|
|
else:
|
|
|
|
return string
|
|
|
|
|
2016-07-25 10:15:26 +00:00
|
|
|
def show_diff(a, b, file_path, color_enabled):
|
2016-07-25 10:15:25 +00:00
|
|
|
"""Show unidified diff.
|
|
|
|
|
|
|
|
Arguments:
|
|
|
|
a: A list of lines (before)
|
|
|
|
b: A list of lines (after)
|
|
|
|
file_path: Path to the file
|
2016-07-25 10:15:26 +00:00
|
|
|
color_enabled: Display the diff in color
|
2016-07-25 10:15:25 +00:00
|
|
|
"""
|
|
|
|
|
|
|
|
diff = difflib.unified_diff(a, b,
|
|
|
|
fromfile=os.path.join('a', file_path),
|
|
|
|
tofile=os.path.join('b', file_path))
|
|
|
|
|
|
|
|
for line in diff:
|
2016-07-25 10:15:26 +00:00
|
|
|
if line[0] == '-' and line[1] != '-':
|
|
|
|
print color_text(color_enabled, COLOR_RED, line),
|
|
|
|
elif line[0] == '+' and line[1] != '+':
|
|
|
|
print color_text(color_enabled, COLOR_GREEN, line),
|
|
|
|
else:
|
|
|
|
print line,
|
2016-07-25 10:15:25 +00:00
|
|
|
|
2016-07-25 10:15:24 +00:00
|
|
|
def extend_matched_lines(lines, matched, pre_patterns, post_patterns, extend_pre,
|
|
|
|
extend_post):
|
|
|
|
"""Extend matched lines if desired patterns are found before/after already
|
|
|
|
matched lines.
|
|
|
|
|
|
|
|
Arguments:
|
|
|
|
lines: A list of lines handled.
|
|
|
|
matched: A list of line numbers that have been already matched.
|
|
|
|
(will be updated by this function)
|
|
|
|
pre_patterns: A list of regular expression that should be matched as
|
|
|
|
preamble.
|
|
|
|
post_patterns: A list of regular expression that should be matched as
|
|
|
|
postamble.
|
|
|
|
extend_pre: Add the line number of matched preamble to the matched list.
|
|
|
|
extend_post: Add the line number of matched postamble to the matched list.
|
|
|
|
"""
|
|
|
|
extended_matched = []
|
|
|
|
|
|
|
|
j = matched[0]
|
|
|
|
|
|
|
|
for i in matched:
|
|
|
|
if i == 0 or i < j:
|
|
|
|
continue
|
|
|
|
j = i
|
|
|
|
while j in matched:
|
|
|
|
j += 1
|
|
|
|
if j >= len(lines):
|
|
|
|
break
|
|
|
|
|
|
|
|
for p in pre_patterns:
|
|
|
|
if p.search(lines[i - 1]):
|
|
|
|
break
|
|
|
|
else:
|
|
|
|
# not matched
|
|
|
|
continue
|
|
|
|
|
|
|
|
for p in post_patterns:
|
|
|
|
if p.search(lines[j]):
|
|
|
|
break
|
|
|
|
else:
|
|
|
|
# not matched
|
|
|
|
continue
|
|
|
|
|
|
|
|
if extend_pre:
|
|
|
|
extended_matched.append(i - 1)
|
|
|
|
if extend_post:
|
|
|
|
extended_matched.append(j)
|
|
|
|
|
|
|
|
matched += extended_matched
|
|
|
|
matched.sort()
|
|
|
|
|
2017-05-02 09:30:46 +00:00
|
|
|
def confirm(options, prompt):
|
|
|
|
if not options.yes:
|
|
|
|
while True:
|
|
|
|
choice = raw_input('{} [y/n]: '.format(prompt))
|
|
|
|
choice = choice.lower()
|
|
|
|
print choice
|
|
|
|
if choice == 'y' or choice == 'n':
|
|
|
|
break
|
|
|
|
|
|
|
|
if choice == 'n':
|
|
|
|
return False
|
|
|
|
|
|
|
|
return True
|
|
|
|
|
2019-01-30 07:23:16 +00:00
|
|
|
def cleanup_empty_blocks(header_path, options):
|
|
|
|
"""Clean up empty conditional blocks
|
|
|
|
|
|
|
|
Arguments:
|
|
|
|
header_path: path to the cleaned file.
|
|
|
|
options: option flags.
|
|
|
|
"""
|
|
|
|
pattern = re.compile(r'^\s*#\s*if.*$\n^\s*#\s*endif.*$\n*', flags=re.M)
|
|
|
|
with open(header_path) as f:
|
|
|
|
data = f.read()
|
|
|
|
|
|
|
|
new_data = pattern.sub('\n', data)
|
|
|
|
|
|
|
|
show_diff(data.splitlines(True), new_data.splitlines(True), header_path,
|
|
|
|
options.color)
|
|
|
|
|
|
|
|
if options.dry_run:
|
|
|
|
return
|
|
|
|
|
|
|
|
with open(header_path, 'w') as f:
|
|
|
|
f.write(new_data)
|
|
|
|
|
2016-07-25 10:15:26 +00:00
|
|
|
def cleanup_one_header(header_path, patterns, options):
|
2015-05-20 02:36:07 +00:00
|
|
|
"""Clean regex-matched lines away from a file.
|
|
|
|
|
|
|
|
Arguments:
|
|
|
|
header_path: path to the cleaned file.
|
|
|
|
patterns: list of regex patterns. Any lines matching to these
|
|
|
|
patterns are deleted.
|
2016-07-25 10:15:26 +00:00
|
|
|
options: option flags.
|
2015-05-20 02:36:07 +00:00
|
|
|
"""
|
|
|
|
with open(header_path) as f:
|
|
|
|
lines = f.readlines()
|
|
|
|
|
|
|
|
matched = []
|
|
|
|
for i, line in enumerate(lines):
|
2016-07-25 10:15:27 +00:00
|
|
|
if i - 1 in matched and lines[i - 1][-2:] == '\\\n':
|
|
|
|
matched.append(i)
|
|
|
|
continue
|
2015-05-20 02:36:07 +00:00
|
|
|
for pattern in patterns:
|
2016-07-25 10:15:24 +00:00
|
|
|
if pattern.search(line):
|
2015-05-20 02:36:07 +00:00
|
|
|
matched.append(i)
|
|
|
|
break
|
|
|
|
|
2016-07-25 10:15:24 +00:00
|
|
|
if not matched:
|
|
|
|
return
|
|
|
|
|
|
|
|
# remove empty #ifdef ... #endif, successive blank lines
|
|
|
|
pattern_if = re.compile(r'#\s*if(def|ndef)?\W') # #if, #ifdef, #ifndef
|
|
|
|
pattern_elif = re.compile(r'#\s*el(if|se)\W') # #elif, #else
|
|
|
|
pattern_endif = re.compile(r'#\s*endif\W') # #endif
|
|
|
|
pattern_blank = re.compile(r'^\s*$') # empty line
|
|
|
|
|
|
|
|
while True:
|
|
|
|
old_matched = copy.copy(matched)
|
|
|
|
extend_matched_lines(lines, matched, [pattern_if],
|
|
|
|
[pattern_endif], True, True)
|
|
|
|
extend_matched_lines(lines, matched, [pattern_elif],
|
|
|
|
[pattern_elif, pattern_endif], True, False)
|
|
|
|
extend_matched_lines(lines, matched, [pattern_if, pattern_elif],
|
|
|
|
[pattern_blank], False, True)
|
|
|
|
extend_matched_lines(lines, matched, [pattern_blank],
|
|
|
|
[pattern_elif, pattern_endif], True, False)
|
|
|
|
extend_matched_lines(lines, matched, [pattern_blank],
|
|
|
|
[pattern_blank], True, False)
|
|
|
|
if matched == old_matched:
|
|
|
|
break
|
|
|
|
|
2016-07-25 10:15:25 +00:00
|
|
|
tolines = copy.copy(lines)
|
|
|
|
|
|
|
|
for i in reversed(matched):
|
|
|
|
tolines.pop(i)
|
|
|
|
|
2016-07-25 10:15:26 +00:00
|
|
|
show_diff(lines, tolines, header_path, options.color)
|
2016-07-25 10:15:24 +00:00
|
|
|
|
2016-07-25 10:15:26 +00:00
|
|
|
if options.dry_run:
|
2015-05-20 02:36:07 +00:00
|
|
|
return
|
|
|
|
|
|
|
|
with open(header_path, 'w') as f:
|
2016-07-25 10:15:25 +00:00
|
|
|
for line in tolines:
|
|
|
|
f.write(line)
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2016-07-25 10:15:26 +00:00
|
|
|
def cleanup_headers(configs, options):
|
2015-05-20 02:36:07 +00:00
|
|
|
"""Delete config defines from board headers.
|
|
|
|
|
|
|
|
Arguments:
|
2016-05-19 06:51:57 +00:00
|
|
|
configs: A list of CONFIGs to remove.
|
2016-07-25 10:15:26 +00:00
|
|
|
options: option flags.
|
2015-05-20 02:36:07 +00:00
|
|
|
"""
|
2017-05-02 09:30:46 +00:00
|
|
|
if not confirm(options, 'Clean up headers?'):
|
|
|
|
return
|
2015-05-20 02:36:07 +00:00
|
|
|
|
|
|
|
patterns = []
|
2016-05-19 06:51:57 +00:00
|
|
|
for config in configs:
|
2015-05-20 02:36:07 +00:00
|
|
|
patterns.append(re.compile(r'#\s*define\s+%s\W' % config))
|
|
|
|
patterns.append(re.compile(r'#\s*undef\s+%s\W' % config))
|
|
|
|
|
2015-05-19 18:21:21 +00:00
|
|
|
for dir in 'include', 'arch', 'board':
|
|
|
|
for (dirpath, dirnames, filenames) in os.walk(dir):
|
2016-07-25 10:15:22 +00:00
|
|
|
if dirpath == os.path.join('include', 'generated'):
|
|
|
|
continue
|
2015-05-19 18:21:21 +00:00
|
|
|
for filename in filenames:
|
|
|
|
if not fnmatch.fnmatch(filename, '*~'):
|
2019-01-30 07:23:16 +00:00
|
|
|
header_path = os.path.join(dirpath, filename)
|
|
|
|
cleanup_one_header(header_path, patterns, options)
|
|
|
|
cleanup_empty_blocks(header_path, options)
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2016-07-25 10:15:29 +00:00
|
|
|
def cleanup_one_extra_option(defconfig_path, configs, options):
|
|
|
|
"""Delete config defines in CONFIG_SYS_EXTRA_OPTIONS in one defconfig file.
|
|
|
|
|
|
|
|
Arguments:
|
|
|
|
defconfig_path: path to the cleaned defconfig file.
|
|
|
|
configs: A list of CONFIGs to remove.
|
|
|
|
options: option flags.
|
|
|
|
"""
|
|
|
|
|
|
|
|
start = 'CONFIG_SYS_EXTRA_OPTIONS="'
|
|
|
|
end = '"\n'
|
|
|
|
|
|
|
|
with open(defconfig_path) as f:
|
|
|
|
lines = f.readlines()
|
|
|
|
|
|
|
|
for i, line in enumerate(lines):
|
|
|
|
if line.startswith(start) and line.endswith(end):
|
|
|
|
break
|
|
|
|
else:
|
|
|
|
# CONFIG_SYS_EXTRA_OPTIONS was not found in this defconfig
|
|
|
|
return
|
|
|
|
|
|
|
|
old_tokens = line[len(start):-len(end)].split(',')
|
|
|
|
new_tokens = []
|
|
|
|
|
|
|
|
for token in old_tokens:
|
|
|
|
pos = token.find('=')
|
|
|
|
if not (token[:pos] if pos >= 0 else token) in configs:
|
|
|
|
new_tokens.append(token)
|
|
|
|
|
|
|
|
if new_tokens == old_tokens:
|
|
|
|
return
|
|
|
|
|
|
|
|
tolines = copy.copy(lines)
|
|
|
|
|
|
|
|
if new_tokens:
|
|
|
|
tolines[i] = start + ','.join(new_tokens) + end
|
|
|
|
else:
|
|
|
|
tolines.pop(i)
|
|
|
|
|
|
|
|
show_diff(lines, tolines, defconfig_path, options.color)
|
|
|
|
|
|
|
|
if options.dry_run:
|
|
|
|
return
|
|
|
|
|
|
|
|
with open(defconfig_path, 'w') as f:
|
|
|
|
for line in tolines:
|
|
|
|
f.write(line)
|
|
|
|
|
|
|
|
def cleanup_extra_options(configs, options):
|
|
|
|
"""Delete config defines in CONFIG_SYS_EXTRA_OPTIONS in defconfig files.
|
|
|
|
|
|
|
|
Arguments:
|
|
|
|
configs: A list of CONFIGs to remove.
|
|
|
|
options: option flags.
|
|
|
|
"""
|
2017-05-02 09:30:46 +00:00
|
|
|
if not confirm(options, 'Clean up CONFIG_SYS_EXTRA_OPTIONS?'):
|
|
|
|
return
|
2016-07-25 10:15:29 +00:00
|
|
|
|
|
|
|
configs = [ config[len('CONFIG_'):] for config in configs ]
|
|
|
|
|
|
|
|
defconfigs = get_all_defconfigs()
|
|
|
|
|
|
|
|
for defconfig in defconfigs:
|
|
|
|
cleanup_one_extra_option(os.path.join('configs', defconfig), configs,
|
|
|
|
options)
|
|
|
|
|
2017-05-02 09:30:47 +00:00
|
|
|
def cleanup_whitelist(configs, options):
|
|
|
|
"""Delete config whitelist entries
|
|
|
|
|
|
|
|
Arguments:
|
|
|
|
configs: A list of CONFIGs to remove.
|
|
|
|
options: option flags.
|
|
|
|
"""
|
|
|
|
if not confirm(options, 'Clean up whitelist entries?'):
|
|
|
|
return
|
|
|
|
|
|
|
|
with open(os.path.join('scripts', 'config_whitelist.txt')) as f:
|
|
|
|
lines = f.readlines()
|
|
|
|
|
|
|
|
lines = [x for x in lines if x.strip() not in configs]
|
|
|
|
|
|
|
|
with open(os.path.join('scripts', 'config_whitelist.txt'), 'w') as f:
|
|
|
|
f.write(''.join(lines))
|
|
|
|
|
2017-05-02 09:30:48 +00:00
|
|
|
def find_matching(patterns, line):
|
|
|
|
for pat in patterns:
|
|
|
|
if pat.search(line):
|
|
|
|
return True
|
|
|
|
return False
|
|
|
|
|
|
|
|
def cleanup_readme(configs, options):
|
|
|
|
"""Delete config description in README
|
|
|
|
|
|
|
|
Arguments:
|
|
|
|
configs: A list of CONFIGs to remove.
|
|
|
|
options: option flags.
|
|
|
|
"""
|
|
|
|
if not confirm(options, 'Clean up README?'):
|
|
|
|
return
|
|
|
|
|
|
|
|
patterns = []
|
|
|
|
for config in configs:
|
|
|
|
patterns.append(re.compile(r'^\s+%s' % config))
|
|
|
|
|
|
|
|
with open('README') as f:
|
|
|
|
lines = f.readlines()
|
|
|
|
|
|
|
|
found = False
|
|
|
|
newlines = []
|
|
|
|
for line in lines:
|
|
|
|
if not found:
|
|
|
|
found = find_matching(patterns, line)
|
|
|
|
if found:
|
|
|
|
continue
|
|
|
|
|
|
|
|
if found and re.search(r'^\s+CONFIG', line):
|
|
|
|
found = False
|
|
|
|
|
|
|
|
if not found:
|
|
|
|
newlines.append(line)
|
|
|
|
|
|
|
|
with open('README', 'w') as f:
|
|
|
|
f.write(''.join(newlines))
|
|
|
|
|
2019-05-15 13:15:52 +00:00
|
|
|
def try_expand(line):
|
|
|
|
"""If value looks like an expression, try expanding it
|
|
|
|
Otherwise just return the existing value
|
|
|
|
"""
|
|
|
|
if line.find('=') == -1:
|
|
|
|
return line
|
|
|
|
|
|
|
|
try:
|
|
|
|
cfg, val = re.split("=", line)
|
|
|
|
val= val.strip('\"')
|
|
|
|
if re.search("[*+-/]|<<|SZ_+|\(([^\)]+)\)", val):
|
|
|
|
newval = hex(eval(val, SIZES))
|
|
|
|
print "\tExpanded expression %s to %s" % (val, newval)
|
|
|
|
return cfg+'='+newval
|
|
|
|
except:
|
|
|
|
print "\tFailed to expand expression in %s" % line
|
|
|
|
|
|
|
|
return line
|
|
|
|
|
2017-05-02 09:30:47 +00:00
|
|
|
|
2015-05-20 02:36:07 +00:00
|
|
|
### classes ###
|
2016-05-19 06:51:55 +00:00
|
|
|
class Progress:
|
|
|
|
|
|
|
|
"""Progress Indicator"""
|
|
|
|
|
|
|
|
def __init__(self, total):
|
|
|
|
"""Create a new progress indicator.
|
|
|
|
|
|
|
|
Arguments:
|
|
|
|
total: A number of defconfig files to process.
|
|
|
|
"""
|
|
|
|
self.current = 0
|
|
|
|
self.total = total
|
|
|
|
|
|
|
|
def inc(self):
|
|
|
|
"""Increment the number of processed defconfig files."""
|
|
|
|
|
|
|
|
self.current += 1
|
|
|
|
|
|
|
|
def show(self):
|
|
|
|
"""Display the progress."""
|
|
|
|
print ' %d defconfigs out of %d\r' % (self.current, self.total),
|
|
|
|
sys.stdout.flush()
|
|
|
|
|
2017-06-16 03:39:33 +00:00
|
|
|
|
|
|
|
class KconfigScanner:
|
|
|
|
"""Kconfig scanner."""
|
|
|
|
|
|
|
|
def __init__(self):
|
|
|
|
"""Scan all the Kconfig files and create a Config object."""
|
|
|
|
# Define environment variables referenced from Kconfig
|
|
|
|
os.environ['srctree'] = os.getcwd()
|
|
|
|
os.environ['UBOOTVERSION'] = 'dummy'
|
|
|
|
os.environ['KCONFIG_OBJDIR'] = ''
|
2019-09-20 21:42:09 +00:00
|
|
|
self.conf = kconfiglib.Kconfig()
|
2017-06-16 03:39:33 +00:00
|
|
|
|
|
|
|
|
2015-05-20 02:36:07 +00:00
|
|
|
class KconfigParser:
|
|
|
|
|
|
|
|
"""A parser of .config and include/autoconf.mk."""
|
|
|
|
|
|
|
|
re_arch = re.compile(r'CONFIG_SYS_ARCH="(.*)"')
|
|
|
|
re_cpu = re.compile(r'CONFIG_SYS_CPU="(.*)"')
|
|
|
|
|
2016-05-19 06:52:01 +00:00
|
|
|
def __init__(self, configs, options, build_dir):
|
2015-05-20 02:36:07 +00:00
|
|
|
"""Create a new parser.
|
|
|
|
|
|
|
|
Arguments:
|
2016-05-19 06:51:57 +00:00
|
|
|
configs: A list of CONFIGs to move.
|
2015-05-20 02:36:07 +00:00
|
|
|
options: option flags.
|
|
|
|
build_dir: Build directory.
|
|
|
|
"""
|
2016-05-19 06:51:57 +00:00
|
|
|
self.configs = configs
|
2015-05-20 02:36:07 +00:00
|
|
|
self.options = options
|
2016-05-19 06:52:00 +00:00
|
|
|
self.dotconfig = os.path.join(build_dir, '.config')
|
|
|
|
self.autoconf = os.path.join(build_dir, 'include', 'autoconf.mk')
|
2016-08-22 13:18:22 +00:00
|
|
|
self.spl_autoconf = os.path.join(build_dir, 'spl', 'include',
|
|
|
|
'autoconf.mk')
|
2017-06-02 01:39:01 +00:00
|
|
|
self.config_autoconf = os.path.join(build_dir, AUTO_CONF_PATH)
|
2016-05-19 06:52:06 +00:00
|
|
|
self.defconfig = os.path.join(build_dir, 'defconfig')
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2017-07-10 20:47:47 +00:00
|
|
|
def get_arch(self):
|
|
|
|
"""Parse .config file and return the architecture.
|
2015-05-20 02:36:07 +00:00
|
|
|
|
|
|
|
Returns:
|
2017-07-10 20:47:47 +00:00
|
|
|
Architecture name (e.g. 'arm').
|
2015-05-20 02:36:07 +00:00
|
|
|
"""
|
|
|
|
arch = ''
|
|
|
|
cpu = ''
|
2016-05-19 06:52:00 +00:00
|
|
|
for line in open(self.dotconfig):
|
2015-05-20 02:36:07 +00:00
|
|
|
m = self.re_arch.match(line)
|
|
|
|
if m:
|
|
|
|
arch = m.group(1)
|
|
|
|
continue
|
|
|
|
m = self.re_cpu.match(line)
|
|
|
|
if m:
|
|
|
|
cpu = m.group(1)
|
|
|
|
|
2016-05-19 06:51:53 +00:00
|
|
|
if not arch:
|
|
|
|
return None
|
2015-05-20 02:36:07 +00:00
|
|
|
|
|
|
|
# fix-up for aarch64
|
|
|
|
if arch == 'arm' and cpu == 'armv8':
|
|
|
|
arch = 'aarch64'
|
|
|
|
|
2017-07-10 20:47:47 +00:00
|
|
|
return arch
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2016-05-19 06:51:57 +00:00
|
|
|
def parse_one_config(self, config, dotconfig_lines, autoconf_lines):
|
2015-05-20 02:36:07 +00:00
|
|
|
"""Parse .config, defconfig, include/autoconf.mk for one config.
|
|
|
|
|
|
|
|
This function looks for the config options in the lines from
|
|
|
|
defconfig, .config, and include/autoconf.mk in order to decide
|
|
|
|
which action should be taken for this defconfig.
|
|
|
|
|
|
|
|
Arguments:
|
2016-05-19 06:51:57 +00:00
|
|
|
config: CONFIG name to parse.
|
tools: moveconfig: do not rely on type and default value given by users
Commit 96464badc794 ("moveconfig: Always run savedefconfig on the
moved config") changed the work flow of this tool a lot from the
original intention when this tool was designed first.
Since then, before running this tool, users must edit the Kconfig to
add the menu entries for the configs they are moving. It means users
had already specified the type and the default value for each CONFIG
via its Kconfig entry. Nevertheless, users are still required to
dictate the same type and the default value in the input file. This
is tedious to use. So, my idea here is to deprecate the latter.
Before moving forward with it, there is one issue worth mentioning;
since the savedefconfig re-sync was introduced, this tool has not
been able to move bool options with "default y". Joe sent a patch
to solve this problem about a year ago, but it was not applied for
some reasons. Now, he came back with an updated patch, so this
problem will be fixed soon.
For other use cases, I see no reason to require redundant dictation
in the input file. Instead, the tool can know the types and default
values by parsing the .config file.
This commit changes the tool to use the CONFIG names, but ignore the
types and default values given by the input file.
This commit also fixes one bug. Prior to this commit, it could not
move an integer-typed CONFIG with value 1.
For example, assume we are moving CONFIG_CONS_INDEX. Please note
this is an integer type option.
Many board headers define this CONFIG as 1.
#define CONFIG_CONS_INDEX 1
It will be converted to
CONFIG_CONS_INDEX=y
and moved to include/autoconf.mk, by the tools/scripts/define2mk.sed.
It will cause "make savedefconfig" to fail due to the type conflict.
This commit takes care of it by detecting the type and converting the
CONFIG value correctly.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
2016-05-19 06:51:56 +00:00
|
|
|
dotconfig_lines: lines from the .config file.
|
2015-05-20 02:36:07 +00:00
|
|
|
autoconf_lines: lines from the include/autoconf.mk file.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
A tupple of the action for this defconfig and the line
|
|
|
|
matched for the config.
|
|
|
|
"""
|
|
|
|
not_set = '# %s is not set' % config
|
|
|
|
|
|
|
|
for line in autoconf_lines:
|
|
|
|
line = line.rstrip()
|
|
|
|
if line.startswith(config + '='):
|
tools: moveconfig: do not rely on type and default value given by users
Commit 96464badc794 ("moveconfig: Always run savedefconfig on the
moved config") changed the work flow of this tool a lot from the
original intention when this tool was designed first.
Since then, before running this tool, users must edit the Kconfig to
add the menu entries for the configs they are moving. It means users
had already specified the type and the default value for each CONFIG
via its Kconfig entry. Nevertheless, users are still required to
dictate the same type and the default value in the input file. This
is tedious to use. So, my idea here is to deprecate the latter.
Before moving forward with it, there is one issue worth mentioning;
since the savedefconfig re-sync was introduced, this tool has not
been able to move bool options with "default y". Joe sent a patch
to solve this problem about a year ago, but it was not applied for
some reasons. Now, he came back with an updated patch, so this
problem will be fixed soon.
For other use cases, I see no reason to require redundant dictation
in the input file. Instead, the tool can know the types and default
values by parsing the .config file.
This commit changes the tool to use the CONFIG names, but ignore the
types and default values given by the input file.
This commit also fixes one bug. Prior to this commit, it could not
move an integer-typed CONFIG with value 1.
For example, assume we are moving CONFIG_CONS_INDEX. Please note
this is an integer type option.
Many board headers define this CONFIG as 1.
#define CONFIG_CONS_INDEX 1
It will be converted to
CONFIG_CONS_INDEX=y
and moved to include/autoconf.mk, by the tools/scripts/define2mk.sed.
It will cause "make savedefconfig" to fail due to the type conflict.
This commit takes care of it by detecting the type and converting the
CONFIG value correctly.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
2016-05-19 06:51:56 +00:00
|
|
|
new_val = line
|
2015-05-20 02:36:07 +00:00
|
|
|
break
|
|
|
|
else:
|
tools: moveconfig: do not rely on type and default value given by users
Commit 96464badc794 ("moveconfig: Always run savedefconfig on the
moved config") changed the work flow of this tool a lot from the
original intention when this tool was designed first.
Since then, before running this tool, users must edit the Kconfig to
add the menu entries for the configs they are moving. It means users
had already specified the type and the default value for each CONFIG
via its Kconfig entry. Nevertheless, users are still required to
dictate the same type and the default value in the input file. This
is tedious to use. So, my idea here is to deprecate the latter.
Before moving forward with it, there is one issue worth mentioning;
since the savedefconfig re-sync was introduced, this tool has not
been able to move bool options with "default y". Joe sent a patch
to solve this problem about a year ago, but it was not applied for
some reasons. Now, he came back with an updated patch, so this
problem will be fixed soon.
For other use cases, I see no reason to require redundant dictation
in the input file. Instead, the tool can know the types and default
values by parsing the .config file.
This commit changes the tool to use the CONFIG names, but ignore the
types and default values given by the input file.
This commit also fixes one bug. Prior to this commit, it could not
move an integer-typed CONFIG with value 1.
For example, assume we are moving CONFIG_CONS_INDEX. Please note
this is an integer type option.
Many board headers define this CONFIG as 1.
#define CONFIG_CONS_INDEX 1
It will be converted to
CONFIG_CONS_INDEX=y
and moved to include/autoconf.mk, by the tools/scripts/define2mk.sed.
It will cause "make savedefconfig" to fail due to the type conflict.
This commit takes care of it by detecting the type and converting the
CONFIG value correctly.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
2016-05-19 06:51:56 +00:00
|
|
|
new_val = not_set
|
|
|
|
|
2019-05-15 13:15:52 +00:00
|
|
|
new_val = try_expand(new_val)
|
|
|
|
|
2016-08-22 13:18:21 +00:00
|
|
|
for line in dotconfig_lines:
|
|
|
|
line = line.rstrip()
|
|
|
|
if line.startswith(config + '=') or line == not_set:
|
|
|
|
old_val = line
|
|
|
|
break
|
|
|
|
else:
|
|
|
|
if new_val == not_set:
|
|
|
|
return (ACTION_NO_ENTRY, config)
|
|
|
|
else:
|
|
|
|
return (ACTION_NO_ENTRY_WARN, config)
|
|
|
|
|
tools: moveconfig: do not rely on type and default value given by users
Commit 96464badc794 ("moveconfig: Always run savedefconfig on the
moved config") changed the work flow of this tool a lot from the
original intention when this tool was designed first.
Since then, before running this tool, users must edit the Kconfig to
add the menu entries for the configs they are moving. It means users
had already specified the type and the default value for each CONFIG
via its Kconfig entry. Nevertheless, users are still required to
dictate the same type and the default value in the input file. This
is tedious to use. So, my idea here is to deprecate the latter.
Before moving forward with it, there is one issue worth mentioning;
since the savedefconfig re-sync was introduced, this tool has not
been able to move bool options with "default y". Joe sent a patch
to solve this problem about a year ago, but it was not applied for
some reasons. Now, he came back with an updated patch, so this
problem will be fixed soon.
For other use cases, I see no reason to require redundant dictation
in the input file. Instead, the tool can know the types and default
values by parsing the .config file.
This commit changes the tool to use the CONFIG names, but ignore the
types and default values given by the input file.
This commit also fixes one bug. Prior to this commit, it could not
move an integer-typed CONFIG with value 1.
For example, assume we are moving CONFIG_CONS_INDEX. Please note
this is an integer type option.
Many board headers define this CONFIG as 1.
#define CONFIG_CONS_INDEX 1
It will be converted to
CONFIG_CONS_INDEX=y
and moved to include/autoconf.mk, by the tools/scripts/define2mk.sed.
It will cause "make savedefconfig" to fail due to the type conflict.
This commit takes care of it by detecting the type and converting the
CONFIG value correctly.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
2016-05-19 06:51:56 +00:00
|
|
|
# If this CONFIG is neither bool nor trisate
|
|
|
|
if old_val[-2:] != '=y' and old_val[-2:] != '=m' and old_val != not_set:
|
|
|
|
# tools/scripts/define2mk.sed changes '1' to 'y'.
|
|
|
|
# This is a problem if the CONFIG is int type.
|
|
|
|
# Check the type in Kconfig and handle it correctly.
|
|
|
|
if new_val[-2:] == '=y':
|
|
|
|
new_val = new_val[:-1] + '1'
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2016-06-15 05:33:50 +00:00
|
|
|
return (ACTION_NO_CHANGE if old_val == new_val else ACTION_MOVE,
|
|
|
|
new_val)
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2016-05-19 06:52:02 +00:00
|
|
|
def update_dotconfig(self):
|
2016-05-19 06:51:50 +00:00
|
|
|
"""Parse files for the config options and update the .config.
|
2015-05-20 02:36:07 +00:00
|
|
|
|
tools: moveconfig: do not rely on type and default value given by users
Commit 96464badc794 ("moveconfig: Always run savedefconfig on the
moved config") changed the work flow of this tool a lot from the
original intention when this tool was designed first.
Since then, before running this tool, users must edit the Kconfig to
add the menu entries for the configs they are moving. It means users
had already specified the type and the default value for each CONFIG
via its Kconfig entry. Nevertheless, users are still required to
dictate the same type and the default value in the input file. This
is tedious to use. So, my idea here is to deprecate the latter.
Before moving forward with it, there is one issue worth mentioning;
since the savedefconfig re-sync was introduced, this tool has not
been able to move bool options with "default y". Joe sent a patch
to solve this problem about a year ago, but it was not applied for
some reasons. Now, he came back with an updated patch, so this
problem will be fixed soon.
For other use cases, I see no reason to require redundant dictation
in the input file. Instead, the tool can know the types and default
values by parsing the .config file.
This commit changes the tool to use the CONFIG names, but ignore the
types and default values given by the input file.
This commit also fixes one bug. Prior to this commit, it could not
move an integer-typed CONFIG with value 1.
For example, assume we are moving CONFIG_CONS_INDEX. Please note
this is an integer type option.
Many board headers define this CONFIG as 1.
#define CONFIG_CONS_INDEX 1
It will be converted to
CONFIG_CONS_INDEX=y
and moved to include/autoconf.mk, by the tools/scripts/define2mk.sed.
It will cause "make savedefconfig" to fail due to the type conflict.
This commit takes care of it by detecting the type and converting the
CONFIG value correctly.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
2016-05-19 06:51:56 +00:00
|
|
|
This function parses the generated .config and include/autoconf.mk
|
|
|
|
searching the target options.
|
2016-05-19 06:51:50 +00:00
|
|
|
Move the config option(s) to the .config as needed.
|
2015-05-20 02:36:07 +00:00
|
|
|
|
|
|
|
Arguments:
|
|
|
|
defconfig: defconfig name.
|
2016-05-19 06:52:01 +00:00
|
|
|
|
|
|
|
Returns:
|
2016-05-19 06:52:04 +00:00
|
|
|
Return a tuple of (updated flag, log string).
|
|
|
|
The "updated flag" is True if the .config was updated, False
|
|
|
|
otherwise. The "log string" shows what happend to the .config.
|
2015-05-20 02:36:07 +00:00
|
|
|
"""
|
|
|
|
|
|
|
|
results = []
|
2016-05-19 06:52:04 +00:00
|
|
|
updated = False
|
2016-08-22 13:18:21 +00:00
|
|
|
suspicious = False
|
2016-08-22 13:18:22 +00:00
|
|
|
rm_files = [self.config_autoconf, self.autoconf]
|
|
|
|
|
|
|
|
if self.options.spl:
|
|
|
|
if os.path.exists(self.spl_autoconf):
|
|
|
|
autoconf_path = self.spl_autoconf
|
|
|
|
rm_files.append(self.spl_autoconf)
|
|
|
|
else:
|
|
|
|
for f in rm_files:
|
|
|
|
os.remove(f)
|
|
|
|
return (updated, suspicious,
|
|
|
|
color_text(self.options.color, COLOR_BROWN,
|
|
|
|
"SPL is not enabled. Skipped.") + '\n')
|
|
|
|
else:
|
|
|
|
autoconf_path = self.autoconf
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2016-05-19 06:52:00 +00:00
|
|
|
with open(self.dotconfig) as f:
|
tools: moveconfig: do not rely on type and default value given by users
Commit 96464badc794 ("moveconfig: Always run savedefconfig on the
moved config") changed the work flow of this tool a lot from the
original intention when this tool was designed first.
Since then, before running this tool, users must edit the Kconfig to
add the menu entries for the configs they are moving. It means users
had already specified the type and the default value for each CONFIG
via its Kconfig entry. Nevertheless, users are still required to
dictate the same type and the default value in the input file. This
is tedious to use. So, my idea here is to deprecate the latter.
Before moving forward with it, there is one issue worth mentioning;
since the savedefconfig re-sync was introduced, this tool has not
been able to move bool options with "default y". Joe sent a patch
to solve this problem about a year ago, but it was not applied for
some reasons. Now, he came back with an updated patch, so this
problem will be fixed soon.
For other use cases, I see no reason to require redundant dictation
in the input file. Instead, the tool can know the types and default
values by parsing the .config file.
This commit changes the tool to use the CONFIG names, but ignore the
types and default values given by the input file.
This commit also fixes one bug. Prior to this commit, it could not
move an integer-typed CONFIG with value 1.
For example, assume we are moving CONFIG_CONS_INDEX. Please note
this is an integer type option.
Many board headers define this CONFIG as 1.
#define CONFIG_CONS_INDEX 1
It will be converted to
CONFIG_CONS_INDEX=y
and moved to include/autoconf.mk, by the tools/scripts/define2mk.sed.
It will cause "make savedefconfig" to fail due to the type conflict.
This commit takes care of it by detecting the type and converting the
CONFIG value correctly.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
2016-05-19 06:51:56 +00:00
|
|
|
dotconfig_lines = f.readlines()
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2016-08-22 13:18:22 +00:00
|
|
|
with open(autoconf_path) as f:
|
2015-05-20 02:36:07 +00:00
|
|
|
autoconf_lines = f.readlines()
|
|
|
|
|
2016-05-19 06:51:57 +00:00
|
|
|
for config in self.configs:
|
|
|
|
result = self.parse_one_config(config, dotconfig_lines,
|
2015-05-19 18:21:17 +00:00
|
|
|
autoconf_lines)
|
2015-05-20 02:36:07 +00:00
|
|
|
results.append(result)
|
|
|
|
|
|
|
|
log = ''
|
|
|
|
|
|
|
|
for (action, value) in results:
|
|
|
|
if action == ACTION_MOVE:
|
|
|
|
actlog = "Move '%s'" % value
|
|
|
|
log_color = COLOR_LIGHT_GREEN
|
tools: moveconfig: do not rely on type and default value given by users
Commit 96464badc794 ("moveconfig: Always run savedefconfig on the
moved config") changed the work flow of this tool a lot from the
original intention when this tool was designed first.
Since then, before running this tool, users must edit the Kconfig to
add the menu entries for the configs they are moving. It means users
had already specified the type and the default value for each CONFIG
via its Kconfig entry. Nevertheless, users are still required to
dictate the same type and the default value in the input file. This
is tedious to use. So, my idea here is to deprecate the latter.
Before moving forward with it, there is one issue worth mentioning;
since the savedefconfig re-sync was introduced, this tool has not
been able to move bool options with "default y". Joe sent a patch
to solve this problem about a year ago, but it was not applied for
some reasons. Now, he came back with an updated patch, so this
problem will be fixed soon.
For other use cases, I see no reason to require redundant dictation
in the input file. Instead, the tool can know the types and default
values by parsing the .config file.
This commit changes the tool to use the CONFIG names, but ignore the
types and default values given by the input file.
This commit also fixes one bug. Prior to this commit, it could not
move an integer-typed CONFIG with value 1.
For example, assume we are moving CONFIG_CONS_INDEX. Please note
this is an integer type option.
Many board headers define this CONFIG as 1.
#define CONFIG_CONS_INDEX 1
It will be converted to
CONFIG_CONS_INDEX=y
and moved to include/autoconf.mk, by the tools/scripts/define2mk.sed.
It will cause "make savedefconfig" to fail due to the type conflict.
This commit takes care of it by detecting the type and converting the
CONFIG value correctly.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
2016-05-19 06:51:56 +00:00
|
|
|
elif action == ACTION_NO_ENTRY:
|
|
|
|
actlog = "%s is not defined in Kconfig. Do nothing." % value
|
2015-05-20 02:36:07 +00:00
|
|
|
log_color = COLOR_LIGHT_BLUE
|
2016-08-22 13:18:21 +00:00
|
|
|
elif action == ACTION_NO_ENTRY_WARN:
|
|
|
|
actlog = "%s is not defined in Kconfig (suspicious). Do nothing." % value
|
|
|
|
log_color = COLOR_YELLOW
|
|
|
|
suspicious = True
|
tools: moveconfig: do not rely on type and default value given by users
Commit 96464badc794 ("moveconfig: Always run savedefconfig on the
moved config") changed the work flow of this tool a lot from the
original intention when this tool was designed first.
Since then, before running this tool, users must edit the Kconfig to
add the menu entries for the configs they are moving. It means users
had already specified the type and the default value for each CONFIG
via its Kconfig entry. Nevertheless, users are still required to
dictate the same type and the default value in the input file. This
is tedious to use. So, my idea here is to deprecate the latter.
Before moving forward with it, there is one issue worth mentioning;
since the savedefconfig re-sync was introduced, this tool has not
been able to move bool options with "default y". Joe sent a patch
to solve this problem about a year ago, but it was not applied for
some reasons. Now, he came back with an updated patch, so this
problem will be fixed soon.
For other use cases, I see no reason to require redundant dictation
in the input file. Instead, the tool can know the types and default
values by parsing the .config file.
This commit changes the tool to use the CONFIG names, but ignore the
types and default values given by the input file.
This commit also fixes one bug. Prior to this commit, it could not
move an integer-typed CONFIG with value 1.
For example, assume we are moving CONFIG_CONS_INDEX. Please note
this is an integer type option.
Many board headers define this CONFIG as 1.
#define CONFIG_CONS_INDEX 1
It will be converted to
CONFIG_CONS_INDEX=y
and moved to include/autoconf.mk, by the tools/scripts/define2mk.sed.
It will cause "make savedefconfig" to fail due to the type conflict.
This commit takes care of it by detecting the type and converting the
CONFIG value correctly.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Joe Hershberger <joe.hershberger@ni.com>
2016-05-19 06:51:56 +00:00
|
|
|
elif action == ACTION_NO_CHANGE:
|
|
|
|
actlog = "'%s' is the same as the define in Kconfig. Do nothing." \
|
|
|
|
% value
|
2015-05-20 02:36:07 +00:00
|
|
|
log_color = COLOR_LIGHT_PURPLE
|
2016-08-22 13:18:22 +00:00
|
|
|
elif action == ACTION_SPL_NOT_EXIST:
|
|
|
|
actlog = "SPL is not enabled for this defconfig. Skip."
|
|
|
|
log_color = COLOR_PURPLE
|
2015-05-20 02:36:07 +00:00
|
|
|
else:
|
|
|
|
sys.exit("Internal Error. This should not happen.")
|
|
|
|
|
2016-05-19 06:52:02 +00:00
|
|
|
log += color_text(self.options.color, log_color, actlog) + '\n'
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2016-05-19 06:52:00 +00:00
|
|
|
with open(self.dotconfig, 'a') as f:
|
2016-05-19 06:51:49 +00:00
|
|
|
for (action, value) in results:
|
|
|
|
if action == ACTION_MOVE:
|
|
|
|
f.write(value + '\n')
|
2016-05-19 06:52:04 +00:00
|
|
|
updated = True
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2016-05-19 06:52:06 +00:00
|
|
|
self.results = results
|
2016-08-22 13:18:22 +00:00
|
|
|
for f in rm_files:
|
|
|
|
os.remove(f)
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2016-08-22 13:18:21 +00:00
|
|
|
return (updated, suspicious, log)
|
2016-05-19 06:52:01 +00:00
|
|
|
|
2016-05-19 06:52:06 +00:00
|
|
|
def check_defconfig(self):
|
|
|
|
"""Check the defconfig after savedefconfig
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
Return additional log if moved CONFIGs were removed again by
|
|
|
|
'make savedefconfig'.
|
|
|
|
"""
|
|
|
|
|
|
|
|
log = ''
|
|
|
|
|
|
|
|
with open(self.defconfig) as f:
|
|
|
|
defconfig_lines = f.readlines()
|
|
|
|
|
|
|
|
for (action, value) in self.results:
|
|
|
|
if action != ACTION_MOVE:
|
|
|
|
continue
|
|
|
|
if not value + '\n' in defconfig_lines:
|
|
|
|
log += color_text(self.options.color, COLOR_YELLOW,
|
|
|
|
"'%s' was removed by savedefconfig.\n" %
|
|
|
|
value)
|
|
|
|
|
|
|
|
return log
|
|
|
|
|
2017-06-02 01:39:02 +00:00
|
|
|
|
|
|
|
class DatabaseThread(threading.Thread):
|
|
|
|
"""This thread processes results from Slot threads.
|
|
|
|
|
|
|
|
It collects the data in the master config directary. There is only one
|
|
|
|
result thread, and this helps to serialise the build output.
|
|
|
|
"""
|
|
|
|
def __init__(self, config_db, db_queue):
|
|
|
|
"""Set up a new result thread
|
|
|
|
|
|
|
|
Args:
|
|
|
|
builder: Builder which will be sent each result
|
|
|
|
"""
|
|
|
|
threading.Thread.__init__(self)
|
|
|
|
self.config_db = config_db
|
|
|
|
self.db_queue= db_queue
|
|
|
|
|
|
|
|
def run(self):
|
|
|
|
"""Called to start up the result thread.
|
|
|
|
|
|
|
|
We collect the next result job and pass it on to the build.
|
|
|
|
"""
|
|
|
|
while True:
|
|
|
|
defconfig, configs = self.db_queue.get()
|
|
|
|
self.config_db[defconfig] = configs
|
|
|
|
self.db_queue.task_done()
|
|
|
|
|
|
|
|
|
2015-05-20 02:36:07 +00:00
|
|
|
class Slot:
|
|
|
|
|
|
|
|
"""A slot to store a subprocess.
|
|
|
|
|
|
|
|
Each instance of this class handles one subprocess.
|
|
|
|
This class is useful to control multiple threads
|
|
|
|
for faster processing.
|
|
|
|
"""
|
|
|
|
|
2017-07-10 20:47:47 +00:00
|
|
|
def __init__(self, toolchains, configs, options, progress, devnull,
|
|
|
|
make_cmd, reference_src_dir, db_queue):
|
2015-05-20 02:36:07 +00:00
|
|
|
"""Create a new process slot.
|
|
|
|
|
|
|
|
Arguments:
|
2017-07-10 20:47:47 +00:00
|
|
|
toolchains: Toolchains object containing toolchains.
|
2016-05-19 06:51:57 +00:00
|
|
|
configs: A list of CONFIGs to move.
|
2015-05-20 02:36:07 +00:00
|
|
|
options: option flags.
|
2016-05-19 06:51:55 +00:00
|
|
|
progress: A progress indicator.
|
2015-05-20 02:36:07 +00:00
|
|
|
devnull: A file object of '/dev/null'.
|
|
|
|
make_cmd: command name of GNU Make.
|
2016-06-10 19:53:32 +00:00
|
|
|
reference_src_dir: Determine the true starting config state from this
|
|
|
|
source tree.
|
2017-06-02 01:39:02 +00:00
|
|
|
db_queue: output queue to write config info for the database
|
2015-05-20 02:36:07 +00:00
|
|
|
"""
|
2017-07-10 20:47:47 +00:00
|
|
|
self.toolchains = toolchains
|
2015-05-20 02:36:07 +00:00
|
|
|
self.options = options
|
2016-05-19 06:51:55 +00:00
|
|
|
self.progress = progress
|
2015-05-20 02:36:07 +00:00
|
|
|
self.build_dir = tempfile.mkdtemp()
|
|
|
|
self.devnull = devnull
|
|
|
|
self.make_cmd = (make_cmd, 'O=' + self.build_dir)
|
2016-06-10 19:53:32 +00:00
|
|
|
self.reference_src_dir = reference_src_dir
|
2017-06-02 01:39:02 +00:00
|
|
|
self.db_queue = db_queue
|
2016-05-19 06:52:01 +00:00
|
|
|
self.parser = KconfigParser(configs, options, self.build_dir)
|
2015-05-20 02:36:07 +00:00
|
|
|
self.state = STATE_IDLE
|
2016-08-22 13:18:20 +00:00
|
|
|
self.failed_boards = set()
|
|
|
|
self.suspicious_boards = set()
|
2015-05-20 02:36:07 +00:00
|
|
|
|
|
|
|
def __del__(self):
|
|
|
|
"""Delete the working directory
|
|
|
|
|
|
|
|
This function makes sure the temporary directory is cleaned away
|
|
|
|
even if Python suddenly dies due to error. It should be done in here
|
2016-06-10 19:53:29 +00:00
|
|
|
because it is guaranteed the destructor is always invoked when the
|
2015-05-20 02:36:07 +00:00
|
|
|
instance of the class gets unreferenced.
|
|
|
|
|
|
|
|
If the subprocess is still running, wait until it finishes.
|
|
|
|
"""
|
|
|
|
if self.state != STATE_IDLE:
|
|
|
|
while self.ps.poll() == None:
|
|
|
|
pass
|
|
|
|
shutil.rmtree(self.build_dir)
|
|
|
|
|
2016-05-19 06:51:55 +00:00
|
|
|
def add(self, defconfig):
|
2015-05-20 02:36:07 +00:00
|
|
|
"""Assign a new subprocess for defconfig and add it to the slot.
|
|
|
|
|
|
|
|
If the slot is vacant, create a new subprocess for processing the
|
|
|
|
given defconfig and add it to the slot. Just returns False if
|
|
|
|
the slot is occupied (i.e. the current subprocess is still running).
|
|
|
|
|
|
|
|
Arguments:
|
|
|
|
defconfig: defconfig name.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
Return True on success or False on failure
|
|
|
|
"""
|
|
|
|
if self.state != STATE_IDLE:
|
|
|
|
return False
|
2016-06-08 02:47:37 +00:00
|
|
|
|
2015-05-20 02:36:07 +00:00
|
|
|
self.defconfig = defconfig
|
2016-05-19 06:52:02 +00:00
|
|
|
self.log = ''
|
2016-06-15 05:33:52 +00:00
|
|
|
self.current_src_dir = self.reference_src_dir
|
2016-06-08 02:47:37 +00:00
|
|
|
self.do_defconfig()
|
2015-05-20 02:36:07 +00:00
|
|
|
return True
|
|
|
|
|
|
|
|
def poll(self):
|
|
|
|
"""Check the status of the subprocess and handle it as needed.
|
|
|
|
|
|
|
|
Returns True if the slot is vacant (i.e. in idle state).
|
|
|
|
If the configuration is successfully finished, assign a new
|
|
|
|
subprocess to build include/autoconf.mk.
|
|
|
|
If include/autoconf.mk is generated, invoke the parser to
|
2016-05-19 06:52:04 +00:00
|
|
|
parse the .config and the include/autoconf.mk, moving
|
|
|
|
config options to the .config as needed.
|
|
|
|
If the .config was updated, run "make savedefconfig" to sync
|
|
|
|
it, update the original defconfig, and then set the slot back
|
|
|
|
to the idle state.
|
2015-05-20 02:36:07 +00:00
|
|
|
|
|
|
|
Returns:
|
|
|
|
Return True if the subprocess is terminated, False otherwise
|
|
|
|
"""
|
|
|
|
if self.state == STATE_IDLE:
|
|
|
|
return True
|
|
|
|
|
|
|
|
if self.ps.poll() == None:
|
|
|
|
return False
|
|
|
|
|
|
|
|
if self.ps.poll() != 0:
|
2016-06-08 02:47:37 +00:00
|
|
|
self.handle_error()
|
|
|
|
elif self.state == STATE_DEFCONFIG:
|
2016-06-15 05:33:52 +00:00
|
|
|
if self.reference_src_dir and not self.current_src_dir:
|
2016-06-10 19:53:32 +00:00
|
|
|
self.do_savedefconfig()
|
|
|
|
else:
|
|
|
|
self.do_autoconf()
|
2016-06-08 02:47:37 +00:00
|
|
|
elif self.state == STATE_AUTOCONF:
|
2016-06-15 05:33:52 +00:00
|
|
|
if self.current_src_dir:
|
|
|
|
self.current_src_dir = None
|
2016-06-10 19:53:32 +00:00
|
|
|
self.do_defconfig()
|
2017-06-02 01:39:02 +00:00
|
|
|
elif self.options.build_db:
|
|
|
|
self.do_build_db()
|
2016-06-10 19:53:32 +00:00
|
|
|
else:
|
|
|
|
self.do_savedefconfig()
|
2016-06-08 02:47:37 +00:00
|
|
|
elif self.state == STATE_SAVEDEFCONFIG:
|
|
|
|
self.update_defconfig()
|
|
|
|
else:
|
|
|
|
sys.exit("Internal Error. This should not happen.")
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2016-06-08 02:47:37 +00:00
|
|
|
return True if self.state == STATE_IDLE else False
|
2015-05-19 18:21:17 +00:00
|
|
|
|
2016-06-08 02:47:37 +00:00
|
|
|
def handle_error(self):
|
|
|
|
"""Handle error cases."""
|
2016-05-19 06:52:08 +00:00
|
|
|
|
2016-06-08 02:47:37 +00:00
|
|
|
self.log += color_text(self.options.color, COLOR_LIGHT_RED,
|
|
|
|
"Failed to process.\n")
|
|
|
|
if self.options.verbose:
|
|
|
|
self.log += color_text(self.options.color, COLOR_LIGHT_CYAN,
|
|
|
|
self.ps.stderr.read())
|
|
|
|
self.finish(False)
|
2015-05-19 18:21:17 +00:00
|
|
|
|
2016-06-08 02:47:37 +00:00
|
|
|
def do_defconfig(self):
|
|
|
|
"""Run 'make <board>_defconfig' to create the .config file."""
|
2016-05-19 06:52:07 +00:00
|
|
|
|
2016-06-08 02:47:37 +00:00
|
|
|
cmd = list(self.make_cmd)
|
|
|
|
cmd.append(self.defconfig)
|
|
|
|
self.ps = subprocess.Popen(cmd, stdout=self.devnull,
|
2016-06-15 05:33:52 +00:00
|
|
|
stderr=subprocess.PIPE,
|
|
|
|
cwd=self.current_src_dir)
|
2016-06-08 02:47:37 +00:00
|
|
|
self.state = STATE_DEFCONFIG
|
2016-05-19 06:52:07 +00:00
|
|
|
|
2016-06-08 02:47:37 +00:00
|
|
|
def do_autoconf(self):
|
2017-06-02 01:39:01 +00:00
|
|
|
"""Run 'make AUTO_CONF_PATH'."""
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2017-07-10 20:47:47 +00:00
|
|
|
arch = self.parser.get_arch()
|
|
|
|
try:
|
|
|
|
toolchain = self.toolchains.Select(arch)
|
|
|
|
except ValueError:
|
2016-05-19 06:52:02 +00:00
|
|
|
self.log += color_text(self.options.color, COLOR_YELLOW,
|
2017-08-27 08:00:51 +00:00
|
|
|
"Tool chain for '%s' is missing. Do nothing.\n" % arch)
|
2016-05-19 06:52:03 +00:00
|
|
|
self.finish(False)
|
2016-06-08 02:47:37 +00:00
|
|
|
return
|
2017-07-10 20:47:47 +00:00
|
|
|
env = toolchain.MakeEnvironment(False)
|
2016-05-19 06:51:53 +00:00
|
|
|
|
2015-05-20 02:36:07 +00:00
|
|
|
cmd = list(self.make_cmd)
|
2015-05-19 18:21:18 +00:00
|
|
|
cmd.append('KCONFIG_IGNORE_DUPLICATES=1')
|
2017-06-02 01:39:01 +00:00
|
|
|
cmd.append(AUTO_CONF_PATH)
|
2017-07-10 20:47:47 +00:00
|
|
|
self.ps = subprocess.Popen(cmd, stdout=self.devnull, env=env,
|
2016-06-15 05:33:52 +00:00
|
|
|
stderr=subprocess.PIPE,
|
|
|
|
cwd=self.current_src_dir)
|
2015-05-20 02:36:07 +00:00
|
|
|
self.state = STATE_AUTOCONF
|
2016-06-08 02:47:37 +00:00
|
|
|
|
2017-06-02 01:39:02 +00:00
|
|
|
def do_build_db(self):
|
|
|
|
"""Add the board to the database"""
|
|
|
|
configs = {}
|
|
|
|
with open(os.path.join(self.build_dir, AUTO_CONF_PATH)) as fd:
|
|
|
|
for line in fd.readlines():
|
|
|
|
if line.startswith('CONFIG'):
|
|
|
|
config, value = line.split('=', 1)
|
|
|
|
configs[config] = value.rstrip()
|
|
|
|
self.db_queue.put([self.defconfig, configs])
|
|
|
|
self.finish(True)
|
|
|
|
|
2016-06-08 02:47:37 +00:00
|
|
|
def do_savedefconfig(self):
|
|
|
|
"""Update the .config and run 'make savedefconfig'."""
|
|
|
|
|
2016-08-22 13:18:21 +00:00
|
|
|
(updated, suspicious, log) = self.parser.update_dotconfig()
|
|
|
|
if suspicious:
|
|
|
|
self.suspicious_boards.add(self.defconfig)
|
2016-06-08 02:47:37 +00:00
|
|
|
self.log += log
|
|
|
|
|
|
|
|
if not self.options.force_sync and not updated:
|
|
|
|
self.finish(True)
|
|
|
|
return
|
|
|
|
if updated:
|
|
|
|
self.log += color_text(self.options.color, COLOR_LIGHT_GREEN,
|
|
|
|
"Syncing by savedefconfig...\n")
|
|
|
|
else:
|
|
|
|
self.log += "Syncing by savedefconfig (forced by option)...\n"
|
|
|
|
|
|
|
|
cmd = list(self.make_cmd)
|
|
|
|
cmd.append('savedefconfig')
|
|
|
|
self.ps = subprocess.Popen(cmd, stdout=self.devnull,
|
|
|
|
stderr=subprocess.PIPE)
|
|
|
|
self.state = STATE_SAVEDEFCONFIG
|
|
|
|
|
|
|
|
def update_defconfig(self):
|
|
|
|
"""Update the input defconfig and go back to the idle state."""
|
|
|
|
|
2016-06-15 05:33:54 +00:00
|
|
|
log = self.parser.check_defconfig()
|
|
|
|
if log:
|
2016-08-22 13:18:20 +00:00
|
|
|
self.suspicious_boards.add(self.defconfig)
|
2016-06-15 05:33:54 +00:00
|
|
|
self.log += log
|
2016-06-08 02:47:37 +00:00
|
|
|
orig_defconfig = os.path.join('configs', self.defconfig)
|
|
|
|
new_defconfig = os.path.join(self.build_dir, 'defconfig')
|
|
|
|
updated = not filecmp.cmp(orig_defconfig, new_defconfig)
|
|
|
|
|
|
|
|
if updated:
|
2016-06-10 19:53:30 +00:00
|
|
|
self.log += color_text(self.options.color, COLOR_LIGHT_BLUE,
|
2016-06-08 02:47:37 +00:00
|
|
|
"defconfig was updated.\n")
|
|
|
|
|
|
|
|
if not self.options.dry_run and updated:
|
|
|
|
shutil.move(new_defconfig, orig_defconfig)
|
|
|
|
self.finish(True)
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2016-05-19 06:52:03 +00:00
|
|
|
def finish(self, success):
|
|
|
|
"""Display log along with progress and go to the idle state.
|
2016-05-19 06:52:02 +00:00
|
|
|
|
|
|
|
Arguments:
|
2016-05-19 06:52:03 +00:00
|
|
|
success: Should be True when the defconfig was processed
|
|
|
|
successfully, or False when it fails.
|
2016-05-19 06:52:02 +00:00
|
|
|
"""
|
|
|
|
# output at least 30 characters to hide the "* defconfigs out of *".
|
|
|
|
log = self.defconfig.ljust(30) + '\n'
|
|
|
|
|
|
|
|
log += '\n'.join([ ' ' + s for s in self.log.split('\n') ])
|
|
|
|
# Some threads are running in parallel.
|
|
|
|
# Print log atomically to not mix up logs from different threads.
|
2016-05-19 06:52:03 +00:00
|
|
|
print >> (sys.stdout if success else sys.stderr), log
|
|
|
|
|
|
|
|
if not success:
|
|
|
|
if self.options.exit_on_error:
|
|
|
|
sys.exit("Exit on error.")
|
|
|
|
# If --exit-on-error flag is not set, skip this board and continue.
|
|
|
|
# Record the failed board.
|
2016-08-22 13:18:20 +00:00
|
|
|
self.failed_boards.add(self.defconfig)
|
2016-05-19 06:52:03 +00:00
|
|
|
|
2016-05-19 06:52:02 +00:00
|
|
|
self.progress.inc()
|
|
|
|
self.progress.show()
|
2016-05-19 06:52:03 +00:00
|
|
|
self.state = STATE_IDLE
|
2016-05-19 06:52:02 +00:00
|
|
|
|
2015-05-20 02:36:07 +00:00
|
|
|
def get_failed_boards(self):
|
2016-08-22 13:18:20 +00:00
|
|
|
"""Returns a set of failed boards (defconfigs) in this slot.
|
2015-05-20 02:36:07 +00:00
|
|
|
"""
|
|
|
|
return self.failed_boards
|
|
|
|
|
2016-06-15 05:33:54 +00:00
|
|
|
def get_suspicious_boards(self):
|
2016-08-22 13:18:20 +00:00
|
|
|
"""Returns a set of boards (defconfigs) with possible misconversion.
|
2016-06-15 05:33:54 +00:00
|
|
|
"""
|
2016-08-22 13:18:21 +00:00
|
|
|
return self.suspicious_boards - self.failed_boards
|
2016-06-15 05:33:54 +00:00
|
|
|
|
2015-05-20 02:36:07 +00:00
|
|
|
class Slots:
|
|
|
|
|
|
|
|
"""Controller of the array of subprocess slots."""
|
|
|
|
|
2017-07-10 20:47:47 +00:00
|
|
|
def __init__(self, toolchains, configs, options, progress,
|
|
|
|
reference_src_dir, db_queue):
|
2015-05-20 02:36:07 +00:00
|
|
|
"""Create a new slots controller.
|
|
|
|
|
|
|
|
Arguments:
|
2017-07-10 20:47:47 +00:00
|
|
|
toolchains: Toolchains object containing toolchains.
|
2016-05-19 06:51:57 +00:00
|
|
|
configs: A list of CONFIGs to move.
|
2015-05-20 02:36:07 +00:00
|
|
|
options: option flags.
|
2016-05-19 06:51:55 +00:00
|
|
|
progress: A progress indicator.
|
2016-06-10 19:53:32 +00:00
|
|
|
reference_src_dir: Determine the true starting config state from this
|
|
|
|
source tree.
|
2017-06-02 01:39:02 +00:00
|
|
|
db_queue: output queue to write config info for the database
|
2015-05-20 02:36:07 +00:00
|
|
|
"""
|
|
|
|
self.options = options
|
|
|
|
self.slots = []
|
|
|
|
devnull = get_devnull()
|
|
|
|
make_cmd = get_make_cmd()
|
|
|
|
for i in range(options.jobs):
|
2017-07-10 20:47:47 +00:00
|
|
|
self.slots.append(Slot(toolchains, configs, options, progress,
|
|
|
|
devnull, make_cmd, reference_src_dir,
|
|
|
|
db_queue))
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2016-05-19 06:51:55 +00:00
|
|
|
def add(self, defconfig):
|
2015-05-20 02:36:07 +00:00
|
|
|
"""Add a new subprocess if a vacant slot is found.
|
|
|
|
|
|
|
|
Arguments:
|
|
|
|
defconfig: defconfig name to be put into.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
Return True on success or False on failure
|
|
|
|
"""
|
|
|
|
for slot in self.slots:
|
2016-05-19 06:51:55 +00:00
|
|
|
if slot.add(defconfig):
|
2015-05-20 02:36:07 +00:00
|
|
|
return True
|
|
|
|
return False
|
|
|
|
|
|
|
|
def available(self):
|
|
|
|
"""Check if there is a vacant slot.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
Return True if at lease one vacant slot is found, False otherwise.
|
|
|
|
"""
|
|
|
|
for slot in self.slots:
|
|
|
|
if slot.poll():
|
|
|
|
return True
|
|
|
|
return False
|
|
|
|
|
|
|
|
def empty(self):
|
|
|
|
"""Check if all slots are vacant.
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
Return True if all the slots are vacant, False otherwise.
|
|
|
|
"""
|
|
|
|
ret = True
|
|
|
|
for slot in self.slots:
|
|
|
|
if not slot.poll():
|
|
|
|
ret = False
|
|
|
|
return ret
|
|
|
|
|
|
|
|
def show_failed_boards(self):
|
|
|
|
"""Display all of the failed boards (defconfigs)."""
|
2016-08-22 13:18:20 +00:00
|
|
|
boards = set()
|
2016-06-15 05:33:53 +00:00
|
|
|
output_file = 'moveconfig.failed'
|
2015-05-20 02:36:07 +00:00
|
|
|
|
|
|
|
for slot in self.slots:
|
2016-08-22 13:18:20 +00:00
|
|
|
boards |= slot.get_failed_boards()
|
2016-06-15 05:33:53 +00:00
|
|
|
|
|
|
|
if boards:
|
|
|
|
boards = '\n'.join(boards) + '\n'
|
|
|
|
msg = "The following boards were not processed due to error:\n"
|
|
|
|
msg += boards
|
|
|
|
msg += "(the list has been saved in %s)\n" % output_file
|
|
|
|
print >> sys.stderr, color_text(self.options.color, COLOR_LIGHT_RED,
|
|
|
|
msg)
|
|
|
|
|
|
|
|
with open(output_file, 'w') as f:
|
|
|
|
f.write(boards)
|
2015-05-19 18:21:22 +00:00
|
|
|
|
2016-06-15 05:33:54 +00:00
|
|
|
def show_suspicious_boards(self):
|
|
|
|
"""Display all boards (defconfigs) with possible misconversion."""
|
2016-08-22 13:18:20 +00:00
|
|
|
boards = set()
|
2016-06-15 05:33:54 +00:00
|
|
|
output_file = 'moveconfig.suspicious'
|
|
|
|
|
|
|
|
for slot in self.slots:
|
2016-08-22 13:18:20 +00:00
|
|
|
boards |= slot.get_suspicious_boards()
|
2016-06-15 05:33:54 +00:00
|
|
|
|
|
|
|
if boards:
|
|
|
|
boards = '\n'.join(boards) + '\n'
|
|
|
|
msg = "The following boards might have been converted incorrectly.\n"
|
|
|
|
msg += "It is highly recommended to check them manually:\n"
|
|
|
|
msg += boards
|
|
|
|
msg += "(the list has been saved in %s)\n" % output_file
|
|
|
|
print >> sys.stderr, color_text(self.options.color, COLOR_YELLOW,
|
|
|
|
msg)
|
|
|
|
|
|
|
|
with open(output_file, 'w') as f:
|
|
|
|
f.write(boards)
|
|
|
|
|
2016-06-15 05:33:51 +00:00
|
|
|
class ReferenceSource:
|
|
|
|
|
|
|
|
"""Reference source against which original configs should be parsed."""
|
|
|
|
|
|
|
|
def __init__(self, commit):
|
|
|
|
"""Create a reference source directory based on a specified commit.
|
|
|
|
|
|
|
|
Arguments:
|
|
|
|
commit: commit to git-clone
|
|
|
|
"""
|
|
|
|
self.src_dir = tempfile.mkdtemp()
|
|
|
|
print "Cloning git repo to a separate work directory..."
|
|
|
|
subprocess.check_output(['git', 'clone', os.getcwd(), '.'],
|
|
|
|
cwd=self.src_dir)
|
|
|
|
print "Checkout '%s' to build the original autoconf.mk." % \
|
|
|
|
subprocess.check_output(['git', 'rev-parse', '--short', commit]).strip()
|
|
|
|
subprocess.check_output(['git', 'checkout', commit],
|
|
|
|
stderr=subprocess.STDOUT, cwd=self.src_dir)
|
2016-06-10 19:53:32 +00:00
|
|
|
|
|
|
|
def __del__(self):
|
2016-06-15 05:33:51 +00:00
|
|
|
"""Delete the reference source directory
|
2016-06-10 19:53:32 +00:00
|
|
|
|
|
|
|
This function makes sure the temporary directory is cleaned away
|
|
|
|
even if Python suddenly dies due to error. It should be done in here
|
|
|
|
because it is guaranteed the destructor is always invoked when the
|
|
|
|
instance of the class gets unreferenced.
|
|
|
|
"""
|
2016-06-15 05:33:51 +00:00
|
|
|
shutil.rmtree(self.src_dir)
|
|
|
|
|
|
|
|
def get_dir(self):
|
|
|
|
"""Return the absolute path to the reference source directory."""
|
2016-06-10 19:53:32 +00:00
|
|
|
|
2016-06-15 05:33:51 +00:00
|
|
|
return self.src_dir
|
2016-06-10 19:53:32 +00:00
|
|
|
|
2017-07-10 20:47:47 +00:00
|
|
|
def move_config(toolchains, configs, options, db_queue):
|
2015-05-20 02:36:07 +00:00
|
|
|
"""Move config options to defconfig files.
|
|
|
|
|
|
|
|
Arguments:
|
2016-05-19 06:51:57 +00:00
|
|
|
configs: A list of CONFIGs to move.
|
2015-05-20 02:36:07 +00:00
|
|
|
options: option flags
|
|
|
|
"""
|
2016-05-19 06:51:57 +00:00
|
|
|
if len(configs) == 0:
|
2016-05-19 06:52:09 +00:00
|
|
|
if options.force_sync:
|
|
|
|
print 'No CONFIG is specified. You are probably syncing defconfigs.',
|
2017-06-02 01:39:02 +00:00
|
|
|
elif options.build_db:
|
|
|
|
print 'Building %s database' % CONFIG_DATABASE
|
2016-05-19 06:52:09 +00:00
|
|
|
else:
|
|
|
|
print 'Neither CONFIG nor --force-sync is specified. Nothing will happen.',
|
|
|
|
else:
|
|
|
|
print 'Move ' + ', '.join(configs),
|
|
|
|
print '(jobs: %d)\n' % options.jobs
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2016-06-10 19:53:32 +00:00
|
|
|
if options.git_ref:
|
2016-06-15 05:33:51 +00:00
|
|
|
reference_src = ReferenceSource(options.git_ref)
|
|
|
|
reference_src_dir = reference_src.get_dir()
|
|
|
|
else:
|
2016-06-15 05:33:52 +00:00
|
|
|
reference_src_dir = None
|
2016-06-10 19:53:32 +00:00
|
|
|
|
2015-05-19 18:21:19 +00:00
|
|
|
if options.defconfigs:
|
2016-10-19 05:39:54 +00:00
|
|
|
defconfigs = get_matched_defconfigs(options.defconfigs)
|
2015-05-19 18:21:19 +00:00
|
|
|
else:
|
2016-07-25 10:15:28 +00:00
|
|
|
defconfigs = get_all_defconfigs()
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2016-05-19 06:51:55 +00:00
|
|
|
progress = Progress(len(defconfigs))
|
2017-07-10 20:47:47 +00:00
|
|
|
slots = Slots(toolchains, configs, options, progress, reference_src_dir,
|
|
|
|
db_queue)
|
2015-05-20 02:36:07 +00:00
|
|
|
|
|
|
|
# Main loop to process defconfig files:
|
|
|
|
# Add a new subprocess into a vacant slot.
|
|
|
|
# Sleep if there is no available slot.
|
2016-05-19 06:51:55 +00:00
|
|
|
for defconfig in defconfigs:
|
|
|
|
while not slots.add(defconfig):
|
2015-05-20 02:36:07 +00:00
|
|
|
while not slots.available():
|
|
|
|
# No available slot: sleep for a while
|
|
|
|
time.sleep(SLEEP_TIME)
|
|
|
|
|
|
|
|
# wait until all the subprocesses finish
|
|
|
|
while not slots.empty():
|
|
|
|
time.sleep(SLEEP_TIME)
|
|
|
|
|
2015-05-19 18:21:25 +00:00
|
|
|
print ''
|
2015-05-20 02:36:07 +00:00
|
|
|
slots.show_failed_boards()
|
2016-06-15 05:33:54 +00:00
|
|
|
slots.show_suspicious_boards()
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2017-06-16 03:39:33 +00:00
|
|
|
def find_kconfig_rules(kconf, config, imply_config):
|
|
|
|
"""Check whether a config has a 'select' or 'imply' keyword
|
|
|
|
|
|
|
|
Args:
|
2019-09-20 21:42:09 +00:00
|
|
|
kconf: Kconfiglib.Kconfig object
|
2017-06-16 03:39:33 +00:00
|
|
|
config: Name of config to check (without CONFIG_ prefix)
|
|
|
|
imply_config: Implying config (without CONFIG_ prefix) which may or
|
|
|
|
may not have an 'imply' for 'config')
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
Symbol object for 'config' if found, else None
|
|
|
|
"""
|
2019-09-20 21:42:09 +00:00
|
|
|
sym = kconf.syms.get(imply_config)
|
2017-06-16 03:39:33 +00:00
|
|
|
if sym:
|
2017-09-19 10:52:55 +00:00
|
|
|
for sel in sym.get_selected_symbols() | sym.get_implied_symbols():
|
2017-06-16 03:39:33 +00:00
|
|
|
if sel.get_name() == config:
|
|
|
|
return sym
|
|
|
|
return None
|
|
|
|
|
|
|
|
def check_imply_rule(kconf, config, imply_config):
|
|
|
|
"""Check if we can add an 'imply' option
|
|
|
|
|
|
|
|
This finds imply_config in the Kconfig and looks to see if it is possible
|
|
|
|
to add an 'imply' for 'config' to that part of the Kconfig.
|
|
|
|
|
|
|
|
Args:
|
2019-09-20 21:42:09 +00:00
|
|
|
kconf: Kconfiglib.Kconfig object
|
2017-06-16 03:39:33 +00:00
|
|
|
config: Name of config to check (without CONFIG_ prefix)
|
|
|
|
imply_config: Implying config (without CONFIG_ prefix) which may or
|
|
|
|
may not have an 'imply' for 'config')
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
tuple:
|
|
|
|
filename of Kconfig file containing imply_config, or None if none
|
|
|
|
line number within the Kconfig file, or 0 if none
|
|
|
|
message indicating the result
|
|
|
|
"""
|
2019-09-20 21:42:09 +00:00
|
|
|
sym = kconf.syms.get(imply_config)
|
2017-06-16 03:39:33 +00:00
|
|
|
if not sym:
|
|
|
|
return 'cannot find sym'
|
|
|
|
locs = sym.get_def_locations()
|
|
|
|
if len(locs) != 1:
|
|
|
|
return '%d locations' % len(locs)
|
|
|
|
fname, linenum = locs[0]
|
|
|
|
cwd = os.getcwd()
|
|
|
|
if cwd and fname.startswith(cwd):
|
|
|
|
fname = fname[len(cwd) + 1:]
|
|
|
|
file_line = ' at %s:%d' % (fname, linenum)
|
|
|
|
with open(fname) as fd:
|
|
|
|
data = fd.read().splitlines()
|
|
|
|
if data[linenum - 1] != 'config %s' % imply_config:
|
|
|
|
return None, 0, 'bad sym format %s%s' % (data[linenum], file_line)
|
|
|
|
return fname, linenum, 'adding%s' % file_line
|
|
|
|
|
|
|
|
def add_imply_rule(config, fname, linenum):
|
|
|
|
"""Add a new 'imply' option to a Kconfig
|
|
|
|
|
|
|
|
Args:
|
|
|
|
config: config option to add an imply for (without CONFIG_ prefix)
|
|
|
|
fname: Kconfig filename to update
|
|
|
|
linenum: Line number to place the 'imply' before
|
|
|
|
|
|
|
|
Returns:
|
|
|
|
Message indicating the result
|
|
|
|
"""
|
|
|
|
file_line = ' at %s:%d' % (fname, linenum)
|
|
|
|
data = open(fname).read().splitlines()
|
|
|
|
linenum -= 1
|
|
|
|
|
|
|
|
for offset, line in enumerate(data[linenum:]):
|
|
|
|
if line.strip().startswith('help') or not line:
|
|
|
|
data.insert(linenum + offset, '\timply %s' % config)
|
|
|
|
with open(fname, 'w') as fd:
|
|
|
|
fd.write('\n'.join(data) + '\n')
|
|
|
|
return 'added%s' % file_line
|
|
|
|
|
|
|
|
return 'could not insert%s'
|
|
|
|
|
|
|
|
(IMPLY_MIN_2, IMPLY_TARGET, IMPLY_CMD, IMPLY_NON_ARCH_BOARD) = (
|
|
|
|
1, 2, 4, 8)
|
2017-06-16 03:39:32 +00:00
|
|
|
|
|
|
|
IMPLY_FLAGS = {
|
|
|
|
'min2': [IMPLY_MIN_2, 'Show options which imply >2 boards (normally >5)'],
|
|
|
|
'target': [IMPLY_TARGET, 'Allow CONFIG_TARGET_... options to imply'],
|
|
|
|
'cmd': [IMPLY_CMD, 'Allow CONFIG_CMD_... to imply'],
|
2017-06-16 03:39:33 +00:00
|
|
|
'non-arch-board': [
|
|
|
|
IMPLY_NON_ARCH_BOARD,
|
|
|
|
'Allow Kconfig options outside arch/ and /board/ to imply'],
|
2017-06-16 03:39:32 +00:00
|
|
|
};
|
|
|
|
|
2017-06-16 03:39:33 +00:00
|
|
|
def do_imply_config(config_list, add_imply, imply_flags, skip_added,
|
|
|
|
check_kconfig=True, find_superset=False):
|
2017-06-02 01:39:03 +00:00
|
|
|
"""Find CONFIG options which imply those in the list
|
|
|
|
|
|
|
|
Some CONFIG options can be implied by others and this can help to reduce
|
|
|
|
the size of the defconfig files. For example, CONFIG_X86 implies
|
|
|
|
CONFIG_CMD_IRQ, so we can put 'imply CMD_IRQ' under 'config X86' and
|
|
|
|
all x86 boards will have that option, avoiding adding CONFIG_CMD_IRQ to
|
|
|
|
each of the x86 defconfig files.
|
|
|
|
|
|
|
|
This function uses the moveconfig database to find such options. It
|
|
|
|
displays a list of things that could possibly imply those in the list.
|
|
|
|
The algorithm ignores any that start with CONFIG_TARGET since these
|
|
|
|
typically refer to only a few defconfigs (often one). It also does not
|
|
|
|
display a config with less than 5 defconfigs.
|
|
|
|
|
|
|
|
The algorithm works using sets. For each target config in config_list:
|
|
|
|
- Get the set 'defconfigs' which use that target config
|
|
|
|
- For each config (from a list of all configs):
|
|
|
|
- Get the set 'imply_defconfig' of defconfigs which use that config
|
|
|
|
-
|
|
|
|
- If imply_defconfigs contains anything not in defconfigs then
|
|
|
|
this config does not imply the target config
|
|
|
|
|
|
|
|
Params:
|
|
|
|
config_list: List of CONFIG options to check (each a string)
|
2017-06-16 03:39:33 +00:00
|
|
|
add_imply: Automatically add an 'imply' for each config.
|
2017-06-16 03:39:32 +00:00
|
|
|
imply_flags: Flags which control which implying configs are allowed
|
|
|
|
(IMPLY_...)
|
2017-06-16 03:39:33 +00:00
|
|
|
skip_added: Don't show options which already have an imply added.
|
|
|
|
check_kconfig: Check if implied symbols already have an 'imply' or
|
|
|
|
'select' for the target config, and show this information if so.
|
2017-06-02 01:39:03 +00:00
|
|
|
find_superset: True to look for configs which are a superset of those
|
|
|
|
already found. So for example if CONFIG_EXYNOS5 implies an option,
|
|
|
|
but CONFIG_EXYNOS covers a larger set of defconfigs and also
|
|
|
|
implies that option, this will drop the former in favour of the
|
|
|
|
latter. In practice this option has not proved very used.
|
|
|
|
|
|
|
|
Note the terminoloy:
|
|
|
|
config - a CONFIG_XXX options (a string, e.g. 'CONFIG_CMD_EEPROM')
|
|
|
|
defconfig - a defconfig file (a string, e.g. 'configs/snow_defconfig')
|
|
|
|
"""
|
2017-06-16 03:39:33 +00:00
|
|
|
kconf = KconfigScanner().conf if check_kconfig else None
|
|
|
|
if add_imply and add_imply != 'all':
|
|
|
|
add_imply = add_imply.split()
|
|
|
|
|
2017-06-02 01:39:03 +00:00
|
|
|
# key is defconfig name, value is dict of (CONFIG_xxx, value)
|
|
|
|
config_db = {}
|
|
|
|
|
|
|
|
# Holds a dict containing the set of defconfigs that contain each config
|
|
|
|
# key is config, value is set of defconfigs using that config
|
|
|
|
defconfig_db = collections.defaultdict(set)
|
|
|
|
|
|
|
|
# Set of all config options we have seen
|
|
|
|
all_configs = set()
|
|
|
|
|
|
|
|
# Set of all defconfigs we have seen
|
|
|
|
all_defconfigs = set()
|
|
|
|
|
|
|
|
# Read in the database
|
|
|
|
configs = {}
|
|
|
|
with open(CONFIG_DATABASE) as fd:
|
|
|
|
for line in fd.readlines():
|
|
|
|
line = line.rstrip()
|
|
|
|
if not line: # Separator between defconfigs
|
|
|
|
config_db[defconfig] = configs
|
|
|
|
all_defconfigs.add(defconfig)
|
|
|
|
configs = {}
|
|
|
|
elif line[0] == ' ': # CONFIG line
|
|
|
|
config, value = line.strip().split('=', 1)
|
|
|
|
configs[config] = value
|
|
|
|
defconfig_db[config].add(defconfig)
|
|
|
|
all_configs.add(config)
|
|
|
|
else: # New defconfig
|
|
|
|
defconfig = line
|
|
|
|
|
|
|
|
# Work through each target config option in tern, independently
|
|
|
|
for config in config_list:
|
|
|
|
defconfigs = defconfig_db.get(config)
|
|
|
|
if not defconfigs:
|
|
|
|
print '%s not found in any defconfig' % config
|
|
|
|
continue
|
|
|
|
|
|
|
|
# Get the set of defconfigs without this one (since a config cannot
|
|
|
|
# imply itself)
|
|
|
|
non_defconfigs = all_defconfigs - defconfigs
|
|
|
|
num_defconfigs = len(defconfigs)
|
|
|
|
print '%s found in %d/%d defconfigs' % (config, num_defconfigs,
|
|
|
|
len(all_configs))
|
|
|
|
|
|
|
|
# This will hold the results: key=config, value=defconfigs containing it
|
|
|
|
imply_configs = {}
|
|
|
|
rest_configs = all_configs - set([config])
|
|
|
|
|
|
|
|
# Look at every possible config, except the target one
|
|
|
|
for imply_config in rest_configs:
|
2017-06-16 03:39:32 +00:00
|
|
|
if 'ERRATUM' in imply_config:
|
2017-06-02 01:39:03 +00:00
|
|
|
continue
|
2017-06-16 03:39:32 +00:00
|
|
|
if not (imply_flags & IMPLY_CMD):
|
|
|
|
if 'CONFIG_CMD' in imply_config:
|
|
|
|
continue
|
|
|
|
if not (imply_flags & IMPLY_TARGET):
|
|
|
|
if 'CONFIG_TARGET' in imply_config:
|
|
|
|
continue
|
2017-06-02 01:39:03 +00:00
|
|
|
|
|
|
|
# Find set of defconfigs that have this config
|
|
|
|
imply_defconfig = defconfig_db[imply_config]
|
|
|
|
|
|
|
|
# Get the intersection of this with defconfigs containing the
|
|
|
|
# target config
|
|
|
|
common_defconfigs = imply_defconfig & defconfigs
|
|
|
|
|
|
|
|
# Get the set of defconfigs containing this config which DO NOT
|
|
|
|
# also contain the taret config. If this set is non-empty it means
|
|
|
|
# that this config affects other defconfigs as well as (possibly)
|
|
|
|
# the ones affected by the target config. This means it implies
|
|
|
|
# things we don't want to imply.
|
|
|
|
not_common_defconfigs = imply_defconfig & non_defconfigs
|
|
|
|
if not_common_defconfigs:
|
|
|
|
continue
|
|
|
|
|
|
|
|
# If there are common defconfigs, imply_config may be useful
|
|
|
|
if common_defconfigs:
|
|
|
|
skip = False
|
|
|
|
if find_superset:
|
|
|
|
for prev in imply_configs.keys():
|
|
|
|
prev_count = len(imply_configs[prev])
|
|
|
|
count = len(common_defconfigs)
|
|
|
|
if (prev_count > count and
|
|
|
|
(imply_configs[prev] & common_defconfigs ==
|
|
|
|
common_defconfigs)):
|
|
|
|
# skip imply_config because prev is a superset
|
|
|
|
skip = True
|
|
|
|
break
|
|
|
|
elif count > prev_count:
|
|
|
|
# delete prev because imply_config is a superset
|
|
|
|
del imply_configs[prev]
|
|
|
|
if not skip:
|
|
|
|
imply_configs[imply_config] = common_defconfigs
|
|
|
|
|
|
|
|
# Now we have a dict imply_configs of configs which imply each config
|
|
|
|
# The value of each dict item is the set of defconfigs containing that
|
|
|
|
# config. Rank them so that we print the configs that imply the largest
|
|
|
|
# number of defconfigs first.
|
2017-06-16 03:39:33 +00:00
|
|
|
ranked_iconfigs = sorted(imply_configs,
|
2017-06-02 01:39:03 +00:00
|
|
|
key=lambda k: len(imply_configs[k]), reverse=True)
|
2017-06-16 03:39:33 +00:00
|
|
|
kconfig_info = ''
|
|
|
|
cwd = os.getcwd()
|
|
|
|
add_list = collections.defaultdict(list)
|
|
|
|
for iconfig in ranked_iconfigs:
|
|
|
|
num_common = len(imply_configs[iconfig])
|
2017-06-02 01:39:03 +00:00
|
|
|
|
|
|
|
# Don't bother if there are less than 5 defconfigs affected.
|
2017-06-16 03:39:32 +00:00
|
|
|
if num_common < (2 if imply_flags & IMPLY_MIN_2 else 5):
|
2017-06-02 01:39:03 +00:00
|
|
|
continue
|
2017-06-16 03:39:33 +00:00
|
|
|
missing = defconfigs - imply_configs[iconfig]
|
2017-06-02 01:39:03 +00:00
|
|
|
missing_str = ', '.join(missing) if missing else 'all'
|
|
|
|
missing_str = ''
|
2017-06-16 03:39:33 +00:00
|
|
|
show = True
|
|
|
|
if kconf:
|
|
|
|
sym = find_kconfig_rules(kconf, config[CONFIG_LEN:],
|
|
|
|
iconfig[CONFIG_LEN:])
|
|
|
|
kconfig_info = ''
|
|
|
|
if sym:
|
|
|
|
locs = sym.get_def_locations()
|
|
|
|
if len(locs) == 1:
|
|
|
|
fname, linenum = locs[0]
|
|
|
|
if cwd and fname.startswith(cwd):
|
|
|
|
fname = fname[len(cwd) + 1:]
|
|
|
|
kconfig_info = '%s:%d' % (fname, linenum)
|
|
|
|
if skip_added:
|
|
|
|
show = False
|
|
|
|
else:
|
2019-09-20 21:42:09 +00:00
|
|
|
sym = kconf.syms.get(iconfig[CONFIG_LEN:])
|
2017-06-16 03:39:33 +00:00
|
|
|
fname = ''
|
|
|
|
if sym:
|
|
|
|
locs = sym.get_def_locations()
|
|
|
|
if len(locs) == 1:
|
|
|
|
fname, linenum = locs[0]
|
|
|
|
if cwd and fname.startswith(cwd):
|
|
|
|
fname = fname[len(cwd) + 1:]
|
|
|
|
in_arch_board = not sym or (fname.startswith('arch') or
|
|
|
|
fname.startswith('board'))
|
|
|
|
if (not in_arch_board and
|
|
|
|
not (imply_flags & IMPLY_NON_ARCH_BOARD)):
|
|
|
|
continue
|
|
|
|
|
|
|
|
if add_imply and (add_imply == 'all' or
|
|
|
|
iconfig in add_imply):
|
|
|
|
fname, linenum, kconfig_info = (check_imply_rule(kconf,
|
|
|
|
config[CONFIG_LEN:], iconfig[CONFIG_LEN:]))
|
|
|
|
if fname:
|
|
|
|
add_list[fname].append(linenum)
|
|
|
|
|
|
|
|
if show and kconfig_info != 'skip':
|
|
|
|
print '%5d : %-30s%-25s %s' % (num_common, iconfig.ljust(30),
|
|
|
|
kconfig_info, missing_str)
|
|
|
|
|
|
|
|
# Having collected a list of things to add, now we add them. We process
|
|
|
|
# each file from the largest line number to the smallest so that
|
|
|
|
# earlier additions do not affect our line numbers. E.g. if we added an
|
|
|
|
# imply at line 20 it would change the position of each line after
|
|
|
|
# that.
|
|
|
|
for fname, linenums in add_list.iteritems():
|
|
|
|
for linenum in sorted(linenums, reverse=True):
|
|
|
|
add_imply_rule(config[CONFIG_LEN:], fname, linenum)
|
2017-06-02 01:39:03 +00:00
|
|
|
|
|
|
|
|
2015-05-20 02:36:07 +00:00
|
|
|
def main():
|
|
|
|
try:
|
|
|
|
cpu_count = multiprocessing.cpu_count()
|
|
|
|
except NotImplementedError:
|
|
|
|
cpu_count = 1
|
|
|
|
|
|
|
|
parser = optparse.OptionParser()
|
|
|
|
# Add options here
|
2017-06-16 03:39:33 +00:00
|
|
|
parser.add_option('-a', '--add-imply', type='string', default='',
|
|
|
|
help='comma-separated list of CONFIG options to add '
|
|
|
|
"an 'imply' statement to for the CONFIG in -i")
|
|
|
|
parser.add_option('-A', '--skip-added', action='store_true', default=False,
|
|
|
|
help="don't show options which are already marked as "
|
|
|
|
'implying others')
|
2017-06-02 01:39:02 +00:00
|
|
|
parser.add_option('-b', '--build-db', action='store_true', default=False,
|
|
|
|
help='build a CONFIG database')
|
2015-05-20 02:36:07 +00:00
|
|
|
parser.add_option('-c', '--color', action='store_true', default=False,
|
|
|
|
help='display the log in color')
|
2016-09-13 05:18:21 +00:00
|
|
|
parser.add_option('-C', '--commit', action='store_true', default=False,
|
|
|
|
help='Create a git commit for the operation')
|
2015-05-19 18:21:19 +00:00
|
|
|
parser.add_option('-d', '--defconfigs', type='string',
|
2017-06-02 01:38:59 +00:00
|
|
|
help='a file containing a list of defconfigs to move, '
|
|
|
|
"one per line (for example 'snow_defconfig') "
|
|
|
|
"or '-' to read from stdin")
|
2017-06-02 01:39:03 +00:00
|
|
|
parser.add_option('-i', '--imply', action='store_true', default=False,
|
|
|
|
help='find options which imply others')
|
2017-06-16 03:39:32 +00:00
|
|
|
parser.add_option('-I', '--imply-flags', type='string', default='',
|
|
|
|
help="control the -i option ('help' for help")
|
2015-05-20 02:36:07 +00:00
|
|
|
parser.add_option('-n', '--dry-run', action='store_true', default=False,
|
|
|
|
help='perform a trial run (show log with no changes)')
|
|
|
|
parser.add_option('-e', '--exit-on-error', action='store_true',
|
|
|
|
default=False,
|
|
|
|
help='exit immediately on any error')
|
2016-05-19 06:52:08 +00:00
|
|
|
parser.add_option('-s', '--force-sync', action='store_true', default=False,
|
|
|
|
help='force sync by savedefconfig')
|
2016-08-22 13:18:22 +00:00
|
|
|
parser.add_option('-S', '--spl', action='store_true', default=False,
|
|
|
|
help='parse config options defined for SPL build')
|
2015-05-19 18:21:20 +00:00
|
|
|
parser.add_option('-H', '--headers-only', dest='cleanup_headers_only',
|
|
|
|
action='store_true', default=False,
|
|
|
|
help='only cleanup the headers')
|
2015-05-20 02:36:07 +00:00
|
|
|
parser.add_option('-j', '--jobs', type='int', default=cpu_count,
|
|
|
|
help='the number of jobs to run simultaneously')
|
2016-06-10 19:53:32 +00:00
|
|
|
parser.add_option('-r', '--git-ref', type='string',
|
|
|
|
help='the git ref to clone for building the autoconf.mk')
|
2016-09-13 05:18:20 +00:00
|
|
|
parser.add_option('-y', '--yes', action='store_true', default=False,
|
|
|
|
help="respond 'yes' to any prompts")
|
2015-05-19 18:21:24 +00:00
|
|
|
parser.add_option('-v', '--verbose', action='store_true', default=False,
|
|
|
|
help='show any build errors as boards are built')
|
2016-05-19 06:51:58 +00:00
|
|
|
parser.usage += ' CONFIG ...'
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2016-05-19 06:51:58 +00:00
|
|
|
(options, configs) = parser.parse_args()
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2017-06-02 01:39:03 +00:00
|
|
|
if len(configs) == 0 and not any((options.force_sync, options.build_db,
|
|
|
|
options.imply)):
|
2015-05-20 02:36:07 +00:00
|
|
|
parser.print_usage()
|
|
|
|
sys.exit(1)
|
|
|
|
|
2016-05-19 06:51:58 +00:00
|
|
|
# prefix the option name with CONFIG_ if missing
|
|
|
|
configs = [ config if config.startswith('CONFIG_') else 'CONFIG_' + config
|
|
|
|
for config in configs ]
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2015-05-19 18:21:20 +00:00
|
|
|
check_top_directory()
|
|
|
|
|
2017-06-02 01:39:03 +00:00
|
|
|
if options.imply:
|
2017-06-16 03:39:32 +00:00
|
|
|
imply_flags = 0
|
2017-07-10 20:47:46 +00:00
|
|
|
if options.imply_flags == 'all':
|
|
|
|
imply_flags = -1
|
|
|
|
|
|
|
|
elif options.imply_flags:
|
|
|
|
for flag in options.imply_flags.split(','):
|
|
|
|
bad = flag not in IMPLY_FLAGS
|
|
|
|
if bad:
|
|
|
|
print "Invalid flag '%s'" % flag
|
|
|
|
if flag == 'help' or bad:
|
|
|
|
print "Imply flags: (separate with ',')"
|
|
|
|
for name, info in IMPLY_FLAGS.iteritems():
|
|
|
|
print ' %-15s: %s' % (name, info[1])
|
|
|
|
parser.print_usage()
|
|
|
|
sys.exit(1)
|
|
|
|
imply_flags |= IMPLY_FLAGS[flag][0]
|
2017-06-16 03:39:32 +00:00
|
|
|
|
2017-06-16 03:39:33 +00:00
|
|
|
do_imply_config(configs, options.add_imply, imply_flags,
|
|
|
|
options.skip_added)
|
2017-06-02 01:39:03 +00:00
|
|
|
return
|
|
|
|
|
2017-06-02 01:39:02 +00:00
|
|
|
config_db = {}
|
|
|
|
db_queue = Queue.Queue()
|
|
|
|
t = DatabaseThread(config_db, db_queue)
|
|
|
|
t.setDaemon(True)
|
|
|
|
t.start()
|
|
|
|
|
2015-05-19 18:21:20 +00:00
|
|
|
if not options.cleanup_headers_only:
|
2016-07-25 10:15:23 +00:00
|
|
|
check_clean_directory()
|
2017-07-10 20:47:47 +00:00
|
|
|
bsettings.Setup('')
|
|
|
|
toolchains = toolchain.Toolchains()
|
|
|
|
toolchains.GetSettings()
|
|
|
|
toolchains.Scan(verbose=False)
|
|
|
|
move_config(toolchains, configs, options, db_queue)
|
2017-06-02 01:39:02 +00:00
|
|
|
db_queue.join()
|
2015-05-19 18:21:20 +00:00
|
|
|
|
2016-05-19 06:52:09 +00:00
|
|
|
if configs:
|
2016-07-25 10:15:26 +00:00
|
|
|
cleanup_headers(configs, options)
|
2016-07-25 10:15:29 +00:00
|
|
|
cleanup_extra_options(configs, options)
|
2017-05-02 09:30:47 +00:00
|
|
|
cleanup_whitelist(configs, options)
|
2017-05-02 09:30:48 +00:00
|
|
|
cleanup_readme(configs, options)
|
2015-05-20 02:36:07 +00:00
|
|
|
|
2016-09-13 05:18:21 +00:00
|
|
|
if options.commit:
|
|
|
|
subprocess.call(['git', 'add', '-u'])
|
|
|
|
if configs:
|
|
|
|
msg = 'Convert %s %sto Kconfig' % (configs[0],
|
|
|
|
'et al ' if len(configs) > 1 else '')
|
|
|
|
msg += ('\n\nThis converts the following to Kconfig:\n %s\n' %
|
|
|
|
'\n '.join(configs))
|
|
|
|
else:
|
|
|
|
msg = 'configs: Resync with savedefconfig'
|
|
|
|
msg += '\n\nRsync all defconfig files using moveconfig.py'
|
|
|
|
subprocess.call(['git', 'commit', '-s', '-m', msg])
|
|
|
|
|
2017-06-02 01:39:02 +00:00
|
|
|
if options.build_db:
|
|
|
|
with open(CONFIG_DATABASE, 'w') as fd:
|
|
|
|
for defconfig, configs in config_db.iteritems():
|
2017-08-13 22:02:54 +00:00
|
|
|
fd.write('%s\n' % defconfig)
|
2017-06-02 01:39:02 +00:00
|
|
|
for config in sorted(configs.keys()):
|
2017-08-13 22:02:54 +00:00
|
|
|
fd.write(' %s=%s\n' % (config, configs[config]))
|
|
|
|
fd.write('\n')
|
2017-06-02 01:39:02 +00:00
|
|
|
|
2015-05-20 02:36:07 +00:00
|
|
|
if __name__ == '__main__':
|
|
|
|
main()
|