Merge tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull more Kbuild updates from Masahiro Yamada: - fix build rules in binderfs sample - fix build errors when Kbuild recurses to the top Makefile - covert '---help---' in Kconfig to 'help' * tag 'kbuild-v5.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild: treewide: replace '---help---' in Kconfig files with 'help' kbuild: fix broken builds because of GZIP,BZIP2,LZOP variables samples: binderfs: really compile this sample and fix build issues

Linus Torvalds committed 6 years ago

Commit 6adc19f2 parents 3df83e1 a7f7f62439 files · +2473 −2489Browse files

Showing the changes to scripts (3 of 439 files). Show all

Unified · Split

3 files

scripts/Makefile.lib +3 −3
scripts/Makefile.package +3 −3
scripts/package/buildtar +2 −2

scripts/Makefile.lib+3−3

@@ -254,7 +254,7 @@ cmd_objcopy = $(OBJCOPY) $(OBJCOPYFLAGS) $(OBJCOPYFLAGS_$(@F)) $< $@ · 253 unmodified lines
254	# ---------------------------------------------------------------------------	254	# ---------------------------------------------------------------------------
255		255
256	quiet_cmd_gzip = GZIP $@	256	quiet_cmd_gzip = GZIP $@
257	cmd_gzip = cat $(real-prereqs) \| $(_GZIP) -n -f -9 > $@	257	cmd_gzip = cat $(real-prereqs) \| $(KGZIP) -n -f -9 > $@
258		258
259	# DTC	259	# DTC
260	# ---------------------------------------------------------------------------	260	# ---------------------------------------------------------------------------
@@ -347,7 +347,7 @@ printf "%08x\n" $$dec_size \| \ · 86 unmodified lines
347	)	347	)
348		348
349	quiet_cmd_bzip2 = BZIP2 $@	349	quiet_cmd_bzip2 = BZIP2 $@
350	cmd_bzip2 = { cat $(real-prereqs) \| $(_BZIP2) -9; $(size_append); } > $@	350	cmd_bzip2 = { cat $(real-prereqs) \| $(KBZIP2) -9; $(size_append); } > $@
351		351
352	# Lzma	352	# Lzma
353	# ---------------------------------------------------------------------------	353	# ---------------------------------------------------------------------------
@@ -356,7 +356,7 @@ quiet_cmd_lzma = LZMA $@ · 2 unmodified lines
356	cmd_lzma = { cat $(real-prereqs) \| $(LZMA) -9; $(size_append); } > $@	356	cmd_lzma = { cat $(real-prereqs) \| $(LZMA) -9; $(size_append); } > $@
357		357
358	quiet_cmd_lzo = LZO $@	358	quiet_cmd_lzo = LZO $@
359	cmd_lzo = { cat $(real-prereqs) \| $(_LZOP) -9; $(size_append); } > $@	359	cmd_lzo = { cat $(real-prereqs) \| $(KLZOP) -9; $(size_append); } > $@
360		360
361	quiet_cmd_lz4 = LZ4 $@	361	quiet_cmd_lz4 = LZ4 $@
362	cmd_lz4 = { cat $(real-prereqs) \| $(LZ4) -l -c1 stdin stdout; \	362	cmd_lz4 = { cat $(real-prereqs) \| $(LZ4) -l -c1 stdin stdout; \

scripts/Makefile.package+3−3

@@ -45,7 +45,7 @@ if test "$(objtree)" != "$(srctree)"; then \ · 44 unmodified lines
45	false; \	45	false; \
46	fi ; \	46	fi ; \
47	$(srctree)/scripts/setlocalversion --save-scmversion; \	47	$(srctree)/scripts/setlocalversion --save-scmversion; \
48	tar -I $(_GZIP) -c $(RCS_TAR_IGNORE) -f $(2).tar.gz \	48	tar -I $(KGZIP) -c $(RCS_TAR_IGNORE) -f $(2).tar.gz \
49	--transform 's:^:$(2)/:S' $(TAR_CONTENT) $(3); \	49	--transform 's:^:$(2)/:S' $(TAR_CONTENT) $(3); \
50	rm -f $(objtree)/.scmversion	50	rm -f $(objtree)/.scmversion
51		51
@@ -127,8 +127,8 @@ util/PERF-VERSION-GEN $(CURDIR)/$(perf-tar)/); \ · 75 unmodified lines
127	tar rf $(perf-tar).tar $(perf-tar)/HEAD $(perf-tar)/PERF-VERSION-FILE; \	127	tar rf $(perf-tar).tar $(perf-tar)/HEAD $(perf-tar)/PERF-VERSION-FILE; \
128	rm -r $(perf-tar); \	128	rm -r $(perf-tar); \
129	$(if $(findstring tar-src,$@),, \	129	$(if $(findstring tar-src,$@),, \
130	$(if $(findstring bz2,$@),$(_BZIP2), \	130	$(if $(findstring bz2,$@),$(KBZIP2), \
131	$(if $(findstring gz,$@),$(_GZIP), \	131	$(if $(findstring gz,$@),$(KGZIP), \
132	$(if $(findstring xz,$@),$(XZ), \	132	$(if $(findstring xz,$@),$(XZ), \
133	$(error unknown target $@)))) \	133	$(error unknown target $@)))) \
134	-f -9 $(perf-tar).tar)	134	-f -9 $(perf-tar).tar)

scripts/package/buildtar+2−2

@@ -28,11 +28,11 @@ case "${1}" in · 27 unmodified lines
28	opts=	28	opts=
29	;;	29	;;
30	targz-pkg)	30	targz-pkg)
31	opts="-I ${_GZIP}"	31	opts="-I ${KGZIP}"
32	tarball=${tarball}.gz	32	tarball=${tarball}.gz
33	;;	33	;;
34	tarbz2-pkg)	34	tarbz2-pkg)
35	opts="-I ${_BZIP2}"	35	opts="-I ${KBZIP2}"
36	tarball=${tarball}.bz2	36	tarball=${tarball}.bz2
37	;;	37	;;
38	tarxz-pkg)	38	tarxz-pkg)