From patchwork Sat Jan 28 17:38:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 13119885 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 713FFC27C76 for ; Sat, 28 Jan 2023 17:39:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234586AbjA1Ri7 (ORCPT ); Sat, 28 Jan 2023 12:38:59 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34686 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231350AbjA1Riy (ORCPT ); Sat, 28 Jan 2023 12:38:54 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C4FEA29E12; Sat, 28 Jan 2023 09:38:53 -0800 (PST) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 512ED60C38; Sat, 28 Jan 2023 17:38:53 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4CFB9C4339E; Sat, 28 Jan 2023 17:38:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1674927532; bh=GrGb9cq9sIB19Bfg04e4zkiYmu8jJkmhEilowIb/Og4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gL0CscrWnVnssNZCMOLIlMWfvuZN8HbXrPrbjuVCqaBgpLGBu7NujXdKVmRAXEG9g FlSUNxSpA2opyc/ftP2YywZ5QnO0jGJ6+JxG9Nhg5xDheLIVj//gDvq0+wwiBigb3b i+qhpyvcPw/dqLpN1FbfeSWjcE3gtHznTxPt4Bro461Wiy9e/foIv+L60PxddBwr2J SevVw0ReF+9deWGLKJe3yqXOjXVaQMIxQFC62aScua6Yj76dltGUtsBq1UQlQ1WY6q IwXAVhnJUbaPf1TOycxpL3jmVod5Ec1LibRUcp34vnUfDBoPyNNJFodqsp/VpwQ8HO 3Dzzf6VSALsSQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Nathan Chancellor , Nick Desaulniers , Nicolas Schier , Masahiro Yamada Subject: [PATCH 3/4] kbuild: rpm-pkg: build binary packages from source rpm Date: Sun, 29 Jan 2023 02:38:42 +0900 Message-Id: <20230128173843.765212-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230128173843.765212-1-masahiroy@kernel.org> References: <20230128173843.765212-1-masahiroy@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org The build rules of rpm-pkg and srcrpm-pkg are almost the same. Remove the code duplication. Make rpm-pkg build binary packages from the source package built by srcrpm-pkg. Signed-off-by: Masahiro Yamada --- scripts/Makefile.package | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/Makefile.package b/scripts/Makefile.package index cb135c99a273..8fa6f05967aa 100644 --- a/scripts/Makefile.package +++ b/scripts/Makefile.package @@ -68,11 +68,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