From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RuLG9-0005vF-IB for garchives@archives.gentoo.org; Mon, 06 Feb 2012 09:53:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0564DE0521; Mon, 6 Feb 2012 09:53:09 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id CCF30E0521 for ; Mon, 6 Feb 2012 09:53:09 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 503D41B403F for ; Mon, 6 Feb 2012 09:53:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 89B0A80043 for ; Mon, 6 Feb 2012 09:53:08 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1240654461ea74087a5953da48443f977aa59da6.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: 1240654461ea74087a5953da48443f977aa59da6 Date: Mon, 6 Feb 2012 09:53:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: ee14fbaf-a549-4c6b-ad70-a2b4ecbd50e4 X-Archives-Hash: c19b4b7e793d714cea42db48f8fa9f88 commit: 1240654461ea74087a5953da48443f977aa59da6 Author: Robin H. Johnson gentoo org> AuthorDate: Mon Feb 6 09:52:55 2012 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Mon Feb 6 09:52:55 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3D12406544 Bugfixes in new code branches that I didn't test fully. Signed-off-by: Robin H. Johnson gentoo.org> --- ChangeLog | 3 +++ gen_initramfs.sh | 12 ++++++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index ddc3844..c0a09cb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,9 @@ # Distributed under the GPL v2 # $Id$ =20 + 06 Feb 2012; Robin H. Johnson gen_initramfs.sh: + Bugfixes in new code branches that I didn't test fully. + 06 Feb 2012; Robin H. Johnson doc/genkernel.8.txt= , gen_cmdline.sh: Update documentation for new initramfs compression. diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 3aab15d..5704173 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -709,22 +709,22 @@ create_initramfs() { case ${COMPRESS_INITRD_TYPE} in xz|lzma|bzip2|gzip2|lzo) compression=3D${COMPRESS_INITRD_TYPE} ;; best) - if grep -sq '^CONFIG_RD_XZ=3Dy' ${KERNEL_DIR}/.config && test -n "$= {cmd_xz}" ; + if grep -sq '^CONFIG_RD_XZ=3Dy' ${KERNEL_DIR}/.config && test -n "$= {cmd_xz}" ; then compression=3Dxz - elif grep -sq '^CONFIG_RD_LZMA=3Dy' ${KERNEL_DIR}/.config && test -= n "${cmd_lzma}" ; + elif grep -sq '^CONFIG_RD_LZMA=3Dy' ${KERNEL_DIR}/.config && test -= n "${cmd_lzma}" ; then compression=3Dlzma - elif grep -sq '^CONFIG_RD_BZIP2=3Dy' ${KERNEL_DIR}/.config && test= -n "${cmd_bzip2}" ; + elif grep -sq '^CONFIG_RD_BZIP2=3Dy' ${KERNEL_DIR}/.config && test= -n "${cmd_bzip2}" ; then compression=3Dbzip2 - elif grep -sq '^CONFIG_RD_GZIP=3Dy' ${KERNEL_DIR}/.config && test -= n "${cmd_gzip}" ; + elif grep -sq '^CONFIG_RD_GZIP=3Dy' ${KERNEL_DIR}/.config && test -= n "${cmd_gzip}" ; then compression=3Dgzip - elif grep -sq '^CONFIG_RD_LZO=3Dy' ${KERNEL_DIR}/.config && test -n= "${cmd_lzop}" ; + elif grep -sq '^CONFIG_RD_LZO=3Dy' ${KERNEL_DIR}/.config && test -n= "${cmd_lzop}" ; then compression=3Dlzo fi ;; esac case $compression in xz) compress_ext=3D'.xz' compress_cmd=3D"${cmd_xz} -e --check=3Dnone= -z -f -9" ;; lzma) compress_ext=3D'.lzma' compress_cmd=3D"${cmd_lzma} -z -f -9" ;= ; - bzip2) compress_ext=3D'.bz2' compress_cmd=3D"${cmd_bzip2} -z -f -9" + bzip2) compress_ext=3D'.bz2' compress_cmd=3D"${cmd_bzip2} -z -f -9" = ;; gzip) compress_ext=3D'.gz' compress_cmd=3D"${cmd_gzip} -f -9" ;; lzo) compress_ext=3D'.lzo' compress_cmd=3D"${cmd_lzop} -f -9" ;; esac