From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 53F34159C9B for ; Tue, 6 Aug 2024 19:06:40 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DAFCF2BC078; Tue, 6 Aug 2024 19:06:35 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7A40B2BC022 for ; Tue, 6 Aug 2024 19:06:35 +0000 (UTC) From: Andrew Ammerlaan To: gentoo-dev@lists.gentoo.org Cc: Andrew Ammerlaan Subject: [gentoo-dev] [PATCH 1/4] dist-kernel-utils.eclass: fix module cleanup when using binpkgs Date: Tue, 6 Aug 2024 21:06:13 +0200 Message-ID: <20240806190616.25975-1-andrewammerlaan@gentoo.org> X-Mailer: git-send-email 2.45.2 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: d3c726bd-ae3f-4061-9e41-8a12e265a904 X-Archives-Hash: 0040a7a2eece40b95c1bc069ae648f11 When installing a binpkg -nt is not a good check because the modules in the binpkg we are installing may actually be older then what we have in root. Instead introduce a new function dist-kernel_get_module_suffix to find the desired compression based on USE=modules-sign and the kernel config. Then, remove only those files that do not match our desired compression. Signed-off-by: Andrew Ammerlaan --- eclass/dist-kernel-utils.eclass | 59 +++++++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 10 deletions(-) diff --git a/eclass/dist-kernel-utils.eclass b/eclass/dist-kernel-utils.eclass index 4bc3fab44aae..0b0eb0ec8818 100644 --- a/eclass/dist-kernel-utils.eclass +++ b/eclass/dist-kernel-utils.eclass @@ -1,4 +1,4 @@ -# Copyright 2020-2023 Gentoo Authors +# Copyright 2020-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 # @ECLASS: dist-kernel-utils.eclass @@ -159,6 +159,35 @@ dist-kernel_PV_to_KV() { echo "${kv}" } +# @FUNCTION: dist-kernel_get_module_suffix +# @USAGE: +# @DESCRIPTION: +# Returns the suffix for kernel modules based on the CONFIG_MODULES_COMPESS_* +# setting in the kernel config and USE=modules-compress. +dist-kernel_get_module_suffix() { + debug-print-function ${FUNCNAME} "${@}" + + [[ ${#} -eq 1 ]] || die "${FUNCNAME}: invalid arguments" + + local config=${1}/.config + + if ! in_iuse modules-compress || ! use modules-compress; then + echo .ko + elif [[ ! -r ${config} ]]; then + die "Cannot find kernel config ${config}" + elif grep -q "CONFIG_MODULE_COMPRESS_NONE=y" "${config}"; then + echo .ko + elif grep -q "CONFIG_MODULE_COMPRESS_GZIP=y" "${config}"; then + echo .ko.gz + elif grep -q "CONFIG_MODULE_COMPRESS_XZ=y" "${config}"; then + echo .ko.xz + elif grep -q "CONFIG_MODULE_COMPRESS_ZSTD=y" "${config}"; then + echo .ko.zst + else + die "Module compression is enabled, but compressor not known" + fi +} + # @FUNCTION: dist-kernel_compressed_module_cleanup # @USAGE: # @DESCRIPTION: @@ -169,20 +198,29 @@ dist-kernel_compressed_module_cleanup() { [[ ${#} -ne 1 ]] && die "${FUNCNAME}: invalid arguments" local path=${1} - local basename f + local preferred=$(dist-kernel_get_module_suffix "${path}/source") + local basename suffix while read -r basename; do local prev= - for f in "${path}/${basename}"{,.gz,.xz,.zst}; do - if [[ ! -e ${f} ]]; then - continue + for suffix in .ko .ko.gz .ko.xz .ko.zst; do + [[ ${suffix} == ${preferred} ]] && continue + local current=${path}/${basename}${suffix} + [[ -f ${current} ]] || continue + + if [[ -f ${path}/${basename}${preferred} ]]; then + # If the module with the desired compression exists, remove + # all other variations. + rm -v "${current}" || die elif [[ -z ${prev} ]]; then - prev=${f} - elif [[ ${f} -nt ${prev} ]]; then + # If not, then keep whichever of the duplicate modules is the + # newest. Normally you should not end up here. + prev=${current} + elif [[ ${current} -nt ${prev} ]]; then rm -v "${prev}" || die - prev=${f} + prev=${current} else - rm -v "${f}" || die + rm -v "${current}" || die fi done done < <( @@ -192,7 +230,8 @@ dist-kernel_compressed_module_cleanup() { -o -name '*.ko.gz' \ -o -name '*.ko.xz' \ -o -name '*.ko.zst' \ - \) | sed -e 's:[.]\(gz\|xz\|zst\)$::' | sort | uniq -d || die + \) | sed -e 's:[.]ko\(\|[.]gz\|[.]xz\|[.]zst\)$::' | + sort | uniq -d || die ) } -- 2.45.2