[PATCH 0/2] merge_config.sh updates for 3.4?

[PATCH 0/2] merge_config.sh updates for 3.4?

[John Stultz]

Hey Michal,
	Just wanted to send you a few small updates
for the merge_config.sh script.

Let me know if these look ok for 3.4, or if you'd like to
defer them for later.

thanks
-john


CC: Michal Marek <mmarek@suse.cz>
CC: Bruce.Ashfield@windriver.com
CC: Darren Hart <dvhart@linux.intel.com>

John Stultz (2):
  merge_config.sh: Set execute bit
  merge_config.sh: Add option to display redundant configs

 scripts/kconfig/merge_config.sh |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 scripts/kconfig/merge_config.sh

-- 
1.7.3.2.146.gca209

[PATCH 1/2] merge_config.sh: Set execute bit

[John Stultz]

Somehow the merge_config.sh script didn't get its execute bit
set when it was merged. Fix this.

CC: Michal Marek <mmarek@suse.cz>
CC: Bruce.Ashfield@windriver.com
CC: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
 0 files changed, 0 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 scripts/kconfig/merge_config.sh

diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
old mode 100644
new mode 100755
-- 
1.7.3.2.146.gca209

Re: [PATCH 1/2] merge_config.sh: Set execute bit

[Darren Hart]

On 03/22/2012 03:05 PM, John Stultz wrote:
> Somehow the merge_config.sh script didn't get its execute bit
> set when it was merged. Fix this.
> 
> CC: Michal Marek <mmarek@suse.cz>
> CC: Bruce.Ashfield@windriver.com
> CC: Darren Hart <dvhart@linux.intel.com>
> Signed-off-by: John Stultz <john.stultz@linaro.org>

Acked-by: Darren Hart <dvhart@linux.intel.com>

> ---
>  0 files changed, 0 insertions(+), 0 deletions(-)
>  mode change 100644 => 100755 scripts/kconfig/merge_config.sh
> 
> diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
> old mode 100644
> new mode 100755

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Re: [PATCH 1/2] merge_config.sh: Set execute bit

[Bruce Ashfield]

On 12-03-22 06:05 PM, John Stultz wrote:
> Somehow the merge_config.sh script didn't get its execute bit
> set when it was merged. Fix this.
>
> CC: Michal Marek<mmarek@suse.cz>
> CC: Bruce.Ashfield@windriver.com
> CC: Darren Hart<dvhart@linux.intel.com>
> Signed-off-by: John Stultz<john.stultz@linaro.org>

Acked-by: Bruce Ashfield <bruce.ashfield@windriver.com>

Bruce

> ---
>   0 files changed, 0 insertions(+), 0 deletions(-)
>   mode change 100644 =>  100755 scripts/kconfig/merge_config.sh
>
> diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
> old mode 100644
> new mode 100755

Re: [PATCH 1/2] merge_config.sh: Set execute bit

[Michal Marek]

On Thu, Mar 22, 2012 at 03:05:48PM -0700, John Stultz wrote:
> Somehow the merge_config.sh script didn't get its execute bit
> set when it was merged. Fix this.

Most likely non-git diff was used as carrier at some point.

> 
> CC: Michal Marek <mmarek@suse.cz>
> CC: Bruce.Ashfield@windriver.com
> CC: Darren Hart <dvhart@linux.intel.com>
> Signed-off-by: John Stultz <john.stultz@linaro.org>
> ---
>  0 files changed, 0 insertions(+), 0 deletions(-)
>  mode change 100644 => 100755 scripts/kconfig/merge_config.sh
> 
> diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
> old mode 100644
> new mode 100755

Applied to kbuild.git#misc, thanks.

Michal

[PATCH 2/2] merge_config.sh: Add option to display redundant configs

[John Stultz]

Provide a -r option to display when fragments contain reundent
options

CC: Michal Marek <mmarek@suse.cz>
CC: Bruce.Ashfield@windriver.com
CC: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: John Stultz <john.stultz@linaro.org>
---
 scripts/kconfig/merge_config.sh |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
index ceadf0e..d92edc3 100755
--- a/scripts/kconfig/merge_config.sh
+++ b/scripts/kconfig/merge_config.sh
@@ -31,10 +31,12 @@ usage() {
 	echo "  -h    display this help text"
 	echo "  -m    only merge the fragments, do not execute the make command"
 	echo "  -n    use allnoconfig instead of alldefconfig"
+	echo "  -r    list redundant enteries when merging fragments"
 }
 
 MAKE=true
 ALLTARGET=alldefconfig
+WARNREDUN=false
 
 while true; do
 	case $1 in
@@ -52,6 +54,11 @@ while true; do
 		usage
 		exit
 		;;
+	"-r")
+		WARNREDUN=true
+		shift
+		continue
+		;;
 	*)
 		break
 		;;
@@ -79,6 +86,10 @@ for MERGE_FILE in $MERGE_LIST ; do
 			echo Previous  value: $PREV_VAL
 			echo New value:       $NEW_VAL
 			echo
