Match whole words when changing .config options
Make KCONFIG_{ENABLE,DISABLE,SET}_OPT match whole words only.
Fixes that BR_INET_IPV6 enables CONFIG_IPV6 in the kernel's
.config, but also nukes everything with "CONFIG_IPV6" in its name, e.g.
CONFIG_IPV6_PRIVACY. This in turn causes any IPv6 options in a custom
kernel .config to be lost and oldconfig going interactive.
Signed-off-by: Malte Starostik <m-starostik@versanet.de>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
committed by
Peter Korsgaard
parent
ad36fcdda0
commit
0383d48a5e
@@ -41,17 +41,17 @@ UPPERCASE = $(strip $(eval __tmp := $1) \
|
||||
$(__tmp))
|
||||
|
||||
define KCONFIG_ENABLE_OPT
|
||||
$(SED) "/$(1)/d" $(2)
|
||||
$(SED) "/\\<$(1)\\>/d" $(2)
|
||||
echo "$(1)=y" >> $(2)
|
||||
endef
|
||||
|
||||
define KCONFIG_SET_OPT
|
||||
$(SED) "/$(1)/d" $(3)
|
||||
$(SED) "/\\<$(1)\\>/d" $(3)
|
||||
echo "$(1)=$(2)" >> $(3)
|
||||
endef
|
||||
|
||||
define KCONFIG_DISABLE_OPT
|
||||
$(SED) "/$(1)/d" $(2)
|
||||
$(SED) "/\\<$(1)\\>/d" $(2)
|
||||
echo "# $(1) is not set" >> $(2)
|
||||
endef
|
||||
|
||||
|
||||
Reference in New Issue
Block a user