Skip to content

Commit 4b2fb17

Browse files
spandruvadagregkh
authored andcommitted
scripts/package/Makefile: rpmbuild add support of RPMOPTS
commit 65a9f31c5042e5bb50d30ed8ae374044be561054 upstream. After commit 21a5999 ("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: 21a5999 ("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>
1 parent 7d0b494 commit 4b2fb17

1 file changed

Lines changed: 2 additions & 2 deletions

File tree

scripts/package/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ rpm-pkg rpm: FORCE
5252
$(call cmd,src_tar,$(KERNELPATH),kernel.spec)
5353
$(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version
5454
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
5656
rm $(KERNELPATH).tar.gz kernel.spec
5757

5858
# binrpm-pkg
@@ -63,7 +63,7 @@ binrpm-pkg: FORCE
6363
$(CONFIG_SHELL) $(srctree)/scripts/mkversion > $(objtree)/.tmp_version
6464
mv -f $(objtree)/.tmp_version $(objtree)/.version
6565

66-
rpmbuild --define "_builddir $(objtree)" --target \
66+
rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \
6767
$(UTS_MACHINE) -bb $(objtree)/binkernel.spec
6868
rm binkernel.spec
6969

0 commit comments

Comments
 (0)