sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged in jjlange/nuttx/makefile_update (pull request #1005)

Browse Source 
Save CONFIG_ARCH_BOARD_CUSTOM when running 'make savedefconfig'

* Save CONFIG_ARCH_BOARD_CUSTOM when running 'make savedefconfig'

* Made grep search expression more specific.

Approved-by: Gregory Nutt <gnutt@nuttx.org>
This commit is contained in:
jjlange 2019-08-19 18:15:23 +00:00 committed by Gregory Nutt
parent dd2219c1db
commit 6077591079
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/Makefile.unix
View File

@ -561,6 +561,7 @@ savedefconfig: do_savedefconfig
$(Q) grep "^CONFIG_ARCH_CHIP=" .config >> defconfig.tmp; true $(Q) grep "^CONFIG_ARCH_CHIP=" .config >> defconfig.tmp; true
$(Q) grep "CONFIG_ARCH_BOARD=" .config && grep "CONFIG_ARCH_BOARD=" .config >> defconfig.tmp; true $(Q) grep "CONFIG_ARCH_BOARD=" .config && grep "CONFIG_ARCH_BOARD=" .config >> defconfig.tmp; true
$(Q) grep "^CONFIG_ARCH_CUSTOM" .config && grep "^CONFIG_ARCH_CUSTOM" .config >> defconfig.tmp; true $(Q) grep "^CONFIG_ARCH_CUSTOM" .config && grep "^CONFIG_ARCH_CUSTOM" .config >> defconfig.tmp; true
$(Q) grep "^CONFIG_ARCH_BOARD_CUSTOM=" .config && grep "^CONFIG_ARCH_BOARD_CUSTOM" .config >> defconfig.tmp; true
$(Q) export LC_ALL=C; cat defconfig.tmp | sort | uniq > sortedconfig.tmp $(Q) export LC_ALL=C; cat defconfig.tmp | sort | uniq > sortedconfig.tmp
$(Q) echo "#" > warning.tmp $(Q) echo "#" > warning.tmp
$(Q) echo "# This file is autogenerated: PLEASE DO NOT EDIT IT." >> warning.tmp $(Q) echo "# This file is autogenerated: PLEASE DO NOT EDIT IT." >> warning.tmp

1
tools/Makefile.win
View File

@ -548,6 +548,7 @@ savedefconfig: do_savedefconfig
-$(Q) grep "^CONFIG_ARCH_CHIP=" .config >> defconfig.tmp -$(Q) grep "^CONFIG_ARCH_CHIP=" .config >> defconfig.tmp
-$(Q) grep "CONFIG_ARCH_BOARD=" .config >> defconfig.tmp -$(Q) grep "CONFIG_ARCH_BOARD=" .config >> defconfig.tmp
-$(Q) grep "^CONFIG_ARCH_CUSTOM" .config >> defconfig.tmp -$(Q) grep "^CONFIG_ARCH_CUSTOM" .config >> defconfig.tmp
-$(Q) grep "^CONFIG_ARCH_BOARD_CUSTOM=" .config >> defconfig.tmp
$(Q) cat defconfig.tmp | sort | uniq > sortedconfig.tmp $(Q) cat defconfig.tmp | sort | uniq > sortedconfig.tmp
$(Q) echo "#" > warning.tmp $(Q) echo "#" > warning.tmp
$(Q) echo "# This file is autogenerated: PLEASE DO NOT EDIT IT." >> warning.tmp $(Q) echo "# This file is autogenerated: PLEASE DO NOT EDIT IT." >> warning.tmp