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

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

kbuild: change filechk to surround the given command with { } 



filechk_* rules often consist of multiple 'echo' lines. They must be
surrounded with { } or ( ) to work correctly. Otherwise, only the
string from the last 'echo' would be written into the target.

Let's take care of that in the 'filechk' in scripts/Kbuild.include
to clean up filechk_* rules.

Signed-off-by: default avatarMasahiro Yamada <yamada.masahiro@socionext.com>
parent 172caf19

Kbuild

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ timeconst-file := include/generated/timeconst.h 
targets += $(timeconst-file)



define filechk_gentimeconst

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

	echo $(CONFIG_HZ) | bc -q $<

endef



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

Makefile

+3 −3
Original line number Diff line number Diff line
@@ -1127,13 +1127,13 @@ define filechk_utsrelease.h 
	  echo '"$(KERNELRELEASE)" exceeds $(uts_len) characters' >&2;    \

	  exit 1;                                                         \

	fi;                                                               \

	(echo \#define UTS_RELEASE \"$(KERNELRELEASE)\";)

	echo \#define UTS_RELEASE \"$(KERNELRELEASE)\"

endef



define filechk_version.h

	(echo \#define LINUX_VERSION_CODE $(shell                         \

	echo \#define LINUX_VERSION_CODE $(shell                         \

	expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \

	echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))';)

	echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))'

endef



$(version_h): FORCE

arch/s390/tools/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ define filechk_facility-defs.h 
endef



define filechk_dis-defs.h

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

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

endef



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

firmware/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ ASM_WORD = $(if $(CONFIG_64BIT),.quad,.long) 
ASM_ALIGN = $(if $(CONFIG_64BIT),3,2)

PROGBITS  = $(if $(CONFIG_ARM),%,@)progbits



filechk_fwbin = { \

filechk_fwbin = \

	echo "/* Generated by $(src)/Makefile */"		;\

	echo "    .section .rodata"				;\

	echo "    .p2align $(ASM_ALIGN)"			;\
@@ -28,8 +28,7 @@ filechk_fwbin = { \ 
	echo "    .p2align $(ASM_ALIGN)"			;\

	echo "    $(ASM_WORD) _fw_$(FWSTR)_name"		;\

	echo "    $(ASM_WORD) _fw_$(FWSTR)_bin"			;\

	echo "    $(ASM_WORD) _fw_end - _fw_$(FWSTR)_bin"	;\

}

	echo "    $(ASM_WORD) _fw_end - _fw_$(FWSTR)_bin"



$(obj)/%.gen.S: FORCE

	$(call filechk,fwbin)

kernel/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -122,7 +122,11 @@ targets += config_data.gz 
$(obj)/config_data.gz: $(KCONFIG_CONFIG) FORCE

	$(call if_changed,gzip)



      filechk_ikconfiggz = (echo "static const char kernel_config_data[] __used = MAGIC_START"; cat $< | scripts/bin2c; echo "MAGIC_END;")

filechk_ikconfiggz = \

	echo "static const char kernel_config_data[] __used = MAGIC_START"; \

	cat $< | scripts/bin2c; \

	echo "MAGIC_END;"



targets += config_data.h

$(obj)/config_data.h: $(obj)/config_data.gz FORCE

	$(call filechk,ikconfiggz)