Message ID | 20230407101629.1298051-1-masahiroy@kernel.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [1/3] kbuild: merge cmd_archive_linux and cmd_archive_perf | expand |
On Fri, Apr 07, 2023 at 07:16:27PM +0900, Masahiro Yamada wrote: > The two commands, cmd_archive_linux and cmd_archive_perf, are similar. > Merge them to make it easier to add more changes to the git-archive > command. > > Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> Reviewed-by: Nathan Chancellor <nathan@kernel.org> > --- > > scripts/Makefile.package | 19 +++++++++---------- > 1 file changed, 9 insertions(+), 10 deletions(-) > > diff --git a/scripts/Makefile.package b/scripts/Makefile.package > index 61f72eb8d9be..a205617730c6 100644 > --- a/scripts/Makefile.package > +++ b/scripts/Makefile.package > @@ -57,16 +57,17 @@ check-git: > false; \ > fi > > +quiet_cmd_archive = ARCHIVE $@ > + cmd_archive = git -C $(srctree) archive \ > + --output=$$(realpath $@) --prefix=$(basename $@)/ $(archive-args) > + > # Linux source tarball > # --------------------------------------------------------------------------- > > -quiet_cmd_archive_linux = ARCHIVE $@ > - cmd_archive_linux = \ > - git -C $(srctree) archive --output=$$(realpath $@) --prefix=$(basename $@)/ $$(cat $<) > - > targets += linux.tar > +linux.tar: archive-args = $$(cat $<) > linux.tar: .tmp_HEAD FORCE > - $(call if_changed,archive_linux) > + $(call if_changed,archive) > > # rpm-pkg > # --------------------------------------------------------------------------- > @@ -180,16 +181,14 @@ quiet_cmd_perf_version_file = GEN $@ > .tmp_perf/PERF-VERSION-FILE: .tmp_HEAD $(srctree)/tools/perf/util/PERF-VERSION-GEN | .tmp_perf > $(call cmd,perf_version_file) > > -quiet_cmd_archive_perf = ARCHIVE $@ > - cmd_archive_perf = \ > - git -C $(srctree) archive --output=$$(realpath $@) --prefix=$(basename $@)/ \ > - --add-file=$$(realpath $(word 2, $^)) \ > +perf-archive-args = --add-file=$$(realpath $(word 2, $^)) \ > --add-file=$$(realpath $(word 3, $^)) \ > $$(cat $(word 2, $^))^{tree} $$(cat $<) > > targets += perf-$(KERNELVERSION).tar > +perf-$(KERNELVERSION).tar: archive-args = $(perf-archive-args) > perf-$(KERNELVERSION).tar: tools/perf/MANIFEST .tmp_perf/HEAD .tmp_perf/PERF-VERSION-FILE FORCE > - $(call if_changed,archive_perf) > + $(call if_changed,archive) > > PHONY += perf-tar-src-pkg > perf-tar-src-pkg: perf-$(KERNELVERSION).tar > -- > 2.37.2 >
diff --git a/scripts/Makefile.package b/scripts/Makefile.package index 61f72eb8d9be..a205617730c6 100644 --- a/scripts/Makefile.package +++ b/scripts/Makefile.package @@ -57,16 +57,17 @@ check-git: false; \ fi +quiet_cmd_archive = ARCHIVE $@ + cmd_archive = git -C $(srctree) archive \ + --output=$$(realpath $@) --prefix=$(basename $@)/ $(archive-args) + # Linux source tarball # --------------------------------------------------------------------------- -quiet_cmd_archive_linux = ARCHIVE $@ - cmd_archive_linux = \ - git -C $(srctree) archive --output=$$(realpath $@) --prefix=$(basename $@)/ $$(cat $<) - targets += linux.tar +linux.tar: archive-args = $$(cat $<) linux.tar: .tmp_HEAD FORCE - $(call if_changed,archive_linux) + $(call if_changed,archive) # rpm-pkg # --------------------------------------------------------------------------- @@ -180,16 +181,14 @@ quiet_cmd_perf_version_file = GEN $@ .tmp_perf/PERF-VERSION-FILE: .tmp_HEAD $(srctree)/tools/perf/util/PERF-VERSION-GEN | .tmp_perf $(call cmd,perf_version_file) -quiet_cmd_archive_perf = ARCHIVE $@ - cmd_archive_perf = \ - git -C $(srctree) archive --output=$$(realpath $@) --prefix=$(basename $@)/ \ - --add-file=$$(realpath $(word 2, $^)) \ +perf-archive-args = --add-file=$$(realpath $(word 2, $^)) \ --add-file=$$(realpath $(word 3, $^)) \ $$(cat $(word 2, $^))^{tree} $$(cat $<) targets += perf-$(KERNELVERSION).tar +perf-$(KERNELVERSION).tar: archive-args = $(perf-archive-args) perf-$(KERNELVERSION).tar: tools/perf/MANIFEST .tmp_perf/HEAD .tmp_perf/PERF-VERSION-FILE FORCE - $(call if_changed,archive_perf) + $(call if_changed,archive) PHONY += perf-tar-src-pkg perf-tar-src-pkg: perf-$(KERNELVERSION).tar
The two commands, cmd_archive_linux and cmd_archive_perf, are similar. Merge them to make it easier to add more changes to the git-archive command. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org> --- scripts/Makefile.package | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)