From patchwork Sat Dec 30 13:52:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 184012 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp3092304dyb; Sat, 30 Dec 2023 05:53:16 -0800 (PST) X-Google-Smtp-Source: AGHT+IHawxlrqqk1OaEL+fZFYMCuvDl20nQ/rKqwSYipM7CZsZAuDjfDh5h+j2BGHGm9rf3LemCm X-Received: by 2002:ac8:5dd3:0:b0:427:851a:dde4 with SMTP id e19-20020ac85dd3000000b00427851adde4mr17711747qtx.115.1703944395874; Sat, 30 Dec 2023 05:53:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703944395; cv=none; d=google.com; s=arc-20160816; b=EPbmyJ3ebWZDS1Uj+PIqHCTlQg/tfpNDj1ZWm2R45jktXGwqiSWzsp5MDimndSBA/8 nzucbnsIKywabTYKPsNDmto4Ea39Z7ucxMwz2kd4b5tQEOZEVVNPRYuj2D/8bhKfEMXb +rzbN0qPo9PHstEJI393ur+joXVWo7Tl/7MNCbR+dt9WWDA+0o7GgLqvlGAz93C/jNBj hhYICe0z9khmrRuxMM8AxbmV4TvkXj5pT5nLALiMO3g/G4ouGCILOQ6lgd6LevwHErko XJID8fUv6i37bN0Bs3D/iJgn/hcHqWaltvRzCkl2+3pQ42ZSrQkSRBZQCzLtCV5kNUcp Ip+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=llsSDqlJ0LJ+r9Jyw41oL9EhehIXcjUsv39CZDSaC0U=; fh=5gYN4msaJmwnN8mGpibv8VZnTy0MtvGQcf5D09XpoaQ=; b=bzFhXc4X0P/OPfsk4CgVGAnYglRcI7qVugnnp98YFj8ZI5fjSNxN7SoVTl3ES8W/rS Q2l2sd2xQrMWuzvA09N+j+GRrUntk847sQ3mUl7KyEibt1flYS5TCWyNNxWZ7n/JRbC8 KipVZ3Za2RVgwlHXa3zDaNlFwSo8WfK1BDxhWpbhxTJXG3ZHhpSLrLTM4E4jgvpEEig+ 1Q4StVeZuxDJDhGefYnJyZefmcIAwA1AD0UfWjIBmkksTWcMqafuM+QbTFoxJrreqLnz uaaQdq9wXJ5/vm03LzsH66NfYZ038Yc8fysoAThoVrG3rZJk/p5U10pc9xDgDxY5qz00 d/Jw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=EiPoJCnP; spf=pass (google.com: domain of linux-kernel+bounces-13442-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-13442-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id d13-20020ac85d8d000000b0042790849658si21168439qtx.335.2023.12.30.05.53.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 30 Dec 2023 05:53:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-13442-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=EiPoJCnP; spf=pass (google.com: domain of linux-kernel+bounces-13442-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-13442-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id A7E531C212F0 for ; Sat, 30 Dec 2023 13:53:15 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 7D2A9E57E; Sat, 30 Dec 2023 13:52:14 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="EiPoJCnP" X-Original-To: linux-kernel@vger.kernel.org Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id EC38BC8E0; Sat, 30 Dec 2023 13:52:11 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 10FAFC433C9; Sat, 30 Dec 2023 13:52:09 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1703944331; bh=wJWQwmRdH1pPYpBRNITxKPq6OkG6pHAnNrHczJWgfW4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=EiPoJCnP22eAYdYAiZX+dMT580mxQCjPUs2dBLOFiw8rPVeLqDnJruv+2nb7jbCe1 Jh9pAt/JFSL0xadph+YrfIf6J8RK+7hN0JuEXl9ygt7PFM+Kqra3bKga9vQz0c0sqk ve8xgExFEuhXu5PVQknhRGMVH+G9kmIdf9p6JlcfU/eJncNPvGXNIgrk5R2RuNRKKI rnDyo24RP9tVhZ0Nfv1OSQdDckJm+/CwxD8JMI5tm6rDBM41jIIy+DihM8ozAVilK+ YKk/VphOdSBF4ZZQUTw2jttBfSSJrZ2oLxveGl5Tfr3Y7yTPICouu1feVoufnQpHEi zZsE2u4ShRUog== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Ben Hutchings , Masahiro Yamada , Nathan Chancellor , Nick Desaulniers , Nicolas Schier , linux-kernel@vger.kernel.org Subject: [PATCH 5/5] kbuild: deb-pkg: call more misc debhelper commands Date: Sat, 30 Dec 2023 22:52:00 +0900 Message-Id: <20231230135200.1058873-5-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231230135200.1058873-1-masahiroy@kernel.org> References: <20231230135200.1058873-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786715199148341864 X-GMAIL-MSGID: 1786715199148341864 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 Reviewed-by: Nicolas Schier --- scripts/package/builddeb | 8 -------- scripts/package/debian/rules | 6 +++++- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index d31b16afe0db..e797ad360f7a 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -28,8 +28,6 @@ install_linux_image () { pname=$1 pdir=debian/$1 - rm -rf ${pdir} - # Only some architectures with OF support have this target if is_enabled CONFIG_OF_EARLY_FLATTREE && [ -d "${srctree}/arch/${SRCARCH}/boot/dts" ]; then ${MAKE} -f ${srctree}/Makefile INSTALL_DTBS_PATH="${pdir}/usr/lib/linux-image-${KERNELRELEASE}" dtbs_install @@ -97,8 +95,6 @@ install_linux_image () { install_linux_image_dbg () { pdir=debian/$1 - rm -rf ${pdir} - # Parse modules.order directly because 'make modules_install' may sign, # compress modules, and then run unneeded depmod. while read -r mod; do @@ -128,8 +124,6 @@ install_kernel_headers () { pdir=debian/$1 version=${1#linux-headers-} - rm -rf $pdir - "${srctree}/scripts/package/install-extmod-build" "${pdir}/usr/src/linux-headers-${version}" mkdir -p $pdir/lib/modules/$version/ @@ -139,8 +133,6 @@ install_kernel_headers () { install_libc_headers () { pdir=debian/$1 - rm -rf $pdir - $MAKE -f $srctree/Makefile headers_install INSTALL_HDR_PATH=$pdir/usr # move asm headers to /usr/include//asm to match the structure diff --git a/scripts/package/debian/rules b/scripts/package/debian/rules index 407f46a4a655..5c5554c70949 100755 --- a/scripts/package/debian/rules +++ b/scripts/package/debian/rules @@ -32,6 +32,9 @@ package = $($(@:binary-%=%-package)) DH_OPTIONS = -p$(package) define binary + $(Q)dh_testdir $(DH_OPTIONS) + $(Q)dh_testroot $(DH_OPTIONS) + $(Q)dh_prep $(DH_OPTIONS) $(Q)+$(MAKE) $(make-opts) run-command KBUILD_RUN_COMMAND='+$$(srctree)/scripts/package/builddeb $(package)' $(Q)dh_installdocs $(DH_OPTIONS) $(Q)dh_installchangelogs $(DH_OPTIONS) @@ -62,7 +65,8 @@ build-arch: .PHONY: clean clean: - $(Q)rm -rf debian/files debian/linux-* debian/deb-env.vars* debian/*.files + $(Q)dh_clean + $(Q)rm -rf debian/deb-env.vars* debian/*.files $(Q)$(MAKE) ARCH=$(ARCH) clean # If DEB_HOST_ARCH is empty, it is likely that debian/rules was executed