diff options
author | Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> | 2016-05-14 23:09:52 -0400 |
---|---|---|
committer | Michal Marek <mmarek@suse.com> | 2016-05-16 08:01:48 -0400 |
commit | 65a9f31c5042e5bb50d30ed8ae374044be561054 (patch) | |
tree | 01a4122bf547b6c3b1e4e1759989ce4813c8a0c8 | |
parent | 962475ac2f9662fe69a9f86220ab31bbbf3911d2 (diff) |
scripts/package/Makefile: rpmbuild add support of RPMOPTS
After commit 21a59991ce0c ("scripts/package/Makefile: rpmbuild is needed
for rpm targets"), it is no longer possible to specify RPMOPTS.
For example, we can no longer able to control _topdir using the following
make command.
make RPMOPTS="--define '_topdir /home/xyz/workspace/'" binrpm-pkg
Fixes: 21a59991ce0c ("scripts/package/Makefile: rpmbuild is needed for rpm targets")
Cc: <stable@vger.kernel.org> # 4.3+
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: Michal Marek <mmarek@suse.com>
-rw-r--r-- | scripts/package/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/package/Makefile b/scripts/package/Makefile index c2c7389bfbab..71b4a8af9d4d 100644 --- a/scripts/package/Makefile +++ b/scripts/package/Makefile | |||
@@ -52,7 +52,7 @@ rpm-pkg rpm: FORCE | |||
52 | $(call cmd,src_tar,$(KERNELPATH),kernel.spec) | 52 | $(call cmd,src_tar,$(KERNELPATH),kernel.spec) |
53 | $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version | 53 | $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version |
54 | mv -f $(objtree)/.tmp_version $(objtree)/.version | 54 | mv -f $(objtree)/.tmp_version $(objtree)/.version |
55 | rpmbuild --target $(UTS_MACHINE) -ta $(KERNELPATH).tar.gz | 55 | rpmbuild $(RPMOPTS) --target $(UTS_MACHINE) -ta $(KERNELPATH).tar.gz |
56 | rm $(KERNELPATH).tar.gz kernel.spec | 56 | rm $(KERNELPATH).tar.gz kernel.spec |
57 | 57 | ||
58 | # binrpm-pkg | 58 | # binrpm-pkg |
@@ -63,7 +63,7 @@ binrpm-pkg: FORCE | |||
63 | $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version | 63 | $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version |
64 | mv -f $(objtree)/.tmp_version $(objtree)/.version | 64 | mv -f $(objtree)/.tmp_version $(objtree)/.version |
65 | 65 | ||
66 | rpmbuild --define "_builddir $(objtree)" --target \ | 66 | rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \ |
67 | $(UTS_MACHINE) -bb $(objtree)/binkernel.spec | 67 | $(UTS_MACHINE) -bb $(objtree)/binkernel.spec |
68 | rm binkernel.spec | 68 | rm binkernel.spec |
69 | 69 | ||