On Tue, Dec 26, 2023 at 10:52:42PM +0900, Masahiro Yamada wrote:
> 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@xxxxxxxxxx>
> ---
Reviewed-by: Nicolas Schier <n.schier@xxxxxx>
>
> 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
>
