From patchwork Tue Jan 31 16:26:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 50958 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp876wrn; Tue, 31 Jan 2023 08:30:35 -0800 (PST) X-Google-Smtp-Source: AK7set8t7598d/l8oviWYPeCGqEKh3F5wZCEm4zqULAGa1c50R0fQtPxgqq1pi4Jo2UzHYsstemM X-Received: by 2002:a17:90a:72c8:b0:22c:8171:e366 with SMTP id l8-20020a17090a72c800b0022c8171e366mr11740694pjk.4.1675182635447; Tue, 31 Jan 2023 08:30:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675182635; cv=none; d=google.com; s=arc-20160816; b=TF9YKRCp9+KSC//nIYFHzr1rUE52ODGQSLvsp+RyrpMydjEdEtCzlH7CNkA5ZygExW QQEUQOdNMiis320Prf1K6HWcXlE7NzAO8JvNb2XI0yKl8wH9uh+ft4tMx7v0QF1e5WAb HyDtgbeiBzcJxuRWAmtbBqqsk274LHi9EjdjxghNe2trYQEkWMZJ5HH6LuiToqRHLOUx +dRXH9aR8Blb6NZ8gZ2G9f55C9ZfR0T0esDnZ0IbLs1xc3qMcgE6zTmYHT04oMdUlgW2 Qc6CHtRmmn/AKedN3yGLS19qiqdThY9X8vfemBFWklsdNxt/RJvDrp8c/q9N7gydaO2I pl0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=en7QeKvZ7YxwXdOROABbIVmIVdPHnnHxxr9169zFblM=; b=zB71CQJOs6vF81FESDicGE2d5XV7JfYpsrbfZ6wWlZPoVlMAB/STPbr+8vO1ovOkaV x20OhKnwJq4XgtnRl2pqoDsSR9raEdbfB/pR5LEg03WeB5yS2IYRjpS72qWz18JgC5DZ yR6XmNf+0q0OPKhTrIqN3YJhu5YNM+bMg8PapyfgpuWLhOVuplVv89wS7ogk6eYzlZw8 FEFggIalYekULFj0zd9ui8Oq+5oq17626hYiT3Ehe755OeV8YxfXmWlSNDmxfR/zUdCy xhc9U727r8MiPv0Tpt8y8TZDKVYkfWWmL4GDVfA+4/CPDN6+movLDwzr90rWGFwFn80o EsUA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YAywpdok; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g15-20020a17090a640f00b00218b7ae4defsi20263020pjj.134.2023.01.31.08.30.23; Tue, 31 Jan 2023 08:30:35 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YAywpdok; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230299AbjAaQ13 (ORCPT + 99 others); Tue, 31 Jan 2023 11:27:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36266 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230011AbjAaQ11 (ORCPT ); Tue, 31 Jan 2023 11:27:27 -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 07EE353E4F; Tue, 31 Jan 2023 08:27:27 -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 98ABF6159B; Tue, 31 Jan 2023 16:27:26 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C28ACC4339C; Tue, 31 Jan 2023 16:27:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675182446; bh=DWkGelkh52HkYzxb7qURR75OplaKnXS904IdAqPc8P0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YAywpdokkmJ/HmrmGEMjwBuUrpiDUtcYMSGD/WoOuQgZZO2+voCYE65Ons8O95C4Z 8P7qz3s3lEM/bDIkb6JhoEWgu8IZ3Std3S0oyTRCdKi2+OvQEh9F/Llq9TcGG3B2bi XInawV87zbE+azOk//bcmUM6hZYouP8LGFkofbEXZmCExAndEdVlAFxLxyCSfoK+nI BZbqrAJjQoFsXRYOwuR23as1YlErQU9lhu/dev3y/1PhbZnE3n0+uT2txNSiuEXviv oCa+qJl6vfXd9KHQAYxcSrf1G37NRmefQD7MUImTguiJdJp9qZiTPfpDWAFTlCx5GI 2byzUVC6IhiJA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier Subject: [PATCH v3 3/5] kbuild: rpm-pkg: build binary packages from source rpm Date: Wed, 1 Feb 2023 01:26:13 +0900 Message-Id: <20230131162615.1575215-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230131162615.1575215-1-masahiroy@kernel.org> References: <20230131162615.1575215-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1756556307042121041?= X-GMAIL-MSGID: =?utf-8?q?1756556307042121041?= 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 --- (no changes since v1) scripts/Makefile.package | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/Makefile.package b/scripts/Makefile.package index f4f44f01deb3..31c52bd0d180 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