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)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 740EF158015 for ; Sat, 30 Dec 2023 16:20:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 83DF12BC044; Sat, 30 Dec 2023 16:20:40 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 66CE42BC044 for ; Sat, 30 Dec 2023 16:20:40 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 smtp.gentoo.org (Postfix) with ESMTPS id 6EB0E33CEF2 for ; Sat, 30 Dec 2023 16:20:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D06071450 for ; Sat, 30 Dec 2023 16:20:37 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1703953148.95ba46e4f667b31003463109f424cb9995d75435.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/ X-VCS-Repository: repo/gentoo X-VCS-Files: eclass/kernel-build.eclass eclass/kernel-install.eclass X-VCS-Directories: eclass/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 95ba46e4f667b31003463109f424cb9995d75435 X-VCS-Branch: master Date: Sat, 30 Dec 2023 16:20:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e4f618cb-d2b7-4584-b0dd-e36da3802480 X-Archives-Hash: 57b254b66649cfada28c5292feddc0ef commit: 95ba46e4f667b31003463109f424cb9995d75435 Author: Michał Górny gentoo org> AuthorDate: Thu Dec 28 08:55:21 2023 +0000 Commit: Michał Górny gentoo org> CommitDate: Sat Dec 30 16:19:08 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95ba46e4 kernel-{build,install}.eclass: Rename flag to modules-compress Signed-off-by: Michał Górny gentoo.org> eclass/kernel-build.eclass | 4 ++-- eclass/kernel-install.eclass | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/eclass/kernel-build.eclass b/eclass/kernel-build.eclass index 29ee9f86e7e2..28f111ec998b 100644 --- a/eclass/kernel-build.eclass +++ b/eclass/kernel-build.eclass @@ -284,7 +284,7 @@ kernel-build_src_install() { dostrip -x /lib/modules local compress=() - if [[ ${KERNEL_IUSE_GENERIC_UKI} ]] && ! use module-compress; then + if [[ ${KERNEL_IUSE_GENERIC_UKI} ]] && ! use modules-compress; then compress+=( # force installing uncompressed modules even if compression # is enabled via config @@ -560,7 +560,7 @@ kernel-build_merge_configs() { # Only semi-related but let's use that to avoid changing stable ebuilds. if [[ ${KERNEL_IUSE_GENERIC_UKI} ]]; then - # NB: we enable this even with USE=-module-compress, in order + # NB: we enable this even with USE=-modules-compress, in order # to support both uncompressed and compressed modules in prebuilt # kernels cat <<-EOF > "${WORKDIR}/module-compress.config" || die diff --git a/eclass/kernel-install.eclass b/eclass/kernel-install.eclass index 8c4d5c14fc03..af4f5d839b0e 100644 --- a/eclass/kernel-install.eclass +++ b/eclass/kernel-install.eclass @@ -79,7 +79,7 @@ _IDEPEND_BASE=" LICENSE="GPL-2" if [[ ${KERNEL_IUSE_GENERIC_UKI} ]]; then - IUSE+=" generic-uki module-compress" + IUSE+=" generic-uki modules-compress" # https://github.com/AndrewAmmerlaan/dist-kernel-log-to-licenses # This script can help with generating the array below, keep in mind # that it is not a fully automatic solution, i.e. use flags will @@ -762,11 +762,11 @@ kernel-install_pkg_config() { # @FUNCTION: kernel-install_compress_modules # @DESCRIPTION: -# Compress modules installed in ED, if USE=module-compress is enabled. +# Compress modules installed in ED, if USE=modules-compress is enabled. kernel-install_compress_modules() { debug-print-function ${FUNCNAME} "${@}" - if use module-compress; then + if use modules-compress; then einfo "Compressing kernel modules ..." # taken from scripts/Makefile.modinst find "${ED}/lib" -name '*.ko' -exec \