Makefile.unix: There is a sort command in the 'make savedefconfig' file. I found that sort behaves differently on different platforms based on the environment variable LC_ALL. Now, Makefile.unix will force LC_ALL=C just for the sort command so that we can all generate equivalent defconfig files.

This commit is contained in:
Gregory Nutt 2018-04-29 09:47:09 -06:00
parent d00441869f
commit 9a1277bd8f
2 changed files with 4 additions and 5 deletions

View File

@ -529,7 +529,7 @@ savedefconfig: do_savedefconfig
$(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_CUSTOM" .config && grep "^CONFIG_ARCH_CUSTOM" .config >> defconfig.tmp; true
$(Q) cat defconfig.tmp | sort | uniq > defconfig
$(Q) export LC_ALL=C; cat defconfig.tmp | sort | uniq > defconfig
$(Q) rm -f defconfig.tmp
# export

View File

@ -1,21 +1,20 @@
# CONFIG_ARCH_FPU is not set
# CONFIG_NSH_ARGCAT is not set
# CONFIG_NSH_CMDOPT_DF_H is not set
# CONFIG_NSH_CMDOPT_HEXDUMP is not set
# CONFIG_NSH_CMDPARMS is not set
CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y
CONFIG_ARCH="arm"
CONFIG_ARCH_BOARD="stm32f4discovery"
CONFIG_ARCH_BOARD_STM32F4_DISCOVERY=y
CONFIG_ARCH_BUTTONS=y
CONFIG_ARCH_CHIP_STM32=y
CONFIG_ARCH_CHIP_STM32F407VG=y
CONFIG_ARCH_STACKDUMP=y
CONFIG_ARCH="arm"
CONFIG_ARMV7M_TOOLCHAIN_CODESOURCERYW=y
CONFIG_BOARD_LOOPSPERMSEC=16717
CONFIG_BUILTIN=y
CONFIG_DISABLE_POLL=y
CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
CONFIG_EXAMPLES_NSH=y
CONFIG_EXAMPLES_NSH_CXXINITIALIZE=y
CONFIG_FS_PROCFS=y
CONFIG_HAVE_CXX=y
CONFIG_HAVE_CXXINITIALIZE=y