From: Riku Voipio <[email protected]> The updated deb-pkg and bindeb-pkg will use the same snippet, so make it reusable.
Signed-off-by: Riku Voipio <[email protected]> --- scripts/package/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/scripts/package/Makefile b/scripts/package/Makefile index 71b4a8af9d4d..9867638896ad 100644 --- a/scripts/package/Makefile +++ b/scripts/package/Makefile @@ -44,14 +44,18 @@ tar -cz $(RCS_TAR_IGNORE) -f $(2).tar.gz \ $(addprefix $(2)/,$(TAR_CONTENT) $(3)); \ rm -f $(2) $(objtree)/.scmversion +quiet_cmd_updateversion = UPDATEVERSION + cmd_updateversion = \ + $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version; \ + mv -f $(objtree)/.tmp_version $(objtree)/.version + # rpm-pkg # --------------------------------------------------------------------------- rpm-pkg rpm: FORCE $(MAKE) clean $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec $(call cmd,src_tar,$(KERNELPATH),kernel.spec) - $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version - mv -f $(objtree)/.tmp_version $(objtree)/.version + $(call cmd,updateversion) rpmbuild $(RPMOPTS) --target $(UTS_MACHINE) -ta $(KERNELPATH).tar.gz rm $(KERNELPATH).tar.gz kernel.spec @@ -60,9 +64,7 @@ rpm-pkg rpm: FORCE binrpm-pkg: FORCE $(MAKE) KBUILD_SRC= $(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/binkernel.spec - $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version - mv -f $(objtree)/.tmp_version $(objtree)/.version - + $(call cmd,updateversion) rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \ $(UTS_MACHINE) -bb $(objtree)/binkernel.spec rm binkernel.spec -- 2.11.0
