Messages in this thread Patch in this message | | | From | Masahiro Yamada <> | Subject | [PATCH v4 3/6] kbuild: rpm-pkg: build binary packages from source rpm | Date | Thu, 2 Feb 2023 12:37:13 +0900 |
| |
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> ---
(no changes since v3)
Changes in v3: - Explain that the source package location will be changed.
scripts/Makefile.package | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/scripts/Makefile.package b/scripts/Makefile.package index 14567043a8af..ebf3db81b994 100644 --- a/scripts/Makefile.package +++ b/scripts/Makefile.package @@ -79,11 +79,9 @@ quiet_cmd_tar = TAR $@ # 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 -- 2.34.1
| |