From patchwork Sun Jan 29 18:46:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 50035 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1849130wrn; Sun, 29 Jan 2023 10:47:43 -0800 (PST) X-Google-Smtp-Source: AK7set8BAWvKdFDSqGQsru3Hj1QmC6upsKMzR10skIXHWN3TLP1o7pw9LUZktSpOa8hdAZuTyyrC X-Received: by 2002:a17:903:1d1:b0:196:2c09:8726 with SMTP id e17-20020a17090301d100b001962c098726mr20525280plh.17.1675018062821; Sun, 29 Jan 2023 10:47:42 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675018062; cv=none; d=google.com; s=arc-20160816; b=Kk2J8CrNY04wHY3eRv8xSYC5AwVv1F9dY6Lx0uTCA4JdiAQoJnvf65K1mL11WawS6p 0WiMgZzAl9TaBFQMVxxAEnhNdaH2ZuPNqgq3lRxNycGcnNWbB3UcWsgMkoIc7lmAKy5P fBRJSSznegwhyCfnKHphONEr7d0rmHJZnvHCsEPp5OTp/kIacCgjqo98jpa/IX0mhNSO 7/GvtLIqSyqvcUlwamvNahkIA67WiQpfS/2vPfI9FqeUkotTRKv2If29F7SK9bLX4qsv cqzXkdHbLUnfWsDmFoB7jEHozfyyiOHS9Ozpb3OPrWue/dkKppjac51CNaU4Ld5bu8Sw suBQ== 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=eEK0zHLsd2WMI0B2hB63+zdDduNLtJYvyl+jeuDc37c=; b=rWi9lT+EuNhYtonoiBegAOYlQ0TZrJ8tjqGQfZCru8dMdN82inNBhYvYuEIreSCNmh PzS1Q7bN1FMFtDyrTnfEsW1uOpbPNAUjPX3DaDSqERTXaGWkXmmyqu/nB727z5oMBVq4 3e5iBBs/CWuLTB5b1peDauvGIi4sirTfbR+LQYIhJR7+0pQoAcwWCQ9eKOxY2ZdW3evm YRB7SZNRWHCdTGlrT/Y4MFPqnmvchmcaAGATVD4ymr5XfLlcFNwgcQI6SeXbX0CCYKUb 5G+SU2RZMw1pD3hWE0pIuslRTzbAf7eSwREpqRBKSPYfoZjpawAQxVxzei6SbXbdQWxg C6rg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=MrdNlcaj; 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 je17-20020a170903265100b0019273090648si10358779plb.554.2023.01.29.10.47.31; Sun, 29 Jan 2023 10:47:42 -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=MrdNlcaj; 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 S235315AbjA2SqS (ORCPT + 99 others); Sun, 29 Jan 2023 13:46:18 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235294AbjA2SqP (ORCPT ); Sun, 29 Jan 2023 13:46:15 -0500 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 233BF1E1F7; Sun, 29 Jan 2023 10:46:15 -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 B2FEA60DDC; Sun, 29 Jan 2023 18:46:14 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id CBA29C4339E; Sun, 29 Jan 2023 18:46:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1675017974; bh=R3C1yPHqmwWVWqJshYNvFRThjW5p8L53OLdI9EyXq2Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MrdNlcajd3swD5hnUlJUcyBFLyx2peA8bKV8cMyTnfbQLqoZyYf4oqEzJDLsFe0Ht j0f9dLm4JwbwLdeo2w4l/f1q7XOnHKqsq0WjQHnN6sFr/iHz1pa8A/4t0UKR93BpOi s5+Wi3wWoYynRTDZ7wJNRslrigqHfKS2htnZ6HT9MqKvzcXcTgws8wHkIJ7O3+3/1n mOFF8g6V29QOcfoZoLASbTzd7M1Rv02dKnC59E29I16JHqJEA2gduB+qL3oSuQS7j6 /yx7eOO2+izBv1OmnWnLRhFjs/QcBG1J9bGnlnqS+f895ivq7TqW/9vShY7kFrAltz F1mgZq8hUaHXQ== 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 v2 3/5] kbuild: rpm-pkg: build binary packages from source rpm Date: Mon, 30 Jan 2023 03:46:00 +0900 Message-Id: <20230129184602.3974058-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230129184602.3974058-1-masahiroy@kernel.org> References: <20230129184602.3974058-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?1756383739785717525?= X-GMAIL-MSGID: =?utf-8?q?1756383739785717525?= 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. 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 5ac0a2dec01d..97e146885e53 100644 --- a/scripts/Makefile.package +++ b/scripts/Makefile.package @@ -72,11 +72,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