Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba97df45 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

kbuild: use assignment instead of define ... endef for filechk_* rules 



You do not have to use define ... endef for filechk_* rules.

For simple cases, the use of assignment looks cleaner, IMHO.

I updated the usage for scripts/Kbuild.include in case somebody
misunderstands the 'define ... endif' is the requirement.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
Acked-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
parent d6e4b3e3

Kbuild

+1 −3
Original line number Diff line number Diff line
@@ -26,9 +26,7 @@ timeconst-file := include/generated/timeconst.h 


targets += $(timeconst-file)



define filechk_gentimeconst

	echo $(CONFIG_HZ) | bc -q $<

endef

filechk_gentimeconst = echo $(CONFIG_HZ) | bc -q $<



$(timeconst-file): kernel/time/timeconst.bc FORCE

	$(call filechk,gentimeconst)

Makefile

+1 −2
Original line number Diff line number Diff line
@@ -1041,9 +1041,8 @@ PHONY += $(vmlinux-dirs) 
$(vmlinux-dirs): prepare

	$(Q)$(MAKE) $(build)=$@ need-builtin=1



define filechk_kernel.release

filechk_kernel.release = \

	echo "$(KERNELVERSION)$$($(CONFIG_SHELL) $(srctree)/scripts/setlocalversion $(srctree))"

endef



# Store (new) KERNELRELEASE string in include/config/kernel.release

include/config/kernel.release: $(srctree)/Makefile FORCE

arch/s390/kernel/syscalls/Makefile

+3 −9
Original line number Diff line number Diff line
@@ -24,17 +24,11 @@ uapi: $(uapi-hdrs-y) 
_dummy := $(shell [ -d '$(uapi)' ] || mkdir -p '$(uapi)') \

	  $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)')



define filechk_syshdr

	$(CONFIG_SHELL) '$(systbl)' -H -a $(syshdr_abi_$(basetarget)) -f "$2" < $<

endef

filechk_syshdr = $(CONFIG_SHELL) '$(systbl)' -H -a $(syshdr_abi_$(basetarget)) -f "$2" < $<



define filechk_sysnr

	$(CONFIG_SHELL) '$(systbl)' -N -a $(sysnr_abi_$(basetarget)) < $<

endef

filechk_sysnr = $(CONFIG_SHELL) '$(systbl)' -N -a $(sysnr_abi_$(basetarget)) < $<



define filechk_syscalls

	$(CONFIG_SHELL) '$(systbl)' -S < $<

endef

filechk_syscalls = $(CONFIG_SHELL) '$(systbl)' -S < $<



syshdr_abi_unistd_32 := common,32

$(uapi)/unistd_32.h: $(syscall) FORCE

arch/s390/tools/Makefile

+2 −5
Original line number Diff line number Diff line
@@ -20,13 +20,10 @@ HOSTCFLAGS_gen_opcode_table.o += -Wall $(LINUXINCLUDE) 
# Ensure output directory exists

_dummy := $(shell [ -d '$(kapi)' ] || mkdir -p '$(kapi)')



define filechk_facility-defs.h

	$(obj)/gen_facilities

endef

filechk_facility-defs.h = $(obj)/gen_facilities



define filechk_dis-defs.h

filechk_dis-defs.h = \

	$(obj)/gen_opcode_table < $(srctree)/arch/$(ARCH)/tools/opcodes.txt

endef



$(kapi)/facility-defs.h: $(obj)/gen_facilities FORCE

	$(call filechk,facility-defs.h)

scripts/Kbuild.include

+4 −4
Original line number Diff line number Diff line
@@ -41,11 +41,11 @@ kecho := $($(quiet)kecho) 
###

# filechk is used to check if the content of a generated file is updated.

# Sample usage:

# define filechk_sample

#	echo $KERNELRELEASE

# endef

# version.h : Makefile

#

# filechk_sample = echo $(KERNELRELEASE)

# version.h: FORCE

#	$(call filechk,sample)

#

# The rule defined shall write to stdout the content of the new file.

# The existing file will be compared with the new one.

# - If no file exist it is created