+			else
+			if [ "$WARNREDUN" = "true" ]; then
+			echo Value of $CFG is redundant by fragment $MERGE_FILE:
+			fi
 			fi
 			sed -i "/$CFG[ =]/d" $TMP_FILE
 		fi
-- 
1.7.3.2.146.gca209

Re: [PATCH 2/2] merge_config.sh: Add option to display redundant configs

[Darren Hart]

A few spelling nitpics :-)

On 03/22/2012 03:05 PM, John Stultz wrote:
> Provide a -r option to display when fragments contain reundent

s/reundent/redundant/

> options
> 
> CC: Michal Marek <mmarek@suse.cz>
> CC: Bruce.Ashfield@windriver.com
> CC: Darren Hart <dvhart@linux.intel.com>
> Signed-off-by: John Stultz <john.stultz@linaro.org>
> ---
>  scripts/kconfig/merge_config.sh |   11 +++++++++++
>  1 files changed, 11 insertions(+), 0 deletions(-)
> 
> diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
> index ceadf0e..d92edc3 100755
> --- a/scripts/kconfig/merge_config.sh
> +++ b/scripts/kconfig/merge_config.sh
> @@ -31,10 +31,12 @@ usage() {
>  	echo "  -h    display this help text"
>  	echo "  -m    only merge the fragments, do not execute the make command"
>  	echo "  -n    use allnoconfig instead of alldefconfig"
> +	echo "  -r    list redundant enteries when merging fragments"

s/enteries/entries/

>  }
>  
>  MAKE=true
>  ALLTARGET=alldefconfig
> +WARNREDUN=false
>  
>  while true; do
>  	case $1 in
> @@ -52,6 +54,11 @@ while true; do
>  		usage
>  		exit
>  		;;
> +	"-r")
> +		WARNREDUN=true
> +		shift
> +		continue
> +		;;
>  	*)
>  		break
>  		;;
> @@ -79,6 +86,10 @@ for MERGE_FILE in $MERGE_LIST ; do
>  			echo Previous  value: $PREV_VAL
>  			echo New value:       $NEW_VAL
>  			echo
> +			else

Can this just be an elif and avoid the nested if block?

> +			if [ "$WARNREDUN" = "true" ]; then
> +			echo Value of $CFG is redundant by fragment $MERGE_FILE:
> +			fi

No indentation... is that just my MUA?

>  			fi
>  			sed -i "/$CFG[ =]/d" $TMP_FILE
>  		fi

-- 
Darren Hart
Intel Open Source Technology Center
Yocto Project - Linux Kernel

Re: [PATCH 2/2] merge_config.sh: Add option to display redundant configs

[John Stultz]

On 03/22/2012 08:45 PM, Darren Hart wrote:
> A few spelling nitpics :-)

Thanks for the fixes, just sent out a new rev.
-john

Re: [PATCH 2/2] merge_config.sh: Add option to display redundant configs

[Bruce Ashfield]

On 12-03-22 06:05 PM, John Stultz wrote:
> Provide a -r option to display when fragments contain reundent
> options
>
> CC: Michal Marek<mmarek@suse.cz>
> CC: Bruce.Ashfield@windriver.com
> CC: Darren Hart<dvhart@linux.intel.com>
> Signed-off-by: John Stultz<john.stultz@linaro.org>

I've got a few similar tweaks that I'll dust off and send out
(but I'll likely miss this window), but this adds that little
prod needed to track down where the dup is coming from.

So I like the option.

Acked-by: Bruce Ashfield <bruce.ashfield@windriver.com>

Cheers,

Bruce

> ---
>   scripts/kconfig/merge_config.sh |   11 +++++++++++
>   1 files changed, 11 insertions(+), 0 deletions(-)
>
> diff --git a/scripts/kconfig/merge_config.sh b/scripts/kconfig/merge_config.sh
> index ceadf0e..d92edc3 100755
> --- a/scripts/kconfig/merge_config.sh
> +++ b/scripts/kconfig/merge_config.sh
> @@ -31,10 +31,12 @@ usage() {
>   	echo "  -h    display this help text"
>   	echo "  -m    only merge the fragments, do not execute the make command"
>   	echo "  -n    use allnoconfig instead of alldefconfig"
> +	echo "  -r    list redundant enteries when merging fragments"
>   }
>
>   MAKE=true
>   ALLTARGET=alldefconfig
> +WARNREDUN=false
>
>   while true; do
>   	case $1 in
> @@ -52,6 +54,11 @@ while true; do
>   		usage
>   		exit
>   		;;
> +	"-r")
> +		WARNREDUN=true
> +		shift
> +		continue
> +		;;
>   	*)
>   		break
>   		;;
> @@ -79,6 +86,10 @@ for MERGE_FILE in $MERGE_LIST ; do
>   			echo Previous  value: $PREV_VAL
>   			echo New value:       $NEW_VAL
>   			echo
> +			else
> +			if [ "$WARNREDUN" = "true" ]; then
> +			echo Value of $CFG is redundant by fragment $MERGE_FILE:
> +			fi
>   			fi
>   			sed -i "/$CFG[ =]/d" $TMP_FILE
>   		fi