From patchwork Thu Feb 2 03:37: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: 51659 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp16560wrn; Wed, 1 Feb 2023 19:41:04 -0800 (PST) X-Google-Smtp-Source: AK7set/HQLwJhCxO2VBKFMWC74IVu7zyK3jCcCMs2r18nleq0fEdzMjPRmKcK5CGj7q6L30abRqf X-Received: by 2002:a17:906:8a43:b0:861:4671:a834 with SMTP id gx3-20020a1709068a4300b008614671a834mr4038463ejc.71.1675309264404; Wed, 01 Feb 2023 19:41:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675309264; cv=none; d=google.com; s=arc-20160816; b=VEgKiuaTAP4uGxTtk6YL+9vC+MYwJgWzSDF4M13yt7Ws1QzCi91bzYtnucs+axuxI2 0x+mniifarTZuvQUusnz7T0ZYbl4KqxQOIMO/aY3kGE0sP+rGjzP7v9ZQobYkgMK6r0r Ll/QX2atbdA8+DHWOQne9lQXtcBnvqgPuayKeR7FW2wHbJ9KRXvUAe9EhdGPBS8NpErk lS/qXFY0eP4kkDYwSQ39sMG1xHZbe1nwuNPBX4VzGiy7fEkt4EY7xRsSUbzj9Buylqf+ qgCbCAlaMesyNxXJX8WWFdN+EkIoK7oEIGwrlXATWJ+GOxy7MK8U3pqoh9Khz65dKYyp AeJg== 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=af+Lmnamyq+Vj0QJs2upLmb2NKkykGxYDkgtqG/HDbc=; b=aIF9Dn1zRS6jmcTaP1eOP+QXa0tZqj0iV/zTCWXInR+Gg6bEuXbBrrkyjvkmAKuUVX GvhoIVASGE2oIeAdhx36nFHGu4GmkfbfTrAi2ENEjDCtwpQKEfF8QHklYIHoXkXccAv+ gPif6gpGcNhrBgBEG96kBh+sINviuYHQ1Uuuimfu8amd7HeqrrPbqltAF4ZWBz0OYgfP zgYxK11uRKoj6WPwrQJALMlbmfwUHdbn3lWHa9Dxdzpil1Sy//Dp8vv8IIA0rGkcY0FN PR3PH+DUf+PlyrTldr5u8C7yXh3yHU6/9RXbJrmnSUbdzvDPbjUcz0RBP1MeoYQ20fL+ YJ4w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=YoJXVmAe; 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 c23-20020a17090620d700b008844ab9c163si17832995ejc.440.2023.02.01.19.40.41; Wed, 01 Feb 2023 19:41:04 -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=YoJXVmAe; 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 S232153AbjBBDj3 (ORCPT + 99 others); Wed, 1 Feb 2023 22:39:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232145AbjBBDi4 (ORCPT ); Wed, 1 Feb 2023 22:38:56 -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 89CC37CC8E; Wed, 1 Feb 2023 19:38:33 -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 33226B823F3; Thu, 2 Feb 2023 03:38:32 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8DC52C433D2; Thu, 2 Feb 2023 03:38:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675309110; bh=x0KTKr8AWX5SJ12jjijewRor4FwBC86L1vP2JGQb2o0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YoJXVmAeUENsU+fdPArOWx1wGbKJxv8AOK4KsFllmQF6NK4cmlVHyXF4/I/7PCIrb WqolRgbtNIEHgUFEndVLULWcGhKqg0wMwWglvnJu9nirUN7qHXR+cEO9c48Klm0SNb +1w1lPHn6j22lUSowZ6WsFbQOoDCxXQcX5HcaYVLWzT3/aypkgdDah+TdanUiLs6D9 atVdLiY44t7/AEuOItP12lt3QPhekv0Or1INO5q61wYlK/cjHtmBSjXr0fxURkiieF QKz5CFNiMF1IMNN2SeAyXGKdt470nTp2XAgO6ss7FV0yzgaULklCwk8WFq8LRgYsYZ 7oAuDQhL0j7OQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Nathan Chancellor , Nick Desaulniers , Nicolas Schier , Ben Hutchings , 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 Message-Id: <20230202033716.341858-4-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230202033716.341858-1-masahiroy@kernel.org> References: <20230202033716.341858-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?1756689087333322497?= X-GMAIL-MSGID: =?utf-8?q?1756689087333322497?= 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 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