]> git.itanic.dy.fi Git - linux-stable/commitdiff
kbuild: deb-pkg: factor out common Make options in debian/rules
authorMasahiro Yamada <masahiroy@kernel.org>
Tue, 26 Dec 2023 13:52:38 +0000 (22:52 +0900)
committerMasahiro Yamada <masahiroy@kernel.org>
Fri, 29 Dec 2023 13:25:21 +0000 (22:25 +0900)
This avoids code duplication between binary-arch and built-arch.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <n.schier@avm.de>
scripts/package/debian/rules

index 3dafa9496c6366d727bb8b3249886a11b93ba2d0..26bc6239e200a36aa58e5dfb199b85fe9c6d1299 100755 (executable)
@@ -10,20 +10,20 @@ ifneq (,$(filter-out parallel=1,$(filter parallel=%,$(DEB_BUILD_OPTIONS))))
     MAKEFLAGS += -j$(NUMJOBS)
 endif
 
+make-opts = ARCH=$(ARCH) KERNELRELEASE=$(KERNELRELEASE)
+
 .PHONY: binary binary-indep binary-arch
 binary: binary-arch binary-indep
 binary-indep: build-indep
 binary-arch: build-arch
-       $(MAKE) -f $(srctree)/Makefile ARCH=$(ARCH) \
-       KERNELRELEASE=$(KERNELRELEASE) \
+       $(MAKE) -f $(srctree)/Makefile $(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 ARCH=$(ARCH) \
-       KERNELRELEASE=$(KERNELRELEASE) \
+       $(MAKE) -f $(srctree)/Makefile $(make-opts) \
        $(shell $(srctree)/scripts/package/deb-build-option) \
        olddefconfig all