Commit 19286825 authored by Masahiro Yamada's avatar Masahiro Yamada
Browse files

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: default avatarMasahiro Yamada <masahiroy@kernel.org>
parent 61eca933

scripts/Makefile.package

+3 −2
Original line number Diff line number Diff line
@@ -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

# ---------------------------------------------------------------------------

scripts/package/mkspec

+7 −5
Original line number Diff line number Diff line
@@ -38,6 +38,8 @@ EXCLUDES="$RCS_TAR_IGNORE --exclude=*vmlinux* --exclude=*.mod \ 
#  $S: this line is enabled only when building source package

#  $M: this line is enabled only when CONFIG_MODULES is enabled

sed -e '/^DEL/d' -e 's/^\t*//' <<EOF

%{!?make: %define make make}



	Name: kernel

	Summary: The Linux Kernel

	Version: $__KERNELRELEASE
@@ -89,19 +91,19 @@ $S cp %{SOURCE1} .config 
$S	patch -p1 < %{SOURCE2}

$S

$S	%build

$S	$MAKE %{?_smp_mflags} KERNELRELEASE=$KERNELRELEASE KBUILD_BUILD_VERSION=%{release}

$S	%{make} %{?_smp_mflags} KERNELRELEASE=$KERNELRELEASE KBUILD_BUILD_VERSION=%{release}

$S

	%install

	mkdir -p %{buildroot}/boot

	%ifarch ia64

	mkdir -p %{buildroot}/boot/efi

	cp \$($MAKE -s image_name) %{buildroot}/boot/efi/vmlinuz-$KERNELRELEASE

	cp \$(%{make} -s image_name) %{buildroot}/boot/efi/vmlinuz-$KERNELRELEASE

	ln -s efi/vmlinuz-$KERNELRELEASE %{buildroot}/boot/

	%else

	cp \$($MAKE -s image_name) %{buildroot}/boot/vmlinuz-$KERNELRELEASE

	cp \$(%{make} -s image_name) %{buildroot}/boot/vmlinuz-$KERNELRELEASE

	%endif

$M	$MAKE %{?_smp_mflags} INSTALL_MOD_PATH=%{buildroot} modules_install

	$MAKE %{?_smp_mflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install

$M	%{make} %{?_smp_mflags} INSTALL_MOD_PATH=%{buildroot} modules_install

	%{make} %{?_smp_mflags} INSTALL_HDR_PATH=%{buildroot}/usr headers_install

	cp System.map %{buildroot}/boot/System.map-$KERNELRELEASE

	cp .config %{buildroot}/boot/config-$KERNELRELEASE

$S$M	rm -f %{buildroot}/lib/modules/$KERNELRELEASE/build