From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 206F22D7DEF; Mon, 10 Aug 2026 00:52:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786323123; cv=none; b=lBKf3MOYt9/2561GBh2LXPcgPPF9cPl6x082FRvcqCbE6G8sF+D+6yIYZOcJJRSTyC5zVXvnmRgNLmq2dwq1bsIB8UESu+UMjxmV0kYmxdTN6sZjk84fmnYryqB7uP15XW4aLt1iGt/qngrgIpjDmGtA6bNb0qqrI0/6av6kPX8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786323123; c=relaxed/simple; bh=nM2dMoC9G/pD2s7bbLvfTjVD9XNa6phamr5kt0s8TO0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=b0GHDDY+pKZgRhuqgtCFi3cfBtVIR8YIdnZWoqZdV8QxT6Purr4uFinrj14GRwX17CGEqiyjQbYwo3pbdTx3zzLWeTQaPaVmrviQODFmYhPqLoQ19NbUOU7yP5w+z1T7k7deMSUjuBRRK++zKIEqoIdSTkfQ8Hb3hSHBZnA8/J4= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Uivn1LVq; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Uivn1LVq" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5D01A1F00A3A; Mon, 10 Aug 2026 00:51:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1786323121; bh=ggrRAYvGehoJSzUMdpv5Zfy46CgOMVvvVvxZY+Y/wn8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Uivn1LVqV0nKvIelx0soK77LrOPcYt5jJ9Swfddt9uZR7A8ObOvQZhdh20rUyPDy8 qKGURV1q+schDHtP25+JhVws0Ywm2h3k8Ewcagz8mZ/CYYxMeuDmwdsf/Ixfjl5sBK c7Rtq1Y4OOAJVsX8gSl+tOoE7/Xj6EV/+ufzyvXM20i+EeXh/agh4wl1/cGQLl2pa/ Nq/yMUZE2+mzU10KAxzlt0zeUmd1RS9zGl2Zu84S+/2R4akH/w2qvT/YBB9T5RATaS MJms++yF1peI4QLW/oYfyl51jqOMss4fRCtnkWy8aNDEEeEFUPSZV4/jnod1+UU12r 57QH2k2jvVP6A== From: Arnaldo Carvalho de Melo To: Namhyung Kim Cc: Ingo Molnar , Thomas Gleixner , James Clark , Jiri Olsa , Ian Rogers , Adrian Hunter , Clark Williams , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Arnaldo Carvalho de Melo , Arnaldo Carvalho de Melo Subject: [PATCH 5/7] perf build: install-build-deps: add Debian devel package mapping Date: Sun, 9 Aug 2026 21:51:25 -0300 Message-ID: <20260810005127.289896-6-acme@kernel.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260810005127.289896-1-acme@kernel.org> References: <20260810005127.289896-1-acme@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Arnaldo Carvalho de Melo With the Fedora and Ubuntu mappings in place, this patch adds Debian support: Debian installs the same devel packages, under the same names, as the Ubuntu mapping, so it reuses debian_pkg_for() and debian_base_pkgs as-is, with only auto-detection in detect_distro() (and the shared apt-get install path) added, keeping the script's per-distro dispatch ready for distros with their own package names. Validated on a fresh Debian 13 (trixie) container so the host system is not modified: distrobox create --image debian:trixie distrobox enter debian-trixie make -C tools/perf install-build-deps which installed the 29 mapped packages; re-running the target is a no-op (apt-get reports "0 newly installed"). A subsequent clean build enabled the same feature set as Ubuntu: 'perf version --build-options' shows every feature with an external dependency Debian has a package for [on], including the BPF skeletons compiled with clang/llvm (libLLVM), the python binding and the C++-based features, with only the deliberately unmapped libbfd family, libperl, libunwind and the CoreSight (libopencsd) packages [OFF]. RHEL, whose package mapping is largely similar to Fedora's, is the remaining planned distro, to be enabled once that mapping is validated on it. Assisted-by: opencode:deepseek-v4-flash-free Signed-off-by: Arnaldo Carvalho de Melo Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/Makefile.perf | 3 +- tools/perf/scripts/install-build-deps.sh | 37 +++++++++++++----------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index e1fc75b4621faed5..29cfd44c427f33ba 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -900,7 +900,8 @@ install: install-bin try-install-man # Install the development packages needed to build perf, derived from the # feature tests in tools/build/feature/. Currently supported: the Fedora -# (dnf) and Ubuntu (apt) package mappings, see the script. +# (dnf), Ubuntu (apt) and Debian (apt, reusing the Ubuntu mapping) +# package mappings, see the script. # INSTALL_BUILD_DEPS_ARGS, when set, is passed to the script, so # extra options like --list, --dry-run or --distro can be given from make. install-build-deps: diff --git a/tools/perf/scripts/install-build-deps.sh b/tools/perf/scripts/install-build-deps.sh index d725621bd7d70e7f..4a6f4bda49094696 100755 --- a/tools/perf/scripts/install-build-deps.sh +++ b/tools/perf/scripts/install-build-deps.sh @@ -26,12 +26,17 @@ # distrobox create --image ubuntu:26.04 # distrobox enter ubuntu-26-04 # +# - Debian, on apt-get, reusing the Ubuntu mapping, validated on +# Debian 13 (trixie), in a distrobox container: +# +# distrobox create --image debian:trixie +# distrobox enter debian-trixie +# # Running inside a container keeps the host system unmodified. # -# Debian, which shares the Ubuntu package mapping, is the next planned -# distro to be enabled once that mapping is validated on a Debian -# release (trixie), as is RHEL support, once its (largely similar to -# Fedora) package mapping is validated there. +# RHEL support, whose package mapping is largely similar to Fedora's, +# is the next planned distro, to be enabled once that mapping is +# validated there. # # Usage: install-build-deps.sh [OPTIONS] # @@ -39,7 +44,7 @@ # --list list the packages that would be installed, then exit # --dry-run show the install command that would be run, without # running it -# --distro ID force a distro: fedora, ubuntu (default: auto-detect) +# --distro ID force a distro: fedora, ubuntu, debian (default: auto-detect) # -h, --help print this help message # # Requires root (or passwordless sudo) to actually install packages. @@ -61,12 +66,13 @@ it, so the corresponding feature gets enabled on a build. Options: --list list the packages that would be installed, then exit --dry-run show the install command that would be run, without running it - --distro ID force a distro: fedora, ubuntu + --distro ID force a distro: fedora, ubuntu, debian -h, --help print this help message Distros supported: Fedora (dnf), validated in a toolbx container on -Fedora 44, and Ubuntu (apt-get), validated in a distrobox container on -Ubuntu 26.04. +Fedora 44, Ubuntu (apt-get), validated in a distrobox container on +Ubuntu 26.04, and Debian (apt-get), reusing the Ubuntu mapping, +validated in a distrobox container on Debian 13 (trixie). EOF exit 0 } @@ -173,8 +179,7 @@ fedora_pkg_for() { # Return the Debian/Ubuntu package(s) providing the devel requirements # of a feature test in tools/build/feature/. This mapping is shared by # Debian and Ubuntu, whose package names for these devel packages match, -# and is validated on Ubuntu 26.04; Debian (trixie) will be enabled -# once the same mapping is validated on it. +# and is validated on Ubuntu 26.04 and Debian 13 (trixie). # --------------------------------------------------------------------- debian_pkg_for() { local feat="$1" @@ -281,9 +286,7 @@ detect_distro() { case "$id" in fedora) echo "fedora" ;; ubuntu) echo "ubuntu" ;; - # Debian shares the Ubuntu package mapping, but it is only validated - # on Ubuntu so far, so don't auto-detect it yet. - debian) echo "" ;; + debian) echo "debian" ;; # RHEL and its derivatives share most Fedora package names, but the # mapping is only validated on Fedora, so don't auto-detect them. rhel|centos|rocky|alma|ol) echo "" ;; @@ -315,7 +318,7 @@ package_set() { local feat pkg pkgs case "$distro" in fedora) pkgs="$fedora_base_pkgs" ;; - ubuntu) pkgs="$debian_base_pkgs" ;; + ubuntu|debian) pkgs="$debian_base_pkgs" ;; esac for feat in $(feature_tests "$srcdir"); do @@ -345,7 +348,7 @@ install_cmd() { fedora) echo "dnf install -y $*" ;; - ubuntu) + ubuntu|debian) # a fresh container has no package index, so update first. echo "apt-get update && apt-get install -y $*" ;; @@ -374,10 +377,10 @@ main() { srcdir=$(cd "$(dirname "$0")/../../.." && pwd) distro=$(detect_distro) case "$distro" in - fedora|ubuntu) ;; + fedora|ubuntu|debian) ;; *) echo "error: unsupported distro (got '$distro'); the package mapping is not validated on other distros." >&2 - echo "Supported and validated: Fedora 44 (toolbx container), Ubuntu 26.04 (distrobox container)." >&2 + echo "Supported and validated: Fedora 44 (toolbx container), Ubuntu 26.04 and Debian 13 (distrobox containers)." >&2 exit 1 ;; esac -- 2.55.0