From patchwork Sat Jul 22 04:47:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 124214 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp627492vqg; Fri, 21 Jul 2023 22:14:41 -0700 (PDT) X-Google-Smtp-Source: APBJJlFW0rUD+5opDnmMyw/pCVeQjTCGN89Y+kJH4yu07dxyHk8xGvT3Zf44laHEFQcIhrjoVWuD X-Received: by 2002:a05:6602:2010:b0:783:3899:e1d0 with SMTP id y16-20020a056602201000b007833899e1d0mr2124047iod.6.1690002881176; Fri, 21 Jul 2023 22:14:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690002881; cv=none; d=google.com; s=arc-20160816; b=ILD9s/1ukZiQIt+CSRxFIfzqTGbAom37qmpORKviDm91TIpXypRn16fCZi6ebfweRU n+ZKXsTdiPtZQj5qm22KrQGr6cBYmnucPmjr+Qr8KAribGO22ix03H2ESIi9EhjkYLRm xBAbP7j4qo5aMrcZfGy6N53fc9/fPWHXG1GjzIv5J9/idyO6IzH6nvfy46LAHmrwloj0 2PL1LqXktkO9q0vv90jV9wXEBwM7UUa2zUh7Sfah+AdSfMiUhBjVK/6Yf5kV+b98KgNY /yl81x5bI1piQPSLRxUtVeTt6dz2a6syDeIqNUqBg3A7fj4q91j6fjRYj5cJ8U/2RbAa MTEA== 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=FuIvoXBGUv1LItiq5ajXkJtRt99TeMLenRya5u2mHv4=; fh=rliOZr6Fz5JmnSfKOt6v3ZHxXv/lQ1TnqU77+ZCO3og=; b=GBINUnrHEAYvwoJCpHnmKxLYxBfIaSzEjEnzsPIEGC99VX0MipGmfXFDEtUt8c5Z+7 npjW9xp85DhJokelgf8qEsc94u2HV1wG8hsayPvpPEmEyqVuIAi/0Y6nfnrKbMPliE8b msTmYLAYNtrc5tTXjMWGJfqif+eXsITLdCNYp6D1+IrRHPN6eQAbIx2yPM9gi+/vMxkP 1PK48V6Vy/gwsxTXqmbF+aj5VjWQiwDKPJdcWZ3LlP25CdX8gx5+Rww3l/5udw8pXeCO 34jUIm0dZWL8F0tRtr9NFnhF9gsnyHVBDjBqSatCnFlRwbAlcfk0XvCZAKpSoeEIplHx c3Gw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=uxEWXM0e; 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 be3-20020a656e43000000b0055bef93b8fbsi4337955pgb.75.2023.07.21.22.14.26; Fri, 21 Jul 2023 22:14:41 -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=uxEWXM0e; 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 S230161AbjGVEsg (ORCPT + 99 others); Sat, 22 Jul 2023 00:48:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230218AbjGVEsX (ORCPT ); Sat, 22 Jul 2023 00:48:23 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CD5333ABD; Fri, 21 Jul 2023 21:48:22 -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 6BBB460A51; Sat, 22 Jul 2023 04:48:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C30ECC433CC; Sat, 22 Jul 2023 04:48:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690001301; bh=t8YlK1uWf9LCj4heDmlRtPcElfIsnxIYNXcfywQoPUU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uxEWXM0e+9QgvIdfQvgcDoqV9m3IEmvla0iVylQM5PT1J2ODdzugzDYm3EG4sEuED lST9iTrfjYxA5Zkfrzcoqfv0RdhhLwaXXCrpKa7udV9SvkZ/tGy2CqDgz3IGJeuOhT LevupHhDm6OaLeNnB3dAvhQ+NSAclWISXZA9+iV4QQ6DJixQkFUuaUqS0w5gk3wdoP anML9gFduWlZeRoEh9ebtThfiuAvSAbMOalX/5nTVtjnfFL6AzjYrs2DzojLy2DBZd WO2ukqtqQmCDF6V20TTb4neErFh/QbBjCIGNtKCvGf9SCN5/nVsyaLVC76bJshobn1 MW5yM9pwoZP3Q== 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 05/19] kbuild: rpm-pkg: record ARCH option in spec file Date: Sat, 22 Jul 2023 13:47:52 +0900 Message-Id: <20230722044806.3867434-5-masahiroy@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230722044806.3867434-1-masahiroy@kernel.org> References: <20230722044806.3867434-1-masahiroy@kernel.org> 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: 1772096461202133087 X-GMAIL-MSGID: 1772096461202133087 Currently, we rely on the top Makefile defining ARCH option when we run 'make rpm-pkg' or 'make binrpm-pkg'. It does not apply when we run 'make srcrpm-pkg', and separately run 'rpmbuild' for the generated SRPM. This is a problem for cross-build. Just like the Debian package, save the value of ARCH in the spec file. Signed-off-by: Masahiro Yamada --- scripts/package/mkspec | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/package/mkspec b/scripts/package/mkspec index a1ce6677880a..0befb4e2ac6b 100755 --- a/scripts/package/mkspec +++ b/scripts/package/mkspec @@ -38,8 +38,10 @@ EXCLUDES="$RCS_TAR_IGNORE --exclude=*vmlinux* --exclude=*.mod \ # $S: this line is enabled only when building source package # $M: this line is enabled only when CONFIG_MODULES is enabled sed -e '/^DEL/d' -e 's/^\t*//' <