Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b2fb176 authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by Greg Kroah-Hartman
Browse files

scripts/package/Makefile: rpmbuild add support of RPMOPTS 



commit 65a9f31c5042e5bb50d30ed8ae374044be561054 upstream.

After commit 21a59991 ("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: 21a59991 ("scripts/package/Makefile: rpmbuild is needed for rpm targets")
Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: default avatarMichal Marek <mmarek@suse.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7d0b4945

scripts/package/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -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