All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH 1/1] merge_config.sh: add br2-external support
@ 2017-12-28 15:09 Ilya Kuzmich
  2017-12-30 17:58 ` Yann E. MORIN
  0 siblings, 1 reply; 5+ messages in thread
From: Ilya Kuzmich @ 2017-12-28 15:09 UTC (permalink / raw)
  To: buildroot

Pass BR2_EXTERNAL value via -e option.
This will prevent merge_config.sh from silently eating any symbols defined in
external trees on a clean buildroot tree invocation.

Signed-off-by: Ilya Kuzmich <ilya.kuzmich@gmail.com>
---
 support/kconfig/merge_config.sh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/support/kconfig/merge_config.sh b/support/kconfig/merge_config.sh
index 8a1708b..f52318a 100755
--- a/support/kconfig/merge_config.sh
+++ b/support/kconfig/merge_config.sh
@@ -33,6 +33,7 @@ usage() {
 	echo "  -n    use allnoconfig instead of alldefconfig"
 	echo "  -r    list redundant entries when merging fragments"
 	echo "  -O    dir to put generated output files"
+	echo "  -e    br external tree"
 }
 
 MAKE=true
@@ -71,6 +72,11 @@ while true; do
 		shift 2
 		continue
 		;;
+	"-e")
+		EXTERNAL=$2
+		shift 2
+		continue
+		;;
 	*)
 		break
 		;;
@@ -127,11 +133,16 @@ if [ "$OUTPUT" != "." ] ; then
 	OUTPUT_ARG="O=$OUTPUT"
 fi
 
+EXTERNAL_ARG=""
+if [ "$EXTERNAL" ] ; then
+    EXTERNAL_ARG="BR2_EXTERNAL=$EXTERNAL"
+fi
+
 
 # Use the merged file as the starting point for:
 # alldefconfig: Fills in any missing symbols with Kconfig default
 # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set
-make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET
+make KCONFIG_ALLCONFIG=$TMP_FILE $EXTERNAL_ARG $OUTPUT_ARG $ALLTARGET
 
 
 # Check all specified config values took (might have missed-dependency issues)
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [Buildroot] [PATCH 1/1] merge_config.sh: add br2-external support
  2017-12-28 15:09 [Buildroot] [PATCH 1/1] merge_config.sh: add br2-external support Ilya Kuzmich
@ 2017-12-30 17:58 ` Yann E. MORIN
  2018-01-09 11:37   ` [Buildroot] [v2 " Ilya Kuzmich
  0 siblings, 1 reply; 5+ messages in thread
From: Yann E. MORIN @ 2017-12-30 17:58 UTC (permalink / raw)
  To: buildroot

Ilya, All,

On 2017-12-28 18:09 +0300, Ilya Kuzmich spake thusly:
> Pass BR2_EXTERNAL value via -e option.
> This will prevent merge_config.sh from silently eating any symbols defined in
> external trees on a clean buildroot tree invocation.
> 
> Signed-off-by: Ilya Kuzmich <ilya.kuzmich@gmail.com>
> ---
>  support/kconfig/merge_config.sh | 13 ++++++++++++-
>  1 file changed, 12 insertions(+), 1 deletion(-)
> 
> diff --git a/support/kconfig/merge_config.sh b/support/kconfig/merge_config.sh
> index 8a1708b..f52318a 100755
> --- a/support/kconfig/merge_config.sh
> +++ b/support/kconfig/merge_config.sh
> @@ -33,6 +33,7 @@ usage() {
>  	echo "  -n    use allnoconfig instead of alldefconfig"
>  	echo "  -r    list redundant entries when merging fragments"
>  	echo "  -O    dir to put generated output files"
> +	echo "  -e    br external tree"

So, this is not only about one tree, since we also support mutiple
trees, so:

    -e    colon-separated list of br2-external trees to use (optional)

>  }
>  
>  MAKE=true
> @@ -71,6 +72,11 @@ while true; do
>  		shift 2
>  		continue
>  		;;
> +	"-e")
> +		EXTERNAL=$2
> +		shift 2
> +		continue
> +		;;
>  	*)
>  		break
>  		;;
> @@ -127,11 +133,16 @@ if [ "$OUTPUT" != "." ] ; then
>  	OUTPUT_ARG="O=$OUTPUT"
>  fi
>  
> +EXTERNAL_ARG=""
> +if [ "$EXTERNAL" ] ; then
> +    EXTERNAL_ARG="BR2_EXTERNAL=$EXTERNAL"
> +fi

Why don't you simply handle that in the case statement, above?

    "-e")
        EXTERNAL_ARG="BR2_EXTERNAL=$2"
        shift 2
        continue
        ;;

And that all. And no need to explicitly set it to empty first.

Regards,
Yann E. MORIN.

>  
>  # Use the merged file as the starting point for:
>  # alldefconfig: Fills in any missing symbols with Kconfig default
>  # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set
> -make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET
> +make KCONFIG_ALLCONFIG=$TMP_FILE $EXTERNAL_ARG $OUTPUT_ARG $ALLTARGET
>  
>  
>  # Check all specified config values took (might have missed-dependency issues)
> -- 
> 2.7.4
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [Buildroot] [v2 1/1] merge_config.sh: add br2-external support
  2017-12-30 17:58 ` Yann E. MORIN
