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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 11B72138338 for ; Tue, 26 Mar 2019 08:07:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E7B1AE088A; Tue, 26 Mar 2019 08:07:16 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C0FFDE088A for ; Tue, 26 Mar 2019 08:07:16 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 2D54A335CF8 for ; Tue, 26 Mar 2019 08:07:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 97B2057F for ; Tue, 26 Mar 2019 08:07:13 +0000 (UTC) From: "Thomas Deutschmann" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Deutschmann" Message-ID: <1553584326.96f9bf6c921591e8ada22945029b50637e974567.whissi@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_configkernel.sh X-VCS-Directories: / X-VCS-Committer: whissi X-VCS-Committer-Name: Thomas Deutschmann X-VCS-Revision: 96f9bf6c921591e8ada22945029b50637e974567 X-VCS-Branch: master Date: Tue, 26 Mar 2019 08:07:13 +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: 1e83936f-9496-48de-a68d-db5381026e21 X-Archives-Hash: 663981e79d0dc30347e8088385e34335 commit: 96f9bf6c921591e8ada22945029b50637e974567 Author: Thomas Deutschmann gentoo org> AuthorDate: Tue Mar 26 03:40:05 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Tue Mar 26 07:12:06 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=96f9bf6c config_kernel(): rewrite CONFIG_MODULE handling Signed-off-by: Thomas Deutschmann gentoo.org> gen_configkernel.sh | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/gen_configkernel.sh b/gen_configkernel.sh index a8627b4..27704cf 100755 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -149,21 +149,26 @@ config_kernel() { # Do we support modules at all? cfg_CONFIG_MODULES=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MODULES") - if isTrue "$cfg_CONFIG_MODULES" ; then + if isTrue "${cfg_CONFIG_MODULES}" + then # yes, we support modules, set 'm' for new stuff. newcfg_setting='m' # Compare the kernel module compression vs the depmod module compression support # WARNING: if the buildhost has +XZ but the target machine has -XZ, you will get failures! cfg_CONFIG_MODULE_COMPRESS_GZIP=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MODULE_COMPRESS_GZIP") cfg_CONFIG_MODULE_COMPRESS_XZ=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_MODULE_COMPRESS_XZ") - if isTrue "${cfg_CONFIG_MODULE_COMPRESS_GZIP}"; then + if isTrue "${cfg_CONFIG_MODULE_COMPRESS_GZIP}" + then depmod_GZIP=$(/sbin/depmod -V | tr ' ' '\n' | awk '/ZLIB/{print $1; exit}') - if [[ "${depmod_GZIP}" != "+ZLIB" ]]; then + if [[ "${depmod_GZIP}" != "+ZLIB" ]] + then gen_die 'depmod does not support ZLIB/GZIP, cannot build with CONFIG_MODULE_COMPRESS_GZIP' fi - elif isTrue "${cfg_CONFIG_MODULE_COMPRESS_XZ}" ; then + elif isTrue "${cfg_CONFIG_MODULE_COMPRESS_XZ}" + then depmod_XZ=$(/sbin/depmod -V | tr ' ' '\n' | awk '/XZ/{print $1; exit}') - if [[ "${depmod_XZ}" != "+XZ" ]]; then + if [[ "${depmod_XZ}" != "+XZ" ]] + then gen_die 'depmod does not support XZ, cannot build with CONFIG_MODULE_COMPRESS_XZ' fi fi