From patchwork Tue Dec 26 13:52:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 183321 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp875434dyb; Tue, 26 Dec 2023 05:54:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IGHzRi2+vBczLNDwPofrnpXgel4V57P37ON0mVNfY5nSjdmC62r1lFhrm9WrxTG1Q3GNzKW X-Received: by 2002:ac2:4854:0:b0:50e:7551:f06f with SMTP id 20-20020ac24854000000b0050e7551f06fmr1108037lfy.77.1703598855072; Tue, 26 Dec 2023 05:54:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703598855; cv=none; d=google.com; s=arc-20160816; b=arSFcYbaIyx1v+W+RKoil28cWPpwVB4oZSt7SQG62EHt3i3Izd16Uou0Jp082gAMld IDvq9sDHhzM0seT3Kaxc/intzDZcLFDpm9Ew6uHML8ElF795z8thKTn7rf50Kry46ana 8A2yPfSC3zhX1BN82YoHD0NgxZ5pgUvvJyZbQiSCfRCYYTT83OdnrmWA6BWQlfEJX9Rz k5G0+lHOvExCQFAlk4qBmNpFZoDjZo+ptMlYw6O95BOBX/WTANmaikmA44eciCQCdv4N ehj4xgB/7+NNHXNQYhrfS5ZPvRrBZzuDiMnSEDTbhxlOXDs83u//fRTGztgqvcml/5c2 3f6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=C21jKShFVWYhGFY7tVS+lUCWy3QtACdk+8CLQ2u/fqw=; fh=5gYN4msaJmwnN8mGpibv8VZnTy0MtvGQcf5D09XpoaQ=; b=S6KmBupcg9Adp4M33i/Iip+ta6YUCqa6yItLB83gyoR7k5ojw1OKP4iLKNOA6v50WC 3YRplCvJii3YpZpCLkIlN9MwKILpqLM8IZglTQGas5YNwGpXWTwErojs5vNv0gfnATBD 4mLodlhiUDh6NIndYlCOHvapFv2LV38JVy0pEFHl20YP+8XmXpobJedYWzS7483/KnCz DOSRhH2l6hS5X8k9TWHOUcCA4AesOFq7uUpGgViInMv1lt6b+WvKRiOgPdBcw8jjbOJq LIO6Lulh6AYgW3oVDsdEt8NSG32YXxrPomX5h5pon+hg4xX8En4mj7r0BjZT2FreOtDC nK9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=g6Ryscme; spf=pass (google.com: domain of linux-kernel+bounces-11534-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-11534-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id r21-20020a50d695000000b005541005946fsi5448092edi.72.2023.12.26.05.54.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 26 Dec 2023 05:54:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-11534-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=g6Ryscme; spf=pass (google.com: domain of linux-kernel+bounces-11534-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-11534-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id ACB591F22306 for ; Tue, 26 Dec 2023 13:54:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id AD7854FF63; Tue, 26 Dec 2023 13:53:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="g6Ryscme" X-Original-To: linux-kernel@vger.kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 270FC4F8A6; Tue, 26 Dec 2023 13:53:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60B44C433CB; Tue, 26 Dec 2023 13:53:02 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1703598783; bh=fSRgbph1yPaaUtk0eAjQa+ArlTVll7f5fkppZKDNpBg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=g6RyscmeMEpXnOlMRmKtwyX7WOTR+p/iLVqxnGz2NW9MO6CnLueLYmiwj7XefRDiT v1c+KjwFOBGsMkFAxXJIlyj6Y0bY5A6bg/IsXu5q6EpCqfuFo7UYHgVx/naEMxGBlt oruY50rGDqPaglzXdzH1Aa0Uye7SirKLoqBWow9FvWHZMwujHjgpAV81Jflkul3pW/ rFdRIcVWX3pVi2eDCV1NhzH+dSc1/GjDEJvHcQP5S0I5WufY3fi9IeYdeX8jHivXIQ 6T3qHH7axfU3psgo8U09LX4QYvbNXqBrqjXlw2cNEKPB7vqjlJSaNSY0y59mp81Dho KYO5nVEyuJ1KA== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ben Hutchings , Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier , linux-kernel@vger.kernel.org Subject: [PATCH 5/6] kbuild: deb-pkg: remove unneeded '-f $srctree/Makefile' in debian/rules Date: Tue, 26 Dec 2023 22:52:42 +0900 Message-Id: <20231226135243.1393780-5-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231226135243.1393780-1-masahiroy@kernel.org> References: <20231226135243.1393780-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786352872734199631 X-GMAIL-MSGID: 1786352872734199631 This is unneeded because the Makefile in the output directory wraps the top-level Makefile in the srctree. Just run $(MAKE) irrespective of the build location. Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier --- scripts/package/debian/rules | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/scripts/package/debian/rules b/scripts/package/debian/rules index 6b2333e3cf96..36d51f60f98d 100755 --- a/scripts/package/debian/rules +++ b/scripts/package/debian/rules @@ -3,8 +3,6 @@ include debian/rules.vars -srctree ?= . - ifneq (,$(filter-out parallel=1,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))) NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) MAKEFLAGS += -j$(NUMJOBS) @@ -18,20 +16,20 @@ make-opts = ARCH=$(ARCH) KERNELRELEASE=$(KERNELRELEASE) KBUILD_BUILD_VERSION=$(r binary: binary-arch binary-indep binary-indep: build-indep binary-arch: build-arch - $(MAKE) -f $(srctree)/Makefile $(make-opts) \ + $(MAKE) $(make-opts) \ run-command KBUILD_RUN_COMMAND='+$${srctree}/scripts/package/builddeb' .PHONY: build build-indep build-arch build: build-arch build-indep build-indep: build-arch: - $(MAKE) -f $(srctree)/Makefile $(make-opts) \ + $(MAKE) $(make-opts) \ olddefconfig all .PHONY: clean clean: rm -rf debian/files debian/linux-* debian/deb-env.vars - $(MAKE) -f $(srctree)/Makefile ARCH=$(ARCH) clean + $(MAKE) ARCH=$(ARCH) clean # If DEB_HOST_ARCH is empty, it is likely that debian/rules was executed # directly. Run 'dpkg-architecture --print-set --print-format=make' to