@ 2018-01-09 11:37   ` Ilya Kuzmich
  2018-01-13 11:07     ` Yann E. MORIN
  2018-01-29 13:55     ` Peter Korsgaard
  0 siblings, 2 replies; 5+ messages in thread
From: Ilya Kuzmich @ 2018-01-09 11:37 UTC (permalink / raw)
  To: buildroot

Pass BR2_EXTERNAL value via -e option.
This will prevent merge_config.sh from silently eating any symbols defined in
external trees on a clean buildroot tree invocation.

Signed-off-by: Ilya Kuzmich <ilya.kuzmich@gmail.com>

---
Changes v1 -> v2:
Simplifications

Signed-off-by: Ilya Kuzmich <ilya.kuzmich@gmail.com>
---
 support/kconfig/merge_config.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/support/kconfig/merge_config.sh b/support/kconfig/merge_config.sh
index 8a1708b..e1d7ffa 100755
--- a/support/kconfig/merge_config.sh
+++ b/support/kconfig/merge_config.sh
@@ -33,6 +33,7 @@ usage() {
 	echo "  -n    use allnoconfig instead of alldefconfig"
 	echo "  -r    list redundant entries when merging fragments"
 	echo "  -O    dir to put generated output files"
+	echo "  -e    colon-separated list of br2-external trees to use (optional)"
 }
 
 MAKE=true
@@ -71,6 +72,11 @@ while true; do
 		shift 2
 		continue
 		;;
+	"-e")
+		EXTERNAL_ARG="BR2_EXTERNAL=$2"
+		shift 2
+		continue
+		;;
 	*)
 		break
 		;;
@@ -131,7 +137,7 @@ fi
 # Use the merged file as the starting point for:
 # alldefconfig: Fills in any missing symbols with Kconfig default
 # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set
-make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET
+make KCONFIG_ALLCONFIG=$TMP_FILE $EXTERNAL_ARG $OUTPUT_ARG $ALLTARGET
 
 
 # Check all specified config values took (might have missed-dependency issues)
-- 
2.7.4

^ permalink raw reply related	[flat|nested] 5+ messages in thread
* [Buildroot] [v2 1/1] merge_config.sh: add br2-external support
  2018-01-09 11:37   ` [Buildroot] [v2 " Ilya Kuzmich
@ 2018-01-13 11:07     ` Yann E. MORIN
  2018-01-29 13:55     ` Peter Korsgaard
  1 sibling, 0 replies; 5+ messages in thread
From: Yann E. MORIN @ 2018-01-13 11:07 UTC (permalink / raw)
  To: buildroot

Ilya, All,

On 2018-01-09 14:37 +0300, Ilya Kuzmich spake thusly:
> Pass BR2_EXTERNAL value via -e option.
> This will prevent merge_config.sh from silently eating any symbols defined in
> external trees on a clean buildroot tree invocation.
> 
> Signed-off-by: Ilya Kuzmich <ilya.kuzmich@gmail.com>

Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>

Regards,
Yann E. MORIN.

> ---
> Changes v1 -> v2:
> Simplifications
> 
> Signed-off-by: Ilya Kuzmich <ilya.kuzmich@gmail.com>
> ---
>  support/kconfig/merge_config.sh | 8 +++++++-
>  1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/support/kconfig/merge_config.sh b/support/kconfig/merge_config.sh
> index 8a1708b..e1d7ffa 100755
> --- a/support/kconfig/merge_config.sh
> +++ b/support/kconfig/merge_config.sh
> @@ -33,6 +33,7 @@ usage() {
>  	echo "  -n    use allnoconfig instead of alldefconfig"
>  	echo "  -r    list redundant entries when merging fragments"
>  	echo "  -O    dir to put generated output files"
> +	echo "  -e    colon-separated list of br2-external trees to use (optional)"
>  }
>  
>  MAKE=true
> @@ -71,6 +72,11 @@ while true; do
>  		shift 2
>  		continue
>  		;;
> +	"-e")
> +		EXTERNAL_ARG="BR2_EXTERNAL=$2"
> +		shift 2
> +		continue
> +		;;
>  	*)
>  		break
>  		;;
> @@ -131,7 +137,7 @@ fi
>  # Use the merged file as the starting point for:
>  # alldefconfig: Fills in any missing symbols with Kconfig default
>  # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set
> -make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET
> +make KCONFIG_ALLCONFIG=$TMP_FILE $EXTERNAL_ARG $OUTPUT_ARG $ALLTARGET
>  
>  
>  # Check all specified config values took (might have missed-dependency issues)
> -- 
> 2.7.4
> 
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot

-- 
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 223 225 172 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'

^ permalink raw reply	[flat|nested] 5+ messages in thread
* [Buildroot] [v2 1/1] merge_config.sh: add br2-external support
  2018-01-09 11:37   ` [Buildroot] [v2 " Ilya Kuzmich
  2018-01-13 11:07     ` Yann E. MORIN
@ 2018-01-29 13:55     ` Peter Korsgaard
  1 sibling, 0 replies; 5+ messages in thread
From: Peter Korsgaard @ 2018-01-29 13:55 UTC (permalink / raw)
  To: buildroot

>>>>> "Ilya" == Ilya Kuzmich <ilya.kuzmich@gmail.com> writes:

 > Pass BR2_EXTERNAL value via -e option.
 > This will prevent merge_config.sh from silently eating any symbols defined in
 > external trees on a clean buildroot tree invocation.

 > Signed-off-by: Ilya Kuzmich <ilya.kuzmich@gmail.com>

 > ---
 > Changes v1 -> v2:
 > Simplifications

 > Signed-off-by: Ilya Kuzmich <ilya.kuzmich@gmail.com>

Committed, thanks.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-01-29 13:55 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-12-28 15:09 [Buildroot] [PATCH 1/1] merge_config.sh: add br2-external support Ilya Kuzmich
2017-12-30 17:58 ` Yann E. MORIN
2018-01-09 11:37   ` [Buildroot] [v2 " Ilya Kuzmich
2018-01-13 11:07     ` Yann E. MORIN
2018-01-29 13:55     ` Peter Korsgaard

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.