19-merge_config.sh-add-br2-external-support.patch 1.6 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647
  1. commit 28fac3973b3c693c453594b007c08c1e1e5c4af3
  2. Author: Ilya Kuzmich <ilya.kuzmich@gmail.com>
  3. Date: Tue, 9 Jan 2018 14:37:43 +0300
  4. merge_config.sh: add br2-external support
  5. Pass BR2_EXTERNAL value via -e option.
  6. This will prevent merge_config.sh from silently eating any symbols defined in
  7. external trees on a clean buildroot tree invocation.
  8. Signed-off-by: Ilya Kuzmich <ilya.kuzmich@gmail.com>
  9. Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
  10. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
  11. Index: kconfig/merge_config.sh
  12. ===================================================================
  13. --- kconfig.orig/merge_config.sh
  14. +++ kconfig/merge_config.sh
  15. @@ -33,6 +33,7 @@ usage() {
  16. echo " -n use allnoconfig instead of alldefconfig"
  17. echo " -r list redundant entries when merging fragments"
  18. echo " -O dir to put generated output files. Consider setting \$KCONFIG_CONFIG instead."
  19. + echo " -e colon-separated list of br2-external trees to use (optional)"
  20. }
  21. RUNMAKE=true
  22. @@ -71,6 +72,11 @@ while true; do
  23. shift 2
  24. continue
  25. ;;
  26. + "-e")
  27. + EXTERNAL_ARG="BR2_EXTERNAL=$2"
  28. + shift 2
  29. + continue
  30. + ;;
  31. *)
  32. break
  33. ;;
  34. @@ -151,7 +157,7 @@ fi
  35. # Use the merged file as the starting point for:
  36. # alldefconfig: Fills in any missing symbols with Kconfig default
  37. # allnoconfig: Fills in any missing symbols with # CONFIG_* is not set
  38. -make KCONFIG_ALLCONFIG=$TMP_FILE $OUTPUT_ARG $ALLTARGET
  39. +make KCONFIG_ALLCONFIG=$TMP_FILE $EXTERNAL_ARG $OUTPUT_ARG $ALLTARGET
  40. # Check all specified config values took (might have missed-dependency issues)