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 877E0138335 for ; Sun, 29 Dec 2019 04:04:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 29A2DE0B01; Sun, 29 Dec 2019 04:04:01 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 05C67E0AF8 for ; Sun, 29 Dec 2019 04:04:00 +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 5E34334DCAA for ; Sun, 29 Dec 2019 04:03:59 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D75AB43 for ; Sun, 29 Dec 2019 04:03:56 +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: <1577591961.8a8dfb63344f1131b3960aeaacda24a7711e07c2.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: 8a8dfb63344f1131b3960aeaacda24a7711e07c2 X-VCS-Branch: master Date: Sun, 29 Dec 2019 04:03:56 +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: 0078dbcd-3165-48ac-9fcb-f1f9cb163868 X-Archives-Hash: 74af19c9b09411e897a93f8cc7f2c01e commit: 8a8dfb63344f1131b3960aeaacda24a7711e07c2 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Dec 29 03:59:21 2019 +0000 Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Dec 29 03:59:21 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=8a8dfb63 gen_configkernel.sh: config_kernel(): Make sure that CONFIG_INITRAMFS_SOURCE is unset Ensure that CONFIG_INITRAMFS_SOURCE is unset to avoid clashing with --integrated-initramfs. Signed-off-by: Thomas Deutschmann gentoo.org> gen_configkernel.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/gen_configkernel.sh b/gen_configkernel.sh index 7840491..dd47df6 100755 --- a/gen_configkernel.sh +++ b/gen_configkernel.sh @@ -224,6 +224,18 @@ config_kernel() { local -a required_kernel_options [ -f "${KCONFIG_MODIFIED_MARKER}" ] && rm "${KCONFIG_MODIFIED_MARKER}" + # --integrated-initramfs handling + if isTrue "${INTEGRATED_INITRAMFS}" + then + local cfg_CONFIG_INITRAMFS_SOURCE=$(kconfig_get_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_SOURCE") + if [[ -n "${cfg_CONFIG_INITRAMFS_SOURCE}" && ${#cfg_CONFIG_INITRAMFS_SOURCE} -gt 2 ]] + then + # Checking value length to allow 'CONFIG_INITRAMFS_SOURCE=' and 'CONFIG_INITRAMFS_SOURCE=""' + print_info 2 "$(get_indent 1)>> CONFIG_INITRAMFS_SOURCE is already set; Unsetting to avoid clashing with --integrated-initramfs ..." + kconfig_set_opt "${KERNEL_OUTPUTDIR}/.config" "CONFIG_INITRAMFS_SOURCE" "" + fi + fi + # Force this on if we are using --genzimage if isTrue "${CMD_GENZIMAGE}" then