From patchwork Sat Jul 22 04:47:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 124216 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp627519vqg; Fri, 21 Jul 2023 22:14:46 -0700 (PDT) X-Google-Smtp-Source: APBJJlGhjQKSY0aph1QXNPCHGYduoCcIHx6Kf3CIvJEduO+hbB9/L5TugOw8TmLojldg+f9FlgQv X-Received: by 2002:a17:903:22c6:b0:1b8:41d4:89f with SMTP id y6-20020a17090322c600b001b841d4089fmr4161122plg.4.1690002886219; Fri, 21 Jul 2023 22:14:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690002886; cv=none; d=google.com; s=arc-20160816; b=zpOrOL/Cy/J/hu5zJafd7Bt5SR87BaFhehmqBw5AZVCyEFxgxgh4Sqq6B/BRR4mrMO UN+cE5M7SDHYGT6Pb6NbHQpKcJna6x87Qf5CT7C2XcRtwmZjqQD6gIJVy/Y2HpeL7Wz5 evVNO2YB5ZTRGfBXns/oblbMiq/ABrLA9GzvoPuxBxwYrZ66tjJQW9j9u6DZNamlxfwV /txnPWvJl3iguAJkytwH9htmEgAQfY2XyePxj2+KUToz2e+YE+z0Z1IoqHPsvthVsOZk ltrsTPU8LldbrKS4aJxPnHPeYE3uwItB+5QSR9lN1GogvFGwthaPdvjOoWndoMtK8/Fo TujQ== 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=aQgwtfVnP7P7kdjjGBMxpQA0I+Ow08wNfJdL3OjZhmA=; fh=rliOZr6Fz5JmnSfKOt6v3ZHxXv/lQ1TnqU77+ZCO3og=; b=PatJe3bNUI3gmd23yJ3EClN3hi/ryCkLAeXJ63ERIYq5Ef5FuwmyoGPtnC3gPT9EeQ 6l33p9vp9Ynv3iobQaKQFmNs4HIcuuOinIGyp5eOqBscAUYa2CkbtjR9nASz8mj1FuGS +vjVJTHeBJwlicY255ZpfbkW9KBp0UAlajrvEvnYZIWisMpL0wmdLd65I4DBw0/UhnmH fZq84O7IQlRY3jeVsiFfSCqGKuQPFH9le2mOfpA4xsWJQ6/Vq9th8oFF6r7VRkCXCy8I L6XN3if2xA/IN9hoeloKkHwkoAEid8vgUtW26Rfi/RcLxHbPZr4EOp0Nqt2CWaWJ3vGm EUsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=X5J6n3mn; 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 t6-20020a632246000000b005574bef6f31si4472363pgm.490.2023.07.21.22.14.33; Fri, 21 Jul 2023 22:14:46 -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=X5J6n3mn; 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 S230440AbjGVEs3 (ORCPT + 99 others); Sat, 22 Jul 2023 00:48:29 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48594 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230141AbjGVEsV (ORCPT ); Sat, 22 Jul 2023 00:48:21 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D49173583; Fri, 21 Jul 2023 21:48:19 -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 7364160A4C; Sat, 22 Jul 2023 04:48:19 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id C53EFC433CB; Sat, 22 Jul 2023 04:48:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1690001298; bh=b+tgQJzqqP7hzh4EZCRAABtIzrvO2u08e4LOuvHC6/8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=X5J6n3mnOrcTUsbm2l4+l1/oNSQmhesOSf2I+V9TO7cg2A8V85HP8E/k3IjYk+sct U9TBvU1sq3kgockPpAAK37eBAFtY2IvUu5LmTyA7fmI0rOfx1qlcGubZeL4N9jFN+Y KZ1LHYJe6c0gJMTAaUkZKHCNsbnUOFliaOxi8Lv2VGOc9VuhrLcY4m7UnD7GUAfQNy 9OjtMMmFvGeFpjDamtSZYuBA0jXdR/ZbgydZJ4XHJu9nzeLT2zbL1aJA7hh7d+HZnb +LYw39R+jzVi/2tE5aZYhAOsylsm6TMqu9z5CqOW659Uao6ezwpUF26myGiaFwxYBB m55B8EtN/3j8g== 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 03/19] kbuild: rpm-pkg: do not hard-code $MAKE in spec file Date: Sat, 22 Jul 2023 13:47:50 +0900 Message-Id: <20230722044806.3867434-3-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, URIBL_BLOCKED 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: 1772096466575731773 X-GMAIL-MSGID: 1772096466575731773 Currently, $MAKE will expand to the GNU Make program that created the source RPM. This is problematic if you carry it to a different build host to run 'rpmbuild' there. Consider this command: $ /path/to/my/custom/make srcrpm-pkg The spec file in the SRPM will record '/path/to/my/custom/make', which exists only on that build environment. To create a portable SRPM, the spec file should avoid hard-coding $MAKE. Signed-off-by: Masahiro Yamada --- scripts/Makefile.package | 5 +++-- scripts/package/mkspec | 12 +++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/scripts/Makefile.package b/scripts/Makefile.package index 92dbc889bd7c..e9217e997c68 100644 --- a/scripts/Makefile.package +++ b/scripts/Makefile.package @@ -72,7 +72,7 @@ PHONY += rpm-pkg 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}' + --define='_smp_mflags %{nil}' --define='make $(MAKE)' # srcrpm-pkg # --------------------------------------------------------------------------- @@ -89,7 +89,8 @@ binrpm-pkg: $(MAKE) -f $(srctree)/Makefile $(CONFIG_SHELL) $(MKSPEC) prebuilt > $(objtree)/binkernel.spec +rpmbuild $(RPMOPTS) --define "_builddir $(objtree)" --target \ - $(UTS_MACHINE)-linux -bb $(objtree)/binkernel.spec + $(UTS_MACHINE)-linux -bb $(objtree)/binkernel.spec \ + --define='make $(MAKE)' # deb-pkg srcdeb-pkg bindeb-pkg # --------------------------------------------------------------------------- diff --git a/scripts/package/mkspec b/scripts/package/mkspec index a83b17b4a0d9..9b2b4386019d 100755 --- a/scripts/package/mkspec +++ b/scripts/package/mkspec @@ -38,6 +38,8 @@ 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*//' <