kbuild: rpm-pkg: build binary packages from source rpm

The build rules of rpm-pkg and srcrpm-pkg are almost the same.
Remove the code duplication.

Change rpm-pkg to build binary packages from the source package generated
by srcrpm-pkg.

This changes the output directory of the srpm generated by 'make rpm-pkg'
because srcrpm-pkg overrides _srcrpmdir.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

diff --git a/scripts/Makefile.package b/scripts/Makefile.package
index f0002ac..55441d7 100644 (file)
--- a/scripts/Makefile.package
+++ b/scripts/Makefile.package
@@ -87,11 +87,9 @@ linux.tar.gz: .tmp_filelist
 # rpm-pkg
 # ---------------------------------------------------------------------------
 PHONY += rpm-pkg
-rpm-pkg:
-       $(MAKE) clean
-       $(CONFIG_SHELL) $(MKSPEC) >$(objtree)/kernel.spec
-       $(call cmd,src_tar,$(KERNELPATH),kernel.spec)
-       +rpmbuild $(RPMOPTS) --target $(UTS_MACHINE)-linux -ta $(KERNELPATH).tar.gz \
+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}'
 
 # srcrpm-pkg