[PATCH] scripts/package/Makefile: Restore the RPMOPTS variable

[PATCH] scripts/package/Makefile: Restore the RPMOPTS variable

[Jim Davis]

Restore the RPMOPTS variable to the rpm-pkg and binrpm-pkg targets
that commit 21a59991ce0c ("scripts/package/Makefile: rpmbuild is
needed for rpm targets") removed.

Reported-by: Alaa Hleihel <alaa.hl2@gmail.com>
Signed-off-by: Jim Davis <jim.epost@gmail.com>
---
 scripts/package/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index 1aca224e8597..493e226356ca 100644
--- 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
 
-- 
2.1.4

Re: [PATCH] scripts/package/Makefile: Restore the RPMOPTS variable

[Michal Marek]

Dne 17.10.2015 v 02:09 Jim Davis napsal(a):
> Restore the RPMOPTS variable to the rpm-pkg and binrpm-pkg targets
> that commit 21a59991ce0c ("scripts/package/Makefile: rpmbuild is
> needed for rpm targets") removed.
> 
> Reported-by: Alaa Hleihel <alaa.hl2@gmail.com>
> Signed-off-by: Jim Davis <jim.epost@gmail.com>

If this is a regression fix, please add a Fixes: hash ("commit message")
line to the signoff area.

Out of curiosity, what options do you need to pass to rpmbuild?

Michal

Re: [PATCH] scripts/package/Makefile: Restore the RPMOPTS variable

[Alaa Hleihel]

hi

On 10/26/2015 23:21, Michal Marek wrote:
> Dne 17.10.2015 v 02:09 Jim Davis napsal(a):
>> Restore the RPMOPTS variable to the rpm-pkg and binrpm-pkg targets
>> that commit 21a59991ce0c ("scripts/package/Makefile: rpmbuild is
>> needed for rpm targets") removed.
>>
>> Reported-by: Alaa Hleihel <alaa.hl2@gmail.com>
>> Signed-off-by: Jim Davis <jim.epost@gmail.com>
> If this is a regression fix, please add a Fixes: hash ("commit message")
> line to the signoff area.
>
> Out of curiosity, what options do you need to pass to rpmbuild?
>

A common usage will be to change the default _topdir (RPMOPTS="--define \"_topdir /tmp/build\"").

Regards,
Alaa