From: Masahiro Yamada <masahiroy@kernel.org>
Date: Tue, 26 Dec 2023 13:52:38 +0000 (+0900)
Subject: kbuild: deb-pkg: factor out common Make options in debian/rules
X-Git-Tag: v6.8-rc1~31^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=466e6fc43fb9eefa26ec766f78ce18616bf84b9a;p=thirdparty%2Fkernel%2Flinux.git

kbuild: deb-pkg: factor out common Make options in debian/rules

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>
---

diff --git a/scripts/package/debian/rules b/scripts/package/debian/rules
index 3dafa9496c636..26bc6239e200a 100755
--- a/scripts/package/debian/rules
+++ b/scripts/package/debian/rules
@@ -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