summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2023-12-26 22:52:42 +0900
committerMasahiro Yamada <masahiroy@kernel.org>2024-01-05 19:35:38 +0900
commit68e262f8017d7fa5a9ea1ef21cbaa0fd5334ecd5 (patch)
tree13f49c2ba318dc19c2dddfc6de9aa3aa8da03b97 /scripts
parenteaf80f7f2c9c5f08d76858ec32addfcfe64ce58e (diff)
kbuild: deb-pkg: remove unneeded '-f $srctree/Makefile' in debian/rules
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> Reviewed-by: Nicolas Schier <n.schier@avm.de>
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/package/debian/rules8
1 files changed, 3 insertions, 5 deletions
diff --git a/scripts/package/debian/rules b/scripts/package/debian/rules
index 6ba756d246de..0ffa806bbd78 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