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

Commit 26803821 authored by Riku Voipio's avatar Riku Voipio Committed by Michal Marek
Browse files

package/Makefile: move source tar creation to a function 



Split source tarball creation from rpm-pkg target
so it can be used from deb-pkg target as well. As
added bonus, we can now pretty print TAR the name of
tarball created in quiet mode

This patch prepares the groundwork for deb-pkg source
package adding bit.

Signed-off-by: default avatarRiku Voipio <riku.voipio@linaro.org>
Signed-off-by: default avatarMichal Marek <mmarek@suse.com>
parent 5bbb9f75

scripts/package/Makefile

+16 −13
Original line number Diff line number Diff line
@@ -24,27 +24,30 @@ 
# Remove hyphens since they have special meaning in RPM filenames

KERNELPATH := kernel-$(subst -,_,$(KERNELRELEASE))

# Include only those top-level files that are needed by make, plus the GPL copy

TAR_CONTENT := $(KBUILD_ALLDIRS) kernel.spec .config .scmversion Makefile \

TAR_CONTENT := $(KBUILD_ALLDIRS) .config .scmversion Makefile \

               Kbuild Kconfig COPYING $(wildcard localversion*)

TAR_CONTENT := $(addprefix $(KERNELPATH)/,$(TAR_CONTENT))

MKSPEC     := $(srctree)/scripts/package/mkspec



quiet_cmd_src_tar = TAR     $(2).tar.gz

      cmd_src_tar = \

if test "$(objtree)" != "$(srctree)"; then \

	echo "Building source tarball is not possible outside the"; \

	echo "kernel source tree. Don't set KBUILD_OUTPUT, or use the"; \

	echo "binrpm-pkg or bindeb-pkg target instead."; \

	false; \

fi ; \

$(srctree)/scripts/setlocalversion --save-scmversion; \

ln -sf $(srctree) $(2); \

tar -cz $(RCS_TAR_IGNORE) -f $(2).tar.gz \

	$(addprefix $(2)/,$(TAR_CONTENT) $(3)); \

rm -f $(2) $(objtree)/.scmversion



# rpm-pkg

# ---------------------------------------------------------------------------

rpm-pkg rpm: FORCE

	@if test "$(objtree)" != "$(srctree)"; then \

		echo "Building source + binary RPM is not possible outside the"; \

		echo "kernel source tree. Don't set KBUILD_OUTPUT, or use the"; \

		echo "binrpm-pkg target instead."; \

		false; \

	fi

	$(MAKE) clean

	ln -sf $(srctree) $(KERNELPATH)

	$(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec

	$(CONFIG_SHELL) $(srctree)/scripts/setlocalversion --save-scmversion

	tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(TAR_CONTENT)

	rm $(KERNELPATH)

	rm -f $(objtree)/.scmversion

	$(call cmd,src_tar,$(KERNELPATH),kernel.spec)

	$(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version

	mv -f $(objtree)/.tmp_version $(objtree)/.version

	rpmbuild --target $(UTS_MACHINE) -ta $(KERNELPATH).tar.gz