From 0383d48a5e61db900171ae74d4d2dfe30c420d04 Mon Sep 17 00:00:00 2001 From: Malte Starostik Date: Sun, 18 Jul 2010 22:16:48 +0200 Subject: 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 Signed-off-by: Peter Korsgaard --- package/Makefile.package.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/Makefile.package.in b/package/Makefile.package.in index c476de98d..d76b7913d 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 -- cgit v1.2.3