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 7E349158015 for ; Thu, 28 Dec 2023 10:36:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79B902BC0CB; Thu, 28 Dec 2023 10:35:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 27A182BC0C8 for ; Thu, 28 Dec 2023 10:35:43 +0000 (UTC) From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= To: gentoo-dev@lists.gentoo.org Cc: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Subject: [gentoo-dev] [PATCH 2/4] kernel-{build,install}.eclass: Rename flag to modules-compress Date: Thu, 28 Dec 2023 11:35:34 +0100 Message-ID: <20231228103536.420981-2-mgorny@gentoo.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231228103536.420981-1-mgorny@gentoo.org> References: <20231228103536.420981-1-mgorny@gentoo.org> 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-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Archives-Salt: 239ee868-7432-4526-8c56-4638af1c23bf X-Archives-Hash: bf190082e1d4076b2b25bf6bc71e12a3 Signed-off-by: Michał Górny --- 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 \ -- 2.43.0