| From 65a9f31c5042e5bb50d30ed8ae374044be561054 Mon Sep 17 00:00:00 2001 |
| From: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> |
| Date: Sat, 14 May 2016 20:09:52 -0700 |
| Subject: scripts/package/Makefile: rpmbuild add support of RPMOPTS |
| |
| From: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> |
| |
| commit 65a9f31c5042e5bb50d30ed8ae374044be561054 upstream. |
| |
| 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") |
| Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> |
| Signed-off-by: Michal Marek <mmarek@suse.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| scripts/package/Makefile | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/scripts/package/Makefile |
| +++ b/scripts/package/Makefile |
| @@ -52,7 +52,7 @@ rpm-pkg rpm: FORCE |
| $(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 |
| + rpmbuild $(RPMOPTS) --target $(UTS_MACHINE) -ta $(KERNELPATH).tar.gz |
| rm $(KERNELPATH).tar.gz kernel.spec |
| |
| # binrpm-pkg |
| @@ -63,7 +63,7 @@ binrpm-pkg: FORCE |
| $(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version |
| mv -f $(objtree)/.tmp_version $(objtree)/.version |
| |
| - rpmbuild --define "_builddir $(objtree)" --target \ |
| + rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \ |
| $(UTS_MACHINE) -bb $(objtree)/binkernel.spec |
| rm binkernel.spec |
| |
