Skip to contentSkip to conversation

scripts/package: allow custom options to rpm

PATCH Applied [email protected] 2 participants 2 messages Dec 1, 2008 – Dec 3, 2008 Kbuild

lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 3/8 scripts/package: allow custom options to rpm

From: Jeremy Kerr <[email protected]>

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 <[email protected]>
Cc Sam Ravnborg <[email protected]>
Signed-off-by Andrew Morton <[email protected]>

---

 scripts/package/Makefile |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
scripts/package/Makefile renamed from scripts/package/Makefile~scripts-package-allow-custom-options-to-rpm +3 -2
diff -puN scripts/package/Makefile~scripts-package-allow-custom-options-to-rpm 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

_