iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kbuild: deb-pkg: make debian/rules quiet for 'make deb-pkg'

Browse Source 
Add $(Q) to the commands in debian/rules to make them quiet when the
package built is initiated by 'make deb-pkg' or when the 'terse' tag
is set to DEB_BUILD_OPTIONS.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Reviewed-by: Nicolas Schier <n.schier@avm.de>
This commit is contained in:
Masahiro Yamada 2024-01-13 19:43:37 +09:00
parent cc3df32c9f
commit caf400c8b6
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/package/debian/rules
View File

@ -16,6 +16,8 @@ endif
ifeq ($(origin KBUILD_VERBOSE),undefined) ifeq ($(origin KBUILD_VERBOSE),undefined)
ifeq (,$(filter terse,$(DEB_BUILD_OPTIONS))) ifeq (,$(filter terse,$(DEB_BUILD_OPTIONS)))
export KBUILD_VERBOSE := 1 export KBUILD_VERBOSE := 1
else
Q := @
endif endif
endif endif
@ -27,20 +29,20 @@ make-opts = ARCH=$(ARCH) KERNELRELEASE=$(KERNELRELEASE) KBUILD_BUILD_VERSION=$(r
binary: binary-arch binary-indep binary: binary-arch binary-indep
binary-indep: build-indep binary-indep: build-indep
binary-arch: build-arch binary-arch: build-arch
$(MAKE) $(make-opts) \ $(Q)$(MAKE) $(make-opts) \
run-command KBUILD_RUN_COMMAND='+$$(srctree)/scripts/package/builddeb' run-command KBUILD_RUN_COMMAND='+$$(srctree)/scripts/package/builddeb'
.PHONY: build build-indep build-arch .PHONY: build build-indep build-arch
build: build-arch build-indep build: build-arch build-indep
build-indep: build-indep:
build-arch: build-arch:
$(MAKE) $(make-opts) olddefconfig $(Q)$(MAKE) $(make-opts) olddefconfig
$(MAKE) $(make-opts) $(if $(filter um,$(ARCH)),,headers) all $(Q)$(MAKE) $(make-opts) $(if $(filter um,$(ARCH)),,headers) all
.PHONY: clean .PHONY: clean
clean: clean:
rm -rf debian/files debian/linux-* debian/deb-env.vars* $(Q)rm -rf debian/files debian/linux-* debian/deb-env.vars*
$(MAKE) ARCH=$(ARCH) clean $(Q)$(MAKE) ARCH=$(ARCH) clean
# If DEB_HOST_ARCH is empty, it is likely that debian/rules was executed # If DEB_HOST_ARCH is empty, it is likely that debian/rules was executed
# directly. Run 'dpkg-architecture --print-set --print-format=make' to # directly. Run 'dpkg-architecture --print-set --print-format=make' to
@ -49,6 +51,6 @@ ifndef DEB_HOST_ARCH
include debian/deb-env.vars include debian/deb-env.vars
debian/deb-env.vars: debian/deb-env.vars:
dpkg-architecture -a$$(cat debian/arch) --print-set --print-format=make > $@.tmp $(Q)dpkg-architecture -a$$(cat debian/arch) --print-set --print-format=make > $@.tmp
mv $@.tmp $@ $(Q)mv $@.tmp $@
endif endif