Commit 403d3cc4 authored by Michal Marek's avatar Michal Marek
Browse files

rpm-pkg: Do not write to the parent directory 



Now that we only package explicitly listed files to the tarball, there
is no need to abuse the parent directory.

Signed-off-by: default avatarMichal Marek <mmarek@suse.cz>
parent 6615d6c3

scripts/package/Makefile

+5 −7
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ TAR_CONTENT := $(KBUILD_ALLDIRS) kernel.spec .config .scmversion Makefile \ 
               Kbuild Kconfig COPYING $(wildcard localversion*)

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

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

PREV       := set -e; cd -P ..;



# rpm-pkg

# ---------------------------------------------------------------------------
@@ -47,18 +46,17 @@ rpm-pkg rpm: $(objtree)/kernel.spec FORCE 
		false; \

	fi

	$(MAKE) clean

	$(PREV) ln -sf $(srctree) $(KERNELPATH)

	ln -sf $(srctree) $(KERNELPATH)

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

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

	$(PREV) rm $(KERNELPATH)

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

	rm $(KERNELPATH)

	rm -f $(objtree)/.scmversion

	set -e; \

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

	set -e; \

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



	$(RPM) $(RPMOPTS) --target $(UTS_MACHINE) -ta ../$(KERNELPATH).tar.gz

	rm ../$(KERNELPATH).tar.gz

	$(RPM) $(RPMOPTS) --target $(UTS_MACHINE) -ta $(KERNELPATH).tar.gz

	rm $(KERNELPATH).tar.gz



clean-files := $(objtree)/kernel.spec