From patchwork Fri Feb 10 18:18:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 55516 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1105528wrn; Fri, 10 Feb 2023 10:20:40 -0800 (PST) X-Google-Smtp-Source: AK7set8TpzGpNX5Gc+f21uv88/pkmksOP0P2PI4Dy8kLNyHIJCs6U2aITZbhcOrAxVZ7v+mtQVwy X-Received: by 2002:a17:906:ca2:b0:887:7871:2b2f with SMTP id k2-20020a1709060ca200b0088778712b2fmr16480900ejh.61.1676053240633; Fri, 10 Feb 2023 10:20:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1676053240; cv=none; d=google.com; s=arc-20160816; b=FeTeQVwL6oyNk5r8wraBaNZYHQsmmPcMzqkwRdOvL2J3PXCxn4t+5VnN6vcoNxsr0C Cswv/jhGLQVF3lJ70U1lEgyLQvahPMHCgTkO5eYZ5C2k0QUakhp/xcW/fomo4z1lS89r E/Yi7c0jJ7Uu1crdvksipuijJ5XQtVSgGAMEewvCyVA1U3kFzTs1xSEr/UDppTLPFW9w aWJxcIG4pNB48rDBbUsxzml6nF9+Xh5xYaiokdEG6XmAnp1DZOVX8l1Vo2TcMSrwRsd5 rFk0Z7ZlfD2C1q8JL7SNsziqZV4kM1FcJBE+0E4AAboyQiWZYCd6Y56vJzBEHu0bXRAj O4BQ== 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=m8RX3byj3f/OJD76CoKVJHTe7RkRdMdb8CU7Zz/KOws=; b=qCLaw8IRRcKkByR0WI7OWxHyxL0EGzNN6yBDcCRETUJHEXWQ2eJZTu6mFz3YQBQygH X2LJZDnG0pMmL9n63eP5mHqTCHaNTjBXCJ6uS8VtatTTIcmMgQnbwrA8Ojdx9tzFyg4E 2wWiud+RZY/smMbr8toj2/6JOiN4hJyk8Zy8pVkV2ub4n+vD7fV8RmikF3rNDW+FJguX eGxEiRTNoK0G8N1rY4vEEEOVg1pLroQLg5X6KlBZSLYCDgi8WGnLnmS2WSPJ7y9+JepG Z8w4XZLMOhQvm2e8tf78Oqb7Jhz1zI6xebPL/qe5samfFQ48bD92QYV9L3J1wdnfoqO0 l6GA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=D75Ayfcg; 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 vw6-20020a170907058600b0087da417217dsi5039434ejb.728.2023.02.10.10.20.13; Fri, 10 Feb 2023 10:20:40 -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=D75Ayfcg; 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 S232963AbjBJSTA (ORCPT + 99 others); Fri, 10 Feb 2023 13:19:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42998 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232934AbjBJSSp (ORCPT ); Fri, 10 Feb 2023 13:18:45 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 85C3B5EBCC; Fri, 10 Feb 2023 10:18:43 -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 238E0B825BC; Fri, 10 Feb 2023 18:18:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E93EAC433D2; Fri, 10 Feb 2023 18:18:38 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1676053120; bh=Dch3vAjHkuwS0Ip0OjVDZfKz/fFwFDY7bH9X+rd6/vM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=D75Ayfcgyv/vP+xf7rDaxhN5QGC9/Op3ktbIFIty6m0MzlQBKO/H2em62RQiuL4s3 nDFqebwmpytnB58Oz/FLa1sUesGqsGqU+SGsRZH/D3MbJysb5vgfE2UwdGNVFLP1De +xWGxx8A0rnPeNKTNnHC/TWVZKPxuRZQ3/BwTCDEncWX4ud7S849ld6WsrV+NVATzz l98ilQzOcEh5T5o5FWw+IB6bqT7+mdEcqHOxDdlWTlrXn514itv5/ldjXl7IYFLhNy o1S6NZaHaituU7Fo5zRYH4gHHPmSkk2KyOqsv8n2TiUvhHnnWuQB60HG7k/xxAVNho gVOxQWzgdHdag== 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 v5 3/7] kbuild: rpm-pkg: build binary packages from source rpm Date: Sat, 11 Feb 2023 03:18:24 +0900 Message-Id: <20230210181828.124765-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230210181828.124765-1-masahiroy@kernel.org> References: <20230210181828.124765-1-masahiroy@kernel.org> MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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?1757469202826053614?= X-GMAIL-MSGID: =?utf-8?q?1757469202826053614?= 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 0dda909f87a9..0b66bd667212 100644 --- a/scripts/Makefile.package +++ b/scripts/Makefile.package @@ -53,11 +53,9 @@ tar -I $(KGZIP) -c $(RCS_TAR_IGNORE) -f $(2).tar.gz \ # 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