]> git.itanic.dy.fi Git - linux-stable/commitdiff
kbuild: deb-pkg: remove unneeded '-f $srctree/Makefile' in debian/rules
authorMasahiro Yamada <masahiroy@kernel.org>
Tue, 26 Dec 2023 13:52:42 +0000 (22:52 +0900)
committerMasahiro Yamada <masahiroy@kernel.org>
Fri, 5 Jan 2024 10:35:38 +0000 (19:35 +0900)
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>
scripts/package/debian/rules

index 6ba756d246de1dc6311d1b8e6cc154c0b5d825c0..0ffa806bbd7896db99056856822cbcc7e84cf112 100755 (executable)
@@ -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