From: Masahiro Yamada <masahiroy@kernel.org>
To: linux-kbuild@vger.kernel.org
Cc: Ben Hutchings <ben@decadent.org.uk>,
Masahiro Yamada <masahiroy@kernel.org>,
Nathan Chancellor <nathan@kernel.org>,
Nick Desaulniers <ndesaulniers@google.com>,
Nicolas Schier <nicolas@fjasle.eu>,
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 [thread overview]
Message-ID: <20231226135243.1393780-5-masahiroy@kernel.org> (raw)
In-Reply-To: <20231226135243.1393780-1-masahiroy@kernel.org>
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 <masahiroy@kernel.org>
---
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
--
2.40.1
next prev parent reply other threads:[~2023-12-26 13:53 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-12-26 13:52 [PATCH 1/6] kbuild: deb-pkg: factor out common Make options " Masahiro Yamada
2023-12-26 13:52 ` [PATCH 2/6] kbuild: deb-pkg: squash scripts/package/deb-build-option to debian/rules Masahiro Yamada
2023-12-27 7:56 ` Nicolas Schier
2023-12-26 13:52 ` [PATCH 3/6] kbuild: deb-pkg: set DEB_* variables if debian/rules is directly executed Masahiro Yamada
2023-12-27 8:08 ` Nicolas Schier
2023-12-26 13:52 ` [PATCH 4/6] kbuild: deb-pkg: allow to run debian/rules from output directory Masahiro Yamada
2023-12-27 8:09 ` Nicolas Schier
2023-12-26 13:52 ` Masahiro Yamada [this message]
2023-12-27 8:11 ` [PATCH 5/6] kbuild: deb-pkg: remove unneeded '-f $srctree/Makefile' in debian/rules Nicolas Schier
2023-12-26 13:52 ` [PATCH 6/6] kbuild: deb-pkg: use more debhelper commands in builddeb Masahiro Yamada
2024-04-02 15:59 ` Robert Nelson
2024-04-02 20:35 ` Robert Nelson
2023-12-27 7:55 ` [PATCH 1/6] kbuild: deb-pkg: factor out common Make options in debian/rules Nicolas Schier
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231226135243.1393780-5-masahiroy@kernel.org \
--to=masahiroy@kernel.org \
--cc=ben@decadent.org.uk \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=nathan@kernel.org \
--cc=ndesaulniers@google.com \
--cc=nicolas@fjasle.eu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®