Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

kbuild: deb-pkg: call more misc debhelper commands

Use dh_prep instead of removing old build directories manually.

Use dh_clean instead of removing build directories and debian/files
manually.

Call dh_testdir and dh_testroot for preliminary checks.

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

+5 -9
-8
scripts/package/builddeb
··· 28 28 pname=$1 29 29 pdir=debian/$1 30 30 31 - rm -rf ${pdir} 32 - 33 31 # Only some architectures with OF support have this target 34 32 if is_enabled CONFIG_OF_EARLY_FLATTREE && [ -d "${srctree}/arch/${SRCARCH}/boot/dts" ]; then 35 33 ${MAKE} -f ${srctree}/Makefile INSTALL_DTBS_PATH="${pdir}/usr/lib/linux-image-${KERNELRELEASE}" dtbs_install ··· 95 97 install_linux_image_dbg () { 96 98 pdir=debian/$1 97 99 98 - rm -rf ${pdir} 99 - 100 100 # Parse modules.order directly because 'make modules_install' may sign, 101 101 # compress modules, and then run unneeded depmod. 102 102 while read -r mod; do ··· 124 128 pdir=debian/$1 125 129 version=${1#linux-headers-} 126 130 127 - rm -rf $pdir 128 - 129 131 "${srctree}/scripts/package/install-extmod-build" "${pdir}/usr/src/linux-headers-${version}" 130 132 131 133 mkdir -p $pdir/lib/modules/$version/ ··· 132 138 133 139 install_libc_headers () { 134 140 pdir=debian/$1 135 - 136 - rm -rf $pdir 137 141 138 142 $MAKE -f $srctree/Makefile headers_install INSTALL_HDR_PATH=$pdir/usr 139 143
+5 -1
scripts/package/debian/rules
··· 42 42 DH_OPTIONS = -p$(package) 43 43 44 44 define binary 45 + $(Q)dh_testdir $(DH_OPTIONS) 46 + $(Q)dh_testroot $(DH_OPTIONS) 47 + $(Q)dh_prep $(DH_OPTIONS) 45 48 $(Q)+$(MAKE) $(make-opts) run-command KBUILD_RUN_COMMAND='+$$(srctree)/scripts/package/builddeb $(package)' 46 49 $(Q)dh_installdocs $(DH_OPTIONS) 47 50 $(Q)dh_installchangelogs $(DH_OPTIONS) ··· 75 72 76 73 .PHONY: clean 77 74 clean: 78 - $(Q)rm -rf debian/files debian/linux-* debian/deb-env.vars* debian/*.files 75 + $(Q)dh_clean 76 + $(Q)rm -rf debian/deb-env.vars* debian/*.files 79 77 $(Q)$(MAKE) ARCH=$(ARCH) clean 80 78 81 79 # If DEB_HOST_ARCH is empty, it is likely that debian/rules was executed