[Buildroot] [git commit master 1/1] Match whole words when changing .config options
Peter Korsgaard
jacmet at sunsite.dk
Sun Jul 18 20:46:06 UTC 2010
commit: http://git.buildroot.net/buildroot/commit/?id=0383d48a5e61db900171ae74d4d2dfe30c420d04
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/master
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 at versanet.de>
Signed-off-by: Peter Korsgaard <jacmet at sunsite.dk>
---
package/Makefile.package.in | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/package/Makefile.package.in b/package/Makefile.package.in
index c476de9..d76b791 100644
--- a/package/Makefile.package.in
+++ b/package/Makefile.package.in
@@ -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
--
1.7.1
More information about the buildroot
mailing list