mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-11 12:28:41 +08:00
kbuild: add $(BASH) to run scripts with bash-extension
CONFIG_SHELL falls back to sh when bash is not installed on the system, but nobody is testing such a case since bash is usually installed. So, shell scripts invoked by CONFIG_SHELL are only tested with bash. It makes it difficult to test whether the hashbang #!/bin/sh is real. For example, #!/bin/sh in arch/powerpc/kernel/prom_init_check.sh is false. (I fixed it up) Besides, some shell scripts invoked by CONFIG_SHELL use bash-extension and #!/bin/bash is specified as the hashbang, while CONFIG_SHELL may not always be set to bash. Probably, the right thing to do is to introduce BASH, which is bash by default, and always set CONFIG_SHELL to sh. Replace $(CONFIG_SHELL) with $(BASH) for bash scripts. If somebody tries to add bash-extension to a #!/bin/sh script, it will be caught in testing because /bin/sh is a symlink to dash on some major distributions. Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
This commit is contained in:
parent
8cc7af7514
commit
858805b336
11
Makefile
11
Makefile
@ -404,9 +404,7 @@ KCONFIG_CONFIG ?= .config
|
|||||||
export KCONFIG_CONFIG
|
export KCONFIG_CONFIG
|
||||||
|
|
||||||
# SHELL used by kbuild
|
# SHELL used by kbuild
|
||||||
CONFIG_SHELL := $(shell if [ -x "$$BASH" ]; then echo $$BASH; \
|
CONFIG_SHELL := sh
|
||||||
else if [ -x /bin/bash ]; then echo /bin/bash; \
|
|
||||||
else echo sh; fi ; fi)
|
|
||||||
|
|
||||||
HOST_LFS_CFLAGS := $(shell getconf LFS_CFLAGS 2>/dev/null)
|
HOST_LFS_CFLAGS := $(shell getconf LFS_CFLAGS 2>/dev/null)
|
||||||
HOST_LFS_LDFLAGS := $(shell getconf LFS_LDFLAGS 2>/dev/null)
|
HOST_LFS_LDFLAGS := $(shell getconf LFS_LDFLAGS 2>/dev/null)
|
||||||
@ -443,6 +441,7 @@ PYTHON = python
|
|||||||
PYTHON2 = python2
|
PYTHON2 = python2
|
||||||
PYTHON3 = python3
|
PYTHON3 = python3
|
||||||
CHECK = sparse
|
CHECK = sparse
|
||||||
|
BASH = bash
|
||||||
|
|
||||||
CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \
|
CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ -Dunix -D__unix__ \
|
||||||
-Wbitwise -Wno-return-void -Wno-unknown-attribute $(CF)
|
-Wbitwise -Wno-return-void -Wno-unknown-attribute $(CF)
|
||||||
@ -488,7 +487,7 @@ KBUILD_LDFLAGS :=
|
|||||||
GCC_PLUGINS_CFLAGS :=
|
GCC_PLUGINS_CFLAGS :=
|
||||||
CLANG_FLAGS :=
|
CLANG_FLAGS :=
|
||||||
|
|
||||||
export ARCH SRCARCH CONFIG_SHELL HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC
|
export ARCH SRCARCH CONFIG_SHELL BASH HOSTCC KBUILD_HOSTCFLAGS CROSS_COMPILE AS LD CC
|
||||||
export CPP AR NM STRIP OBJCOPY OBJDUMP OBJSIZE PAHOLE LEX YACC AWK INSTALLKERNEL
|
export CPP AR NM STRIP OBJCOPY OBJDUMP OBJSIZE PAHOLE LEX YACC AWK INSTALLKERNEL
|
||||||
export PERL PYTHON PYTHON2 PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX
|
export PERL PYTHON PYTHON2 PYTHON3 CHECK CHECKFLAGS MAKE UTS_MACHINE HOSTCXX
|
||||||
export KBUILD_HOSTCXXFLAGS KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS LDFLAGS_MODULE
|
export KBUILD_HOSTCXXFLAGS KBUILD_HOSTLDFLAGS KBUILD_HOSTLDLIBS LDFLAGS_MODULE
|
||||||
@ -1687,7 +1686,7 @@ clean: $(clean-dirs)
|
|||||||
# Generate tags for editors
|
# Generate tags for editors
|
||||||
# ---------------------------------------------------------------------------
|
# ---------------------------------------------------------------------------
|
||||||
quiet_cmd_tags = GEN $@
|
quiet_cmd_tags = GEN $@
|
||||||
cmd_tags = $(CONFIG_SHELL) $(srctree)/scripts/tags.sh $@
|
cmd_tags = $(BASH) $(srctree)/scripts/tags.sh $@
|
||||||
|
|
||||||
tags TAGS cscope gtags: FORCE
|
tags TAGS cscope gtags: FORCE
|
||||||
$(call cmd,tags)
|
$(call cmd,tags)
|
||||||
@ -1708,7 +1707,7 @@ versioncheck:
|
|||||||
| xargs $(PERL) -w $(srctree)/scripts/checkversion.pl
|
| xargs $(PERL) -w $(srctree)/scripts/checkversion.pl
|
||||||
|
|
||||||
coccicheck:
|
coccicheck:
|
||||||
$(Q)$(CONFIG_SHELL) $(srctree)/scripts/$@
|
$(Q)$(BASH) $(srctree)/scripts/$@
|
||||||
|
|
||||||
namespacecheck:
|
namespacecheck:
|
||||||
$(PERL) $(srctree)/scripts/namespace.pl
|
$(PERL) $(srctree)/scripts/namespace.pl
|
||||||
|
@ -160,7 +160,7 @@ targets += vmlinux.lzo.itb
|
|||||||
quiet_cmd_itb-image = ITB $@
|
quiet_cmd_itb-image = ITB $@
|
||||||
cmd_itb-image = \
|
cmd_itb-image = \
|
||||||
env PATH="$(objtree)/scripts/dtc:$(PATH)" \
|
env PATH="$(objtree)/scripts/dtc:$(PATH)" \
|
||||||
$(CONFIG_SHELL) $(MKIMAGE) \
|
$(BASH) $(MKIMAGE) \
|
||||||
-D "-I dts -O dtb -p 500 \
|
-D "-I dts -O dtb -p 500 \
|
||||||
--include $(objtree)/arch/mips \
|
--include $(objtree)/arch/mips \
|
||||||
--warning no-unit_address_vs_reg" \
|
--warning no-unit_address_vs_reg" \
|
||||||
|
@ -18,7 +18,7 @@ quiet_cmd_relocs_check = CHKREL $@
|
|||||||
ifdef CONFIG_PPC_BOOK3S_64
|
ifdef CONFIG_PPC_BOOK3S_64
|
||||||
cmd_relocs_check = \
|
cmd_relocs_check = \
|
||||||
$(CONFIG_SHELL) $(srctree)/arch/powerpc/tools/relocs_check.sh "$(OBJDUMP)" "$@" ; \
|
$(CONFIG_SHELL) $(srctree)/arch/powerpc/tools/relocs_check.sh "$(OBJDUMP)" "$@" ; \
|
||||||
$(CONFIG_SHELL) $(srctree)/arch/powerpc/tools/unrel_branch_check.sh "$(OBJDUMP)" "$@"
|
$(BASH) $(srctree)/arch/powerpc/tools/unrel_branch_check.sh "$(OBJDUMP)" "$@"
|
||||||
else
|
else
|
||||||
cmd_relocs_check = \
|
cmd_relocs_check = \
|
||||||
$(CONFIG_SHELL) $(srctree)/arch/powerpc/tools/relocs_check.sh "$(OBJDUMP)" "$@"
|
$(CONFIG_SHELL) $(srctree)/arch/powerpc/tools/relocs_check.sh "$(OBJDUMP)" "$@"
|
||||||
|
@ -33,7 +33,7 @@ OBJ="$2"
|
|||||||
|
|
||||||
ERROR=0
|
ERROR=0
|
||||||
|
|
||||||
function check_section()
|
check_section()
|
||||||
{
|
{
|
||||||
file=$1
|
file=$1
|
||||||
section=$2
|
section=$2
|
||||||
|
@ -126,7 +126,7 @@ $(obj)/config_data.gz: $(KCONFIG_CONFIG) FORCE
|
|||||||
$(obj)/kheaders.o: $(obj)/kheaders_data.tar.xz
|
$(obj)/kheaders.o: $(obj)/kheaders_data.tar.xz
|
||||||
|
|
||||||
quiet_cmd_genikh = CHK $(obj)/kheaders_data.tar.xz
|
quiet_cmd_genikh = CHK $(obj)/kheaders_data.tar.xz
|
||||||
cmd_genikh = $(CONFIG_SHELL) $(srctree)/kernel/gen_kheaders.sh $@
|
cmd_genikh = $(BASH) $(srctree)/kernel/gen_kheaders.sh $@
|
||||||
$(obj)/kheaders_data.tar.xz: FORCE
|
$(obj)/kheaders_data.tar.xz: FORCE
|
||||||
$(call cmd,genikh)
|
$(call cmd,genikh)
|
||||||
|
|
||||||
|
@ -364,7 +364,7 @@ UIMAGE_ENTRYADDR ?= $(UIMAGE_LOADADDR)
|
|||||||
UIMAGE_NAME ?= 'Linux-$(KERNELRELEASE)'
|
UIMAGE_NAME ?= 'Linux-$(KERNELRELEASE)'
|
||||||
|
|
||||||
quiet_cmd_uimage = UIMAGE $@
|
quiet_cmd_uimage = UIMAGE $@
|
||||||
cmd_uimage = $(CONFIG_SHELL) $(MKIMAGE) -A $(UIMAGE_ARCH) -O linux \
|
cmd_uimage = $(BASH) $(MKIMAGE) -A $(UIMAGE_ARCH) -O linux \
|
||||||
-C $(UIMAGE_COMPRESSION) $(UIMAGE_OPTS-y) \
|
-C $(UIMAGE_COMPRESSION) $(UIMAGE_OPTS-y) \
|
||||||
-T $(UIMAGE_TYPE) \
|
-T $(UIMAGE_TYPE) \
|
||||||
-a $(UIMAGE_LOADADDR) -e $(UIMAGE_ENTRYADDR) \
|
-a $(UIMAGE_LOADADDR) -e $(UIMAGE_ENTRYADDR) \
|
||||||
|
Loading…
Reference in New Issue
Block a user