Update the config-check script to support a new include directive, that can
be used to override annotations from another file. For instance, with
this change a custom kernel can include the annotation file from
"debian.master/" and override some of it policies.
The directive is only available when using the file format 3, that
extends format 2.
The new directive follows the systax:
include FILEPATH
Quotes are also accepted:
include "FILEPATH"
`FILENAME` is always relative to the current annotations file location.
So, assuming a custom kernel, the following directive will include the
annotations file from the generic kernel:
include "../../debian.master/config/annotations"
To avoid mistakes, any reference to a config in the base annotations
file AFTER the include directive will completely override the references
from the included file.
For instance, the following:
# FORMAT: 3
include "../../debian.master/config/annotations"
CONFIG_X note<some note>
Will cause any line related to CONFIG_X in the included annotations file
to be ignored.
The patch also includes smalls changes to avoid warning due to duplicate
variable declarations.
Explicitly disable CONFIG_NETWORK_PHY_TIMESTAMPING and
CONFIG_DP83640_PHY in the linux-gcp annotations overlay to prevent it to
be enabled in the future by changes in the master kernel.
Ignore: yes
Acked-by: Kamal Mostafa <email address hidden>
Signed-off-by: Kleber Sacilotto de Souza <email address hidden>
The config option CONFIG_BT_QCOMSMD_HACK has been added to the master
branch by commit "UBUNTU: SAUCE: btqcomsmd: introduce BT_QCOMSMD_HACK",
but this new config is not needed for cloud kernels.
Ignore: yes
Signed-off-by: Kleber Sacilotto de Souza <email address hidden>
