From patchwork Sat Jul 22 04:47:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 124202 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp620051vqg; Fri, 21 Jul 2023 21:49:42 -0700 (PDT) X-Google-Smtp-Source: APBJJlHU2ti+acToQz2gl+Y4gi0s++ULudyDltafKCCQ3wKfh/YoQaMTGRBON72x3esYzhiGOSxz X-Received: by 2002:a05:6a00:1914:b0:66e:4df5:6c10 with SMTP id y20-20020a056a00191400b0066e4df56c10mr2050250pfi.34.1690001382380; Fri, 21 Jul 2023 21:49:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690001382; cv=none; d=google.com; s=arc-20160816; b=xEh2JEX8chCuv3pDNV1XHXPSQTMZcqvsP7fA1z44U1YDHHnLM6VwAYkAsvq1dsgZn+ VEZ/IQgbcs40Q7egJi0pi9EPW+3vpASDrKLMVf5EEt6IXytpqwT5tqmb6k5eF0Dln7lg +PjbgIVPGiHBjC4jFpjDXjIYPMUA7xxSmcwxI5dvszCiedpGuluLtxFx/2rxV3Uxj4hJ G8GUX/HsDMWyqbX5wHzlovc5BbV00brDr9VPAFzBozZsm2S/r3rqlUxjPsLQNMuwNwea SXxfFvE04kLeaoNe2bu0AXZVeHu+iCs9ytN0Dwy7sOg9XVxuHFqIStZItbJ1ntE7vIgc 7fKA== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=rUZVpHFUQoZguMine1Alj+EC/yzkGIiv07dRHhnO+Dk=; fh=rliOZr6Fz5JmnSfKOt6v3ZHxXv/lQ1TnqU77+ZCO3og=; b=vQQvt5z0ykfPpkydliH8C+GG2XKX0nMQvpijfchU2OnYSEREe3/wT5vHJYh09e7lU6 KsvckgfBCvzXQ74949HxVJejUJcKbOeX00t0W8htNmvYJ6o67wAZ3382HnUbwMhnlfgT 06LVCI+e1lsmMXduKIjOgS8Dyw+fmPWVktE0LddcR+9a5TuhZnaiGunnHaM68q2hfGjV Jxgc1PWgcSq+DHCLyabQ1MzKdJkdZ2BvAWReeMk2ZUxTh6hdHW/ssXPWZX0FQpVpDu4W R93jutBihQOkIV2KJOj2jE1xgh/3O/BAkxxC8pWo/1j+ItU+gUG0XVrclRaWHzxvmoyA irOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=E0Dmzn2g; 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 fh41-20020a056a00392900b0064d45bbba8csi4550332pfb.62.2023.07.21.21.49.28; Fri, 21 Jul 2023 21:49:42 -0700 (PDT) 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=E0Dmzn2g; 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 S229862AbjGVEsV (ORCPT + 99 others); Sat, 22 Jul 2023 00:48:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48582 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229503AbjGVEsR (ORCPT ); Sat, 22 Jul 2023 00:48:17 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id DDAF03583; Fri, 21 Jul 2023 21:48:16 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 7354560A50; Sat, 22 Jul 2023 04:48:16 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id BEBB8C433C8; Sat, 22 Jul 2023 04:48:14 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690001295; bh=to0i+TXIMK7bCy8RaewkN9+QjUncbqhaUH3zl5VbVio=; h=From:To:Cc:Subject:Date:From; b=E0Dmzn2ghuAuyAi1IgYuH4ejF8Z0Xj2/p4wYLJKDRrThlNiyRjhaLkw1zH4NOxMcB 3QKmJChruhyHnBrqZCO1SF8Ej7yAzL4vlrwhFkshLNhoQCxR49xiLWSTazLK9zSEcC LfVwjc/E/dMkbfT9X0US4ypv9fJeLuV3Uol3/tlaPZmpz7Efo96+eux4ivkktrgsoa SNFXGGmluQ6RE1Hi5QhGJeznxBa5hTIn+ay/fetmaOGeut5VzkJ7ZrcQnIG4nXQ41n mYIoyZvpAtKjL1DRQpjwfSk4h/HfFF0u/uwMXQhJE+gzsC/30R5fDaaifCEOTcbOv/ +CUc7nKq3Rqgg== 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 01/19] kbuild: rpm-pkg: define _arch conditionally Date: Sat, 22 Jul 2023 13:47:48 +0900 Message-Id: <20230722044806.3867434-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_BLOCKED,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE 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: INBOX X-GMAIL-THRID: 1772094889523212336 X-GMAIL-MSGID: 1772094889523212336 Commit 3089b2be0cce ("kbuild: rpm-pkg: fix build error when _arch is undefined") does not work as intended; _arch is always defined as $UTS_MACHINE. The intention was to define _arch to $UTS_MACHINE only when it is not defined. Fixes: 3089b2be0cce ("kbuild: rpm-pkg: fix build error when _arch is undefined") Signed-off-by: Masahiro Yamada --- scripts/package/mkspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/package/mkspec b/scripts/package/mkspec index 8049f0e2c110..c9299f9c1f3e 100755 --- a/scripts/package/mkspec +++ b/scripts/package/mkspec @@ -57,7 +57,7 @@ $S BuildRequires: gcc make openssl openssl-devel perl python3 rsync # $UTS_MACHINE as a fallback of _arch in case # /usr/lib/rpm/platform/*/macros was not included. - %define _arch %{?_arch:$UTS_MACHINE} + %{!?_arch: %define _arch $UTS_MACHINE} %define __spec_install_post /usr/lib/rpm/brp-compress || : %define debug_package %{nil}