Message ID | 20230215012034.403356-3-masahiroy@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp3299536wrn; Tue, 14 Feb 2023 17:23:15 -0800 (PST) X-Google-Smtp-Source: AK7set/MNZqbhFUHOUP+4063irPhUhnaucU3wJqj0w32pcq99YNfwcRiGGPxa3ILi6+owHOCwlG6 X-Received: by 2002:aa7:8f10:0:b0:593:d5de:f02c with SMTP id x16-20020aa78f10000000b00593d5def02cmr137113pfr.27.1676424195106; Tue, 14 Feb 2023 17:23:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676424195; cv=none; d=google.com; s=arc-20160816; b=X/g/sM97pYeOzbvrRxzl35AUGHOinEp0OmZVEovNKVe2OXxpn+fmM8OivkZETWgSyD DMHpHCCs5Lr4X5cgzuuArgfIzUesH3FxcnjzlXg+1Kl1cMCMLfmo1kenyxcvzR1B45ev VHYMkW2ExE4GCW7lu2OzGnu4nbKsrDlhi6DeiZdVLEvsvnntbhMjAKYwdht1O5xUCeYM 4sAqNQsFMwrxCvVfluB36S+8gvl76sKPvm2nX6fgfD74IMvgEs5yzqs6HFXClfmrSfsM qKBR4EQxvYNj2BNb5MyELpVX/qy7u03/VXDGbZ5a+hue36WiJwd7YbZ3Wr2TL80amhpZ ModA== 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=TqJtJiLYgS08qtTa+XqsF8weCyjWlg41sK5BXw1hysg=; b=W983EXA1N3fkhm0FiPIRpe62KsYOkoGwQCiVUwfPnEIxxIAssHdUx4BkOy4LrY1Ldg k/2Q0dQa7qJ4qy043CQjnERAWCfe6kD+IwComNKj3OsA90xl7g11Vm7IDou8wGJa623z bmQ19wt4HeMIvsuGlyyR+b25nlKj8L6xdw+4peU7UzwJn63nNPp9mpK4n7F5DEiiaQ8j 1+qSSsoAbjh0EGz28ktP14FTPnj6UMPkEAGbjHuostuM1Glv+DfpJ91OP7ySXC/ALI7k YeEPxT3oiWHZ6UDVrmbpXxEco/KWoLZ8jzBxdE3I7B4bOnN7i+trP2t+iSfOePanQ+68 PHTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=QdK1MqD0; 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 a6-20020aa78e86000000b0058e1b16c4dcsi5587129pfr.142.2023.02.14.17.23.02; Tue, 14 Feb 2023 17:23:15 -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=QdK1MqD0; 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 S233513AbjBOBWU (ORCPT <rfc822;tebrre53rla2o@gmail.com> + 99 others); Tue, 14 Feb 2023 20:22:20 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232736AbjBOBWO (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Tue, 14 Feb 2023 20:22:14 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 30B6D31E04; Tue, 14 Feb 2023 17:21:40 -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 ams.source.kernel.org (Postfix) with ESMTPS id D9352B81F8D; Wed, 15 Feb 2023 01:21:38 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2451FC4339C; Wed, 15 Feb 2023 01:21:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676424097; bh=79SOz62YcHFzQBbIrRtp7ktn5c/Q1u91mdZ/FPKD8Es=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QdK1MqD0cy4vSU00oKAcdUwnOigcJRqoysMfSGsMEb80YwZDevrNx08EQojR1pcgN MFd5H4jbETnqVx1Ao9ZIRbfxkMEJKF0Qpp9B8FcfYsZ3TAuE4BSXdKJL8NP2R2Th6o VrA863CE+fMDSsV0Xv3d3dYuLYyZMRQHh7zv6xmn7lOp6dPYa1FvbYSN5unwnDeJNC 6j4g6MA6MVeYVq3RuDg7PdrAhM7H8kotidhRKrw/5hd0rsu/cJjLCvdoak/gemCEbH c6cHgA/BqWO7CQBmmHlcCFfgnNXmx3splzUkCPDTkZc9frOPdJOHOVzYmiSo+cr6qP UxIkupwURKV/g== From: Masahiro Yamada <masahiroy@kernel.org> To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Ben Hutchings <ben@decadent.org.uk>, Masahiro Yamada <masahiroy@kernel.org>, Nathan Chancellor <nathan@kernel.org>, Nick Desaulniers <ndesaulniers@google.com>, Nicolas Schier <nicolas@fjasle.eu> Subject: [PATCH v6 03/12] kbuild: rpm-pkg: build binary packages from source rpm Date: Wed, 15 Feb 2023 10:20:25 +0900 Message-Id: <20230215012034.403356-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230215012034.403356-1-masahiroy@kernel.org> References: <20230215012034.403356-1-masahiroy@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1757858177230484124?= X-GMAIL-MSGID: =?utf-8?q?1757858177230484124?= |
Series |
[v6,01/12] kbuild: add a tool to list files ignored by git
|
|
Commit Message
Masahiro Yamada
Feb. 15, 2023, 1:20 a.m. UTC
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 f0002ace4156..55441d776d70 100644 --- 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