* [PATCH] scripts/package/Makefile: Restore the RPMOPTS variable
@ 2015-10-17 0:09 Jim Davis
2015-10-26 21:21 ` Michal Marek
0 siblings, 1 reply; 3+ messages in thread
From: Jim Davis @ 2015-10-17 0:09 UTC (permalink / raw)
To: mmarek, linux-kbuild, linux-kernel; +Cc: alaa.hl2
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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] scripts/package/Makefile: Restore the RPMOPTS variable
2015-10-17 0:09 [PATCH] scripts/package/Makefile: Restore the RPMOPTS variable Jim Davis
@ 2015-10-26 21:21 ` Michal Marek
2015-10-27 8:43 ` Alaa Hleihel
0 siblings, 1 reply; 3+ messages in thread
From: Michal Marek @ 2015-10-26 21:21 UTC (permalink / raw)
To: Jim Davis; +Cc: linux-kbuild, linux-kernel, alaa.hl2
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] scripts/package/Makefile: Restore the RPMOPTS variable
2015-10-26 21:21 ` Michal Marek
@ 2015-10-27 8:43 ` Alaa Hleihel
0 siblings, 0 replies; 3+ messages in thread
From: Alaa Hleihel @ 2015-10-27 8:43 UTC (permalink / raw)
To: Michal Marek, Jim Davis; +Cc: linux-kbuild, linux-kernel, alaa.hl2
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-10-27 8:43 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-10-17 0:09 [PATCH] scripts/package/Makefile: Restore the RPMOPTS variable Jim Davis
2015-10-26 21:21 ` Michal Marek
2015-10-27 8:43 ` Alaa Hleihel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).