From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 0233F138010 for ; Sat, 13 Oct 2012 22:03:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CEE41E035C; Sat, 13 Oct 2012 22:03:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 51F95E035C for ; Sat, 13 Oct 2012 22:03:09 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 892FE33D91D for ; Sat, 13 Oct 2012 22:03:08 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 3D1A9E5436 for ; Sat, 13 Oct 2012 22:03:07 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1350165779.85d772454a59512c0e9536f366fff3ba6f2b466b.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: ChangeLog gen_initramfs.sh X-VCS-Directories: / X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 85d772454a59512c0e9536f366fff3ba6f2b466b X-VCS-Branch: master Date: Sat, 13 Oct 2012 22:03:07 +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-Archives-Salt: 75fce925-f70a-4d1e-aa69-4afa661c4553 X-Archives-Hash: 02d9ef5f7e114bb3221761f806211dbf commit: 85d772454a59512c0e9536f366fff3ba6f2b466b Author: Robin H. Johnson gentoo org> AuthorDate: Sat Oct 13 22:02:59 2012 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Sat Oct 13 22:02:59 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=85d77245 Bug #414581: ensure built-in initramfs compress config options are set to avoid silentoldconfig bailing out. Signed-off-by: Robin H. Johnson gentoo.org> --- ChangeLog | 4 ++++ gen_initramfs.sh | 18 ++++++++++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8660462..44477b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ # Distributed under the GPL v2 # $Id$ + 13 Oct 2012; Robin H. Johnson gen_initramfs.sh: + Bug #414581: ensure built-in initramfs compress config options are set to + avoid silentoldconfig bailing out. + 13 Oct 2012; Łukasz Stelmach gen_cmdline.sh, gen_compile.sh, gen_configkernel.sh, gen_determineargs.sh, gen_funcs.sh, genkernel: diff --git a/gen_initramfs.sh b/gen_initramfs.sh index f986ed4..55b9dd9 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -802,10 +802,28 @@ create_initramfs() { # The kernel will do a better job of it than us. mv ${TMPDIR}/initramfs-${KV} ${TMPDIR}/initramfs-${KV}.cpio sed -i '/^.*CONFIG_INITRAMFS_SOURCE=.*$/d' ${KERNEL_DIR}/.config + compress_config='INITRAMFS_COMPRESSION_NONE' + case ${compress_ext} in + gz) compress_config='INITRAMFS_COMPRESSION_GZIP' ;; + bz2) compress_config='INITRAMFS_COMPRESSION_BZIP2' ;; + lzma) compress_config='INITRAMFS_COMPRESSION_LZMA' ;; + xz) compress_config='INITRAMFS_COMPRESSION_XZ' ;; + lzo) compress_config='INITRAMFS_COMPRESSION_LZO' ;; + *) compress_config='INITRAMFS_COMPRESSION_NONE' ;; + esac + # All N default except XZ, so there it gets used if the kernel does + # compression on it's own. cat >>${KERNEL_DIR}/.config <<-EOF CONFIG_INITRAMFS_SOURCE="${TMPDIR}/initramfs-${KV}.cpio${compress_ext}" CONFIG_INITRAMFS_ROOT_UID=0 CONFIG_INITRAMFS_ROOT_GID=0 + CONFIG_INITRAMFS_COMPRESSION_NONE=n + CONFIG_INITRAMFS_COMPRESSION_GZIP=n + CONFIG_INITRAMFS_COMPRESSION_BZIP2=n + CONFIG_INITRAMFS_COMPRESSION_LZMA=n + CONFIG_INITRAMFS_COMPRESSION_XZ=y + CONFIG_INITRAMFS_COMPRESSION_LZO=n + CONFIG_${compress_config}=y EOF else if isTrue "${COMPRESS_INITRD}"