public inbox for linux-kbuild@vger.kernel.org
 help / color / mirror / Atom feed
* [patch 3/8] scripts/package: allow custom options to rpm
@ 2008-12-01 22:21 akpm
  2008-12-03 21:35 ` Sam Ravnborg
  0 siblings, 1 reply; 2+ messages in thread
From: akpm @ 2008-12-01 22:21 UTC (permalink / raw)
  To: sam; +Cc: linux-kbuild, akpm, jk

From: Jeremy Kerr <jk@ozlabs.org>

Add a RPMOPTS make variable to allow arbitrary options to be passed
to rpm during 'make rpm-pkg'. For example:

 make RPMOPTS="--define '_topdir /home/jk/rpm'" rpm-pkg

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 scripts/package/Makefile |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff -puN scripts/package/Makefile~scripts-package-allow-custom-options-to-rpm scripts/package/Makefile
--- a/scripts/package/Makefile~scripts-package-allow-custom-options-to-rpm
+++ a/scripts/package/Makefile
@@ -47,7 +47,7 @@ rpm-pkg rpm: $(objtree)/kernel.spec FORC
 	set -e; \
 	mv -f $(objtree)/.tmp_version $(objtree)/.version
 
-	$(RPM) --target $(UTS_MACHINE) -ta ../$(KERNELPATH).tar.gz
+	$(RPM) $(RPMOPTS) --target $(UTS_MACHINE) -ta ../$(KERNELPATH).tar.gz
 	rm ../$(KERNELPATH).tar.gz
 
 clean-files := $(objtree)/kernel.spec
@@ -64,7 +64,8 @@ binrpm-pkg: $(objtree)/binkernel.spec FO
 	set -e; \
 	mv -f $(objtree)/.tmp_version $(objtree)/.version
 
-	$(RPM) --define "_builddir $(srctree)" --target $(UTS_MACHINE) -bb $<
+	$(RPM) $(RPMOPTS) --define "_builddir $(srctree)" --target \
+		$(UTS_MACHINE) -bb $<
 
 clean-files += $(objtree)/binkernel.spec
 
_

^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [patch 3/8] scripts/package: allow custom options to rpm
  2008-12-01 22:21 [patch 3/8] scripts/package: allow custom options to rpm akpm
@ 2008-12-03 21:35 ` Sam Ravnborg
  0 siblings, 0 replies; 2+ messages in thread
From: Sam Ravnborg @ 2008-12-03 21:35 UTC (permalink / raw)
  To: akpm; +Cc: linux-kbuild, jk

On Mon, Dec 01, 2008 at 02:21:03PM -0800, akpm@linux-foundation.org wrote:
> From: Jeremy Kerr <jk@ozlabs.org>
> 
> Add a RPMOPTS make variable to allow arbitrary options to be passed
> to rpm during 'make rpm-pkg'. For example:
> 
>  make RPMOPTS="--define '_topdir /home/jk/rpm'" rpm-pkg
> 
> Signed-off-by: Jeremy Kerr <jk@ozlabs.org>
> Cc: Sam Ravnborg <sam@ravnborg.org>
> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>

Applied.

	Sam

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2008-12-03 21:34 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-12-01 22:21 [patch 3/8] scripts/package: allow custom options to rpm akpm
2008-12-03 21:35 ` Sam Ravnborg

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox