summaryrefslogtreecommitdiffstats
path: root/kernel/scripts
diff options
context:
space:
mode:
authorSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>2016-05-14 20:09:52 -0700
committerYunhong Jiang <yunhong.jiang@linux.intel.com>2016-07-26 23:52:54 -0700
commit6ec128a4e6a1819881f8db6659d4024aac35ce38 (patch)
tree4b30d5727c10f31372fc5f024d0db98b39f5939e /kernel/scripts
parent4f603f6fd3b35451c1bb3f5a2b0b6b05da8d5dc8 (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+ Notice: Have to remove the original signed-off-by line because gerrit will notify the original author, which is not good. Keep the name and the email address still. Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Michal Marek <mmarek@suse.com> upstream-status: backport Change-Id: If7ce5d9d006ee9d49b2d7d200ebdc278395eb3f7 backport-by: Yunhong Jiang <yunhong.jiang@intel.com> Signed-off-by: Yunhong Jiang <yunhong.jiang@linux.intel.com>
Diffstat (limited to 'kernel/scripts')
-rw-r--r--kernel/scripts/package/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/scripts/package/Makefile b/kernel/scripts/package/Makefile
index 1aca224e8..493e22635 100644
--- a/kernel/scripts/package/Makefile
+++ b/kernel/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