From patchwork Tue Dec 19 18:19:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 181203 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp2140468dyi; Tue, 19 Dec 2023 10:29:17 -0800 (PST) X-Google-Smtp-Source: AGHT+IGVKzdW+olBqKPu3vdXbIhTyHVnPNZQxRSUnd5p+nFMRg5IfQUcFntzIH4H2+PdS57cHT25 X-Received: by 2002:a17:903:244e:b0:1d3:d3a6:1549 with SMTP id l14-20020a170903244e00b001d3d3a61549mr2581993pls.57.1703010556954; Tue, 19 Dec 2023 10:29:16 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703010556; cv=none; d=google.com; s=arc-20160816; b=vZ+jR0N4WdtZmXtlCA2j8+qT6M7SGD3sMYJiyTqv6pZBDbvCxWvPH5V0LpGJqy+/bm /4THf5XB9OywhLPGxIqT8sUcCVNGmB03MBUfHITQGn6QRmewPsEgkVDpwE9oqEjW0jjq v6oe+/aj5WIAcFbUq7G8Io0xg2uoeZviLAHUkLkTQ0iJsEqkuuQMAI6yowezhQyL7bdk KV86hmHEarqXAVP+8sN+icIullyrh7ioZ+0yKEOjSW/VZLVGiYM00mzYLNwQKE1PkDT6 Q3D49MDlmV5WyxWUICZYyPl/yhSA5IzkjRvHEygukjtXwRBiWoqmYNZp+v1MCDzCFT6f F2ww== 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:message-id:date:subject:cc:to :from:dkim-signature; bh=fgyNfYSD14MaGL4bNdiVkx2f/JLHfQryf+ry4uE7wyQ=; fh=5gYN4msaJmwnN8mGpibv8VZnTy0MtvGQcf5D09XpoaQ=; b=l5crgroQ1YhlL49CFjOthrABRj+2JtoMnwLn8L4qrPp8wbJgiFU+tC6Osv9M+XfOg6 PSnH9UYIpicL7yKVOVS5LBW7oO7NuKKzMIr/6s2AZC3z6EHx13c6MFR9dCGJd/SfzhYP rh6w/TH44CnIQ1MxY+8pn/kzvpZzBl8QPD1ytmCYCb0R/b0Et0FMjcfBgz/tu9A+BCUF w+Ap9sWP0NZYSHiJ0w1SKk0vYgQKnd3tvbumzu7Cb17mfSnjqR7Q5zX1IO2qbM4Bdsub yGHUN4mjNsBFFjb4AeykazQA6skaREFIj8wwAa7GoEqrnb305a+CZsx73ckUcojJP2ZC UipA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qYF1DQSO; spf=pass (google.com: domain of linux-kernel+bounces-5800-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-5800-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [147.75.48.161]) by mx.google.com with ESMTPS id t6-20020a1709028c8600b001d08f1a5c70si9115327plo.405.2023.12.19.10.29.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 10:29:16 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-5800-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) client-ip=147.75.48.161; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=qYF1DQSO; spf=pass (google.com: domain of linux-kernel+bounces-5800-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.48.161 as permitted sender) smtp.mailfrom="linux-kernel+bounces-5800-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 sy.mirrors.kernel.org (Postfix) with ESMTPS id A08C7B25139 for ; Tue, 19 Dec 2023 18:20:26 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id B391A38FAD; Tue, 19 Dec 2023 18:20:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="qYF1DQSO" 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 E23EF37D22; Tue, 19 Dec 2023 18:20:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 177D0C433C8; Tue, 19 Dec 2023 18:20:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1703010003; bh=aInprk0ngpVeNnqzMh3MIxqFI0iItoCxCcQKP9eY+0g=; h=From:To:Cc:Subject:Date:From; b=qYF1DQSOUwWbonEZuQnUedchL1AA/rl6qHM2alJs8EwfCOZZWCbd89Y/ZY94Bp+fF UFk0cuWkuNhE6dXiikjazDtGwu7SV+flwC63uGVnlX25OI9qRt2D62SSgqo71dILjx vby74RHSBwqsvMItLWyOZwvI9e0Pw23mG8W8hnGGYv4YvPtYh4cqycU9y/kLazRQZe KFzYAnIiO9sHI1Zht7+kBno+E9F4QNfGe12UW8RD6yvV4wKkcGTnZto9mqkM9Cc2YS XoDb2rPX0ZAC9+CoKmPcOvnFhiJmDEgSdR8dVen6l5iS6kIpNpwWDHORbXuPbecXt7 L32q1BN8wU5WA== 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 1/3] kbuild: deb-pkg: do not query DEB_HOST_MULTIARCH Date: Wed, 20 Dec 2023 03:19:55 +0900 Message-Id: <20231219181957.1449958-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 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: 1785735998263558321 X-GMAIL-MSGID: 1785735998263558321 Since commit 491b146d4c13 ("kbuild: builddeb: Eliminate debian/arch use"), the direct execution of debian/rules fails with: dpkg-architecture: error: unknown option 'DEB_HOST_MULTIARCH' I am not sure how important to support such a use case, but at least the current code: dpkg-architecture -a$DEB_HOST_ARCH -qDEB_HOST_MULTIARCH ... looks weird because: - For this code to work correctly, DEB_HOST_ARCH must be defined. In this case, DEB_HOST_MULTIARCH is likely defined, so there is no need to query DEB_HOST_MULTIARCH in the first place. This is likely the case where the package build was initiated by dpkg-buildpackage. - If DEB_HOST_MULTIARCH is undefined, DEB_HOST_ARCH is likely undefined. So, you cannot query DEB_HOST_MULTIARCH in this way. This is mostly the case where debian/rules is directly executed. If we want to run debian/rules directly, we can revert 491b146d4c13 or add code to remember DEB_HOST_MULTIARCH, but I chose to remove the useless code for now. Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier --- scripts/package/builddeb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 2fe51e6919da..2eb4910f0ef3 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -171,9 +171,8 @@ install_libc_headers () { # move asm headers to /usr/include//asm to match the structure # used by Debian-based distros (to support multi-arch) - host_arch=$(dpkg-architecture -a$DEB_HOST_ARCH -qDEB_HOST_MULTIARCH) - mkdir $pdir/usr/include/$host_arch - mv $pdir/usr/include/asm $pdir/usr/include/$host_arch/ + mkdir "$pdir/usr/include/${DEB_HOST_MULTIARCH}" + mv "$pdir/usr/include/asm" "$pdir/usr/include/${DEB_HOST_MULTIARCH}" } rm -f debian/files From patchwork Tue Dec 19 18:19:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 181204 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp2141319dyi; Tue, 19 Dec 2023 10:30:39 -0800 (PST) X-Google-Smtp-Source: AGHT+IFSXhgOh5SWtmxJuGs2VjboJ2cg48owSFjDqaXr3rz0Vfdrq45VOKl4fkI7HntdikQLSl0p X-Received: by 2002:a17:90b:11d8:b0:28b:77d1:85b8 with SMTP id gv24-20020a17090b11d800b0028b77d185b8mr2345238pjb.97.1703010639475; Tue, 19 Dec 2023 10:30:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703010639; cv=none; d=google.com; s=arc-20160816; b=Bh5VlO4gKZUTvJyYtC80byucns4mvMxXs/wnGujkxy6ZFDGjkY1TbNBNjzSi8l+Iyj thn4dMidQSlSRaBp9afHrjejaRoiH8XQB5hohWLbcwLdLethCtd59sXJMziQuBjUbgCT XgnK/2SDA8G4iwoe5jrBGW8kCapTY7s1dbNiqtghsttjI+3kC5MWHdiKDl9U7ioOrbl4 RZsfYlUQhy09njvzJ2ZRGyMEL6MW8Fc1pvYjQBH2nVld1NmwetN5kJa+PfuIteJHEP4Z UnhY7N+9zD1o7AoE9lkrfiQkpBKAxlzFYBve1rHVdRWJjvTemyBNEKdCraoFP45shaBq y9QQ== 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=zRugye1vAtyT30/V1HveHUAwzsC+/sTI6mHNDoSK2S8=; fh=5gYN4msaJmwnN8mGpibv8VZnTy0MtvGQcf5D09XpoaQ=; b=wluVIDrcGAFqzuzZmHdQW2iZBnt3lL5U4VMBMPXEi3y08qCm+ZP9z3KPXDzSgwbp1c YLgR6OaiwsQV094yXVyo0YXpFX4eDStsALrl6pLDokKrWqJQqFPLaOC9BYlizttIIC3F h1EqTv77IhMiByV01Fw7z7hsahK4gbG62Jf2G/WDk3eWctb6idTe5rPJ0wIwkYassbCC 6oxb/4J75K3UxmHaa290CBhykVyGK2suu35VKsM+WFbFUEj88DpheVKHLwTMty+5+E7b gnP4c4XCljyPQP1S4zXqDZo9OYDL4fKmlTASoNTJLhwCCLksbwcIzb+Dy7cWzNY6u6aj LSqw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Cbjnk3Od; spf=pass (google.com: domain of linux-kernel+bounces-5801-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-5801-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id w14-20020a17090a8a0e00b0028ba5af7bcesi1589949pjn.109.2023.12.19.10.30.39 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 10:30:39 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-5801-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=Cbjnk3Od; spf=pass (google.com: domain of linux-kernel+bounces-5801-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-5801-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 2B4B3289B7B for ; Tue, 19 Dec 2023 18:20:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1B9593985B; Tue, 19 Dec 2023 18:20:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Cbjnk3Od" 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 5170337D11; Tue, 19 Dec 2023 18:20:05 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AE844C433C9; Tue, 19 Dec 2023 18:20:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1703010004; bh=AaFL2QfFHAQnWIfLNvEB+DuhYCBztejbdLjDhGWXvY8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Cbjnk3Od9pe0nhW2pQ5anOAp0pBEoTzfI6g55UqQsO2aS2U70MCYydnkIk1Rwv8rD fypHHP3Stmizb7qeEn2IF7y2Vr6MIT77+ILqW1Em29qfgMqvwoKwTbBjehzVbgK9up pLEg+b4xGwiir+nDHVeRXwdQXP25H1p/A0U9suwZpO7Vb+1x9/GRvgiWJ1Mya2rn9H cN5BEF9Q6Bmfj3VM8qYxbyTFIjYI+ZOGb7NOfVUm8DdDw/CZ6Cy11Sn17kE4W8Jbos XRuthpHzn150f9gxEBnhJKLobHfMgBUdlj6gHyPX7sCmJhUvSN38nx6XInZJ85Ih+M uLWtezgbQvuvw== 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 2/3] kbuild: deb-pkg: hard-code Build-Depends Date: Wed, 20 Dec 2023 03:19:56 +0900 Message-Id: <20231219181957.1449958-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231219181957.1449958-1-masahiroy@kernel.org> References: <20231219181957.1449958-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: 1785736084587561257 X-GMAIL-MSGID: 1785736084587561257 The condition to require libelf-dev:native is stale because objtool is now enabled by CONFIG_OBJTOOL instead of CONFIG_UNWINDER_ORC. Not only objtool but also resolve_btfids requires libelf-dev:native; therefore, CONFIG_DEBUG_INFO_BTF should be checked as well. Similarly, CONFIG_SYSTEM_TRUSTED_KEYRING is not the only case that requires libssl-dev:native. Perhaps, the following code would provide better coverage, but it is hard to maintain (and may still be imperfect). if is_enabled CONFIG_OBJTOOL || is_enabled CONFIG_DEBUG_INFO_BTF; then build_depends="${build_depends}, libelf-dev:native" fi if is_enabled CONFIG_SYSTEM_TRUSTED_KEYRING || is_enabled CONFIG_SYSTEM_REVOCATION_LIST || is_enabled CONFIG_MODULE_SIG_FORMAT; then build_depends="${build_depends}, libssl-dev:native" fi Let's hard-code the build dependency. Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier --- scripts/package/mkdebian | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index 91f0e09600b1..93a24712b9a1 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -176,8 +176,6 @@ else fi echo $debarch > debian/arch -extra_build_depends=", $(if_enabled_echo CONFIG_UNWINDER_ORC libelf-dev:native)" -extra_build_depends="$extra_build_depends, $(if_enabled_echo CONFIG_SYSTEM_TRUSTED_KEYRING libssl-dev:native)" # Generate a simple changelog template cat < debian/changelog @@ -195,7 +193,8 @@ Section: kernel Priority: optional Maintainer: $maintainer Rules-Requires-Root: no -Build-Depends: bc, debhelper, rsync, kmod, cpio, bison, flex $extra_build_depends +Build-Depends: debhelper +Build-Depends-Arch: bc, bison, cpio, flex, kmod, libelf-dev:native, libssl-dev:native, rsync Homepage: https://www.kernel.org/ Package: $packagename-$version From patchwork Tue Dec 19 18:19:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 181206 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:24d3:b0:fb:cd0c:d3e with SMTP id r19csp2142099dyi; Tue, 19 Dec 2023 10:31:47 -0800 (PST) X-Google-Smtp-Source: AGHT+IEPo10tGakUyMis0REVpuNQw7IBTuPSFO5iMHzy7IiEWj3vA3hY5mZ/LuSoOkbBNWMaqfRh X-Received: by 2002:a92:c24b:0:b0:35d:59a2:bb0 with SMTP id k11-20020a92c24b000000b0035d59a20bb0mr17010468ilo.70.1703010706920; Tue, 19 Dec 2023 10:31:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703010706; cv=none; d=google.com; s=arc-20160816; b=f6Q8Ynn1ol2QATU329E1IfbozOj8wo3sUhvG+gQMD/QeMgWN5qWa5liyQmnYO74kNs 2W5XCVB95U3lKZ9Mb7muI1y9xuHnNqTc2TjYJrnGhxmTPBi6GQ7nfSphrcOxNy/Xs1oU 5kx9ElBeB1XnSEtvOaSVbOL5j577GdQ+2YCM8nRXrLdGqGaXrrYlmHr5VuKC+vE2IfAn BGQsxExEfWtpYGKzZ6UvO7Kk0saX1trLMags7jrKRDVLUK2lShXDO/KFfKEVS1K/0l21 tYHGwfi2Wwmr7/nMqq7mqXfy4LOF/dG7uNeUWnzgSpOERVdyDhVcmzpSMwlXlYZy5o13 pkMA== 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=+qNQstHpIaIeGuPwwFLsXpZv0J0cTCVBefh0TUs/1vc=; fh=5gYN4msaJmwnN8mGpibv8VZnTy0MtvGQcf5D09XpoaQ=; b=N0UFDck5YUzs9nQ57TfAGUyUTC6hJNBQLAe7Fwt4JaTvrmk9TBQyAVukcK6k+01MND RPXsDxhCD69buH621pvwrpofNWaezb2XNQXTaCSDCyIKQlte9jNP6WN4Z/sxQWejEkdB 9h7kf0i0HqPk+StiPoRERAR4XyJd8de8zZFDpsusHn1a4QvTOrYrlJRvjroeadCYKRtA gi4sx4Q6HTa/nv37wT3WG1EwWU//eNThm0JyARNOJ0vAtQLLZyaAp4fc6SbJcFAgyG/r DrsrUVMerRlP2GAJI2TYODwsEncSC7FRjlsomMrsCN6SsG8RNof+MaUmSuUHWDz4ctKm R6iQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kZXKGT46; spf=pass (google.com: domain of linux-kernel+bounces-5802-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-5802-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id u26-20020a63141a000000b005c605cdc2b5si5475736pgl.186.2023.12.19.10.31.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Dec 2023 10:31:46 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-5802-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=kZXKGT46; spf=pass (google.com: domain of linux-kernel+bounces-5802-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-5802-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id 6200F289DED for ; Tue, 19 Dec 2023 18:20:43 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id ABC2539ACD; Tue, 19 Dec 2023 18:20:10 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kZXKGT46" 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 07A5738F82; Tue, 19 Dec 2023 18:20:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4AD71C433CA; Tue, 19 Dec 2023 18:20:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1703010006; bh=u2yNd+lyopnSLnXJeDa3LJGhWEvy/TMKtwvC5M0a7Ws=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kZXKGT46jQErrazVLLjVnqEPJRKZcTtFbw06T5JzLr6QTPz651LM0LFD2RuLvMNuB iLtS4hqQq6fueB5NQUI7mXOKTZnw3WONPrXHc2mhX2IrntrWRSUPCnKTZ3HiqjcgdD jJDHLrYJTAdm0GuvwW028e2bGowwSPWyi7rDdYC0NFcrBbQ5yVsa5HOMqMNqrz6k/e 9NAThsH1cXK2aiB729StJvWq9ywCXw+oUVTXaygvGhG5yQPOoaKvbbqgVt8tHRCwJo xOB3QtjaTKtktcxl2BE5/KEZARoEi0LGPKSndHKxQVR72/jYBylMqqjFJxddP+J2ZN TsChWO3GKq+Jw== 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 3/3] kbuild: deb-pkg: use more debhelper commands Date: Wed, 20 Dec 2023 03:19:57 +0900 Message-Id: <20231219181957.1449958-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231219181957.1449958-1-masahiroy@kernel.org> References: <20231219181957.1449958-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: 1785736154921035429 X-GMAIL-MSGID: 1785736154921035429 Commit 36862e14e316 ("kbuild: deb-pkg: use dh_listpackages to know enabled packages") started to require the debhelper tool suite. Use more dh_* commands in create_package(): - dh_installdocs to install copyright - dh_installchangelogs to install changelog - dh_compress to compress changelog - dh_fixperms to replace the raw chmod command - dh_gencontrol to replace the raw dpkg-gencontrol command - dh_md5sums to record the md5sum of included files - dh_builddeb to replace the raw dpkg-deb command Signed-off-by: Masahiro Yamada Reviewed-by: Nicolas Schier --- scripts/package/builddeb | 23 ++++++++--------------- scripts/package/mkdebian | 2 +- 2 files changed, 9 insertions(+), 16 deletions(-) diff --git a/scripts/package/builddeb b/scripts/package/builddeb index 2eb4910f0ef3..436d55a83ab0 100755 --- a/scripts/package/builddeb +++ b/scripts/package/builddeb @@ -26,23 +26,16 @@ if_enabled_echo() { create_package() { local pname="$1" pdir="$2" - local dpkg_deb_opts - mkdir -m 755 -p "$pdir/DEBIAN" - mkdir -p "$pdir/usr/share/doc/$pname" - cp debian/copyright "$pdir/usr/share/doc/$pname/" - cp debian/changelog "$pdir/usr/share/doc/$pname/changelog.Debian" - gzip -n -9 "$pdir/usr/share/doc/$pname/changelog.Debian" - sh -c "cd '$pdir'; find . -type f ! -path './DEBIAN/*' -printf '%P\0' \ - | xargs -r0 md5sum > DEBIAN/md5sums" + export DH_OPTIONS="-p${pname} -P${pdir}" - # a+rX in case we are in a restrictive umask environment like 0077 - # ug-s in case we build in a setuid/setgid directory - chmod -R go-w,a+rX,ug-s "$pdir" - - # Create the package - dpkg-gencontrol -p$pname -P"$pdir" - dpkg-deb --root-owner-group ${KDEB_COMPRESS:+-Z$KDEB_COMPRESS} --build "$pdir" .. + dh_installdocs + dh_installchangelogs + dh_compress + dh_fixperms + dh_gencontrol + dh_md5sums + dh_builddeb -- ${KDEB_COMPRESS:+-Z$KDEB_COMPRESS} } install_linux_image () { diff --git a/scripts/package/mkdebian b/scripts/package/mkdebian index 93a24712b9a1..070149c985fe 100755 --- a/scripts/package/mkdebian +++ b/scripts/package/mkdebian @@ -193,7 +193,7 @@ Section: kernel Priority: optional Maintainer: $maintainer Rules-Requires-Root: no -Build-Depends: debhelper +Build-Depends: debhelper-compat (= 12) Build-Depends-Arch: bc, bison, cpio, flex, kmod, libelf-dev:native, libssl-dev:native, rsync Homepage: https://www.kernel.org/