Patchwork [meta-handheld] linux.inc: be more strict in CONF_SED_SCRIPT

login
register
mail settings
Submitter Martin Jansa
Date Oct. 25, 2011, 6:27 a.m.
Message ID <1319524046-22472-1-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/13849/
State Accepted
Headers show

Comments

Martin Jansa - Oct. 25, 2011, 6:27 a.m.
* without this ARM_THUMB is also removing ARM_THUMBEE from
  defconfig and not setting it back

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 recipes-kernel/linux/linux.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Paul Eggleton - Nov. 2, 2011, 9:02 p.m.
On Tuesday 25 October 2011 08:27:26 Martin Jansa wrote:
> * without this ARM_THUMB is also removing ARM_THUMBEE from
>   defconfig and not setting it back
> 
> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
> ---
>  recipes-kernel/linux/linux.inc |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
> index 7a25b59..781d5ba 100644
> --- a/recipes-kernel/linux/linux.inc
> +++ b/recipes-kernel/linux/linux.inc
> @@ -24,7 +24,7 @@ LOCALVERSION ?= ""
> 
>  #kernel_conf_variable CMDLINE "\"${CMDLINE} ${CMDLINE_DEBUG}\""
>  kernel_conf_variable() {
> -	CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1/d;"
> +	CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;"
>  	if test "$2" = "n"
>  	then
>  		echo "# CONFIG_$1 is not set" >> ${S}/.config

Merged to meta-handheld master, thanks.

Cheers,
Paul

Patch

diff --git a/recipes-kernel/linux/linux.inc b/recipes-kernel/linux/linux.inc
index 7a25b59..781d5ba 100644
--- a/recipes-kernel/linux/linux.inc
+++ b/recipes-kernel/linux/linux.inc
@@ -24,7 +24,7 @@  LOCALVERSION ?= ""
 
 #kernel_conf_variable CMDLINE "\"${CMDLINE} ${CMDLINE_DEBUG}\""
 kernel_conf_variable() {
-	CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1/d;"
+	CONF_SED_SCRIPT="$CONF_SED_SCRIPT /CONFIG_$1[ =]/d;"
 	if test "$2" = "n"
 	then
 		echo "# CONFIG_$1 is not set" >> ${S}/.config