mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git
synced 2026-05-02 18:17:50 -04:00
kbuild: rpm-pkg: do not hard-code $MAKE in spec file
Currently, $MAKE will expand to the GNU Make program that created the source RPM. This is problematic if you carry it to a different build host to run 'rpmbuild' there. Consider this command: $ /path/to/my/custom/make srcrpm-pkg The spec file in the SRPM will record '/path/to/my/custom/make', which exists only on that build environment. To create a portable SRPM, the spec file should avoid hard-coding $MAKE. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
This commit is contained in:
@@ -72,7 +72,7 @@ PHONY += rpm-pkg
|
||||
rpm-pkg: srpm = $(shell rpmspec --srpm --query --queryformat='%{name}-%{VERSION}-%{RELEASE}.src.rpm' kernel.spec)
|
||||
rpm-pkg: srcrpm-pkg
|
||||
+rpmbuild $(RPMOPTS) --target $(UTS_MACHINE)-linux -rb $(srpm) \
|
||||
--define='_smp_mflags %{nil}'
|
||||
--define='_smp_mflags %{nil}' --define='make $(MAKE)'
|
||||
|
||||
# srcrpm-pkg
|
||||
# ---------------------------------------------------------------------------
|
||||
@@ -89,7 +89,8 @@ binrpm-pkg:
|
||||
$(MAKE) -f $(srctree)/Makefile
|
||||
$(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/binkernel.spec
|
||||
+rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \
|
||||
$(UTS_MACHINE)-linux -bb $(objtree)/binkernel.spec
|
||||
$(UTS_MACHINE)-linux -bb $(objtree)/binkernel.spec \
|
||||
--define='make $(MAKE)'
|
||||
|
||||
# deb-pkg srcdeb-pkg bindeb-pkg
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user