* [PATCH] scripts/package/Makefile: rpmbuild add support of RPMOPTS
@ 2016-05-15 3:09 Srinivas Pandruvada
2016-05-16 12:02 ` Michal Marek
0 siblings, 1 reply; 2+ messages in thread
From: Srinivas Pandruvada @ 2016-05-15 3:09 UTC (permalink / raw)
To: mmarek, jim.epost; +Cc: linux-kbuild, linux-kernel, Srinivas Pandruvada, stable
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+
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
scripts/package/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index c2c7389..71b4a8a 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.5.5
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] scripts/package/Makefile: rpmbuild add support of RPMOPTS
2016-05-15 3:09 [PATCH] scripts/package/Makefile: rpmbuild add support of RPMOPTS Srinivas Pandruvada
@ 2016-05-16 12:02 ` Michal Marek
0 siblings, 0 replies; 2+ messages in thread
From: Michal Marek @ 2016-05-16 12:02 UTC (permalink / raw)
To: Srinivas Pandruvada; +Cc: jim.epost, linux-kbuild, linux-kernel, stable
On Sat, May 14, 2016 at 08:09:52PM -0700, Srinivas Pandruvada wrote:
> 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+
> Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
> ---
> scripts/package/Makefile | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
Applied to kbuild.git#misc.
Michal
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-05-16 12:02 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-15 3:09 [PATCH] scripts/package/Makefile: rpmbuild add support of RPMOPTS Srinivas Pandruvada
2016-05-16 12:02 ` Michal Marek
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox