Message ID | 20231219181957.1449958-2-masahiroy@kernel.org |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel+bounces-5801-ouuuleilei=gmail.com@vger.kernel.org> 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 <ouuuleilei@gmail.com> (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 <ouuuleilei@gmail.com>; 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 <masahiroy@kernel.org> To: linux-kbuild@vger.kernel.org Cc: Ben Hutchings <ben@decadent.org.uk>, Masahiro Yamada <masahiroy@kernel.org>, Nathan Chancellor <nathan@kernel.org>, Nick Desaulniers <ndesaulniers@google.com>, Nicolas Schier <nicolas@fjasle.eu>, 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: <linux-kernel.vger.kernel.org> List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org> List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1785736084587561257 X-GMAIL-MSGID: 1785736084587561257 |
Series |
[1/3] kbuild: deb-pkg: do not query DEB_HOST_MULTIARCH
|
|
Commit Message
Masahiro Yamada
Dec. 19, 2023, 6:19 p.m. UTC
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 <masahiroy@kernel.org>
---
scripts/package/mkdebian | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
Comments
On Wed, Dec 20, 2023 at 03:19:56AM +0900, Masahiro Yamada wrote: > 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 <masahiroy@kernel.org> > --- Reviewed-by: Nicolas Schier <n.schier@avm.de>
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 <<EOF > 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