aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorJeremy Kerr <jk@ozlabs.org>2008-12-01 17:21:03 -0500
committerSam Ravnborg <sam@ravnborg.org>2008-12-03 16:35:06 -0500
commitc39dd50240b97bfe4fcc49b41e1fe56675afcb94 (patch)
treecbd978c91c0a43710632afc7caa3bd3dcf260e6a /scripts
parent5dae9a550a7478c8d6a7da2336d3ceeebf90ab84 (diff)
scripts/package: allow custom options to rpm
Add a RPMOPTS make variable to allow arbitrary options to be passed to rpm during 'make rpm-pkg'. For example: make RPMOPTS="--define '_topdir /home/jk/rpm'" rpm-pkg Signed-off-by: Jeremy Kerr <jk@ozlabs.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/package/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index 5e326078a4a2..c162409fb4e4 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -47,7 +47,7 @@ rpm-pkg rpm: $(objtree)/kernel.spec FORCE
47 set -e; \ 47 set -e; \
48 mv -f $(objtree)/.tmp_version $(objtree)/.version 48 mv -f $(objtree)/.tmp_version $(objtree)/.version
49 49
50 $(RPM) --target $(UTS_MACHINE) -ta ../$(KERNELPATH).tar.gz 50 $(RPM) $(RPMOPTS) --target $(UTS_MACHINE) -ta ../$(KERNELPATH).tar.gz
51 rm ../$(KERNELPATH).tar.gz 51 rm ../$(KERNELPATH).tar.gz
52 52
53clean-files := $(objtree)/kernel.spec 53clean-files := $(objtree)/kernel.spec
@@ -64,7 +64,8 @@ binrpm-pkg: $(objtree)/binkernel.spec FORCE
64 set -e; \ 64 set -e; \
65 mv -f $(objtree)/.tmp_version $(objtree)/.version 65 mv -f $(objtree)/.tmp_version $(objtree)/.version
66 66
67 $(RPM) --define "_builddir $(srctree)" --target $(UTS_MACHINE) -bb $< 67 $(RPM) $(RPMOPTS) --define "_builddir $(srctree)" --target \
68 $(UTS_MACHINE) -bb $<
68 69
69clean-files += $(objtree)/binkernel.spec 70clean-files += $(objtree)/binkernel.spec
70 71