diff options
author | Michal Marek <mmarek@suse.cz> | 2013-04-12 08:22:46 -0400 |
---|---|---|
committer | Michal Marek <mmarek@suse.cz> | 2013-04-18 08:56:53 -0400 |
commit | 403d3cc47307c78597d75e420f091cf4a2e7a56a (patch) | |
tree | b9d6e8724bad04d55d3e3b74f15d7dcf08485e72 /scripts/package | |
parent | 6615d6c322a364be45324f553db57545a3b2e95f (diff) |
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: Michal Marek <mmarek@suse.cz>
Diffstat (limited to 'scripts/package')
-rw-r--r-- | scripts/package/Makefile | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/scripts/package/Makefile b/scripts/package/Makefile index b70b33e67f34..ab203c29991a 100644 --- a/scripts/package/Makefile +++ b/scripts/package/Makefile | |||
@@ -32,7 +32,6 @@ TAR_CONTENT := $(KBUILD_ALLDIRS) kernel.spec .config .scmversion Makefile \ | |||
32 | Kbuild Kconfig COPYING $(wildcard localversion*) | 32 | Kbuild Kconfig COPYING $(wildcard localversion*) |
33 | TAR_CONTENT := $(addprefix $(KERNELPATH)/,$(TAR_CONTENT)) | 33 | TAR_CONTENT := $(addprefix $(KERNELPATH)/,$(TAR_CONTENT)) |
34 | MKSPEC := $(srctree)/scripts/package/mkspec | 34 | MKSPEC := $(srctree)/scripts/package/mkspec |
35 | PREV := set -e; cd -P ..; | ||
36 | 35 | ||
37 | # rpm-pkg | 36 | # rpm-pkg |
38 | # --------------------------------------------------------------------------- | 37 | # --------------------------------------------------------------------------- |
@@ -47,18 +46,17 @@ rpm-pkg rpm: $(objtree)/kernel.spec FORCE | |||
47 | false; \ | 46 | false; \ |
48 | fi | 47 | fi |
49 | $(MAKE) clean | 48 | $(MAKE) clean |
50 | $(PREV) ln -sf $(srctree) $(KERNELPATH) | 49 | ln -sf $(srctree) $(KERNELPATH) |
51 | $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion --save-scmversion | 50 | $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion --save-scmversion |
52 | $(PREV) tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(TAR_CONTENT) | 51 | tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(TAR_CONTENT) |
53 | $(PREV) rm $(KERNELPATH) | 52 | rm $(KERNELPATH) |
54 | rm -f $(objtree)/.scmversion | 53 | rm -f $(objtree)/.scmversion |
55 | set -e; \ | 54 | set -e; \ |
56 | $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version | 55 | $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version |
57 | set -e; \ | 56 | set -e; \ |
58 | mv -f $(objtree)/.tmp_version $(objtree)/.version | 57 | mv -f $(objtree)/.tmp_version $(objtree)/.version |
59 | 58 | $(RPM) $(RPMOPTS) --target $(UTS_MACHINE) -ta $(KERNELPATH).tar.gz | |
60 | $(RPM) $(RPMOPTS) --target $(UTS_MACHINE) -ta ../$(KERNELPATH).tar.gz | 59 | rm $(KERNELPATH).tar.gz |
61 | rm ../$(KERNELPATH).tar.gz | ||
62 | 60 | ||
63 | clean-files := $(objtree)/kernel.spec | 61 | clean-files := $(objtree)/kernel.spec |
64 | 62 | ||