Skip to content

Commit 68e262f

Browse files
committed
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 <[email protected]> Reviewed-by: Nicolas Schier <[email protected]>
1 parent eaf80f7 commit 68e262f

File tree

1 file changed

+3
-5
lines changed
  • scripts/package/debian

1 file changed

+3
-5
lines changed

scripts/package/debian/rules

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33

44
include debian/rules.vars
55

6-
srctree ?= .
7-
86
ifneq (,$(filter-out parallel=1,$(filter parallel=%,$(DEB_BUILD_OPTIONS))))
97
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
108
MAKEFLAGS += -j$(NUMJOBS)
@@ -18,20 +16,20 @@ make-opts = ARCH=$(ARCH) KERNELRELEASE=$(KERNELRELEASE) KBUILD_BUILD_VERSION=$(r
1816
binary: binary-arch binary-indep
1917
binary-indep: build-indep
2018
binary-arch: build-arch
21-
$(MAKE) -f $(srctree)/Makefile $(make-opts) \
19+
$(MAKE) $(make-opts) \
2220
run-command KBUILD_RUN_COMMAND='+$$(srctree)/scripts/package/builddeb'
2321

2422
.PHONY: build build-indep build-arch
2523
build: build-arch build-indep
2624
build-indep:
2725
build-arch:
28-
$(MAKE) -f $(srctree)/Makefile $(make-opts) \
26+
$(MAKE) $(make-opts) \
2927
olddefconfig all
3028

3129
.PHONY: clean
3230
clean:
3331
rm -rf debian/files debian/linux-* debian/deb-env.vars*
34-
$(MAKE) -f $(srctree)/Makefile ARCH=$(ARCH) clean
32+
$(MAKE) ARCH=$(ARCH) clean
3533

3634
# If DEB_HOST_ARCH is empty, it is likely that debian/rules was executed
3735
# directly. Run 'dpkg-architecture --print-set --print-format=make' to

0 commit comments

Comments
 (0)