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 1SGwwI-0002OR-IG for garchives@archives.gentoo.org; Sun, 08 Apr 2012 18:34:14 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C6855E0B38; Sun, 8 Apr 2012 18:33:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 94418E0B38 for ; Sun, 8 Apr 2012 18:33:37 +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 EFD831B40D0 for ; Sun, 8 Apr 2012 18:33:36 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id B2697E5432 for ; Sun, 8 Apr 2012 18:33:34 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1333909628.10a2bde198877d240a20d45a93cb523df13d35a0.sping@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: / X-VCS-Repository: proj/genkernel X-VCS-Files: gen_initramfs.sh X-VCS-Directories: / X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 10a2bde198877d240a20d45a93cb523df13d35a0 X-VCS-Branch: master Date: Sun, 8 Apr 2012 18:33:34 +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: 2788a489-d1be-4fc5-ac4b-863c7531e853 X-Archives-Hash: 274e174058a920610076bfa7d306f271 commit: 10a2bde198877d240a20d45a93cb523df13d35a0 Author: Sebastian Pipping pipping org> AuthorDate: Sun Apr 8 18:27:08 2012 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Sun Apr 8 18:27:08 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/genkernel.git= ;a=3Dcommit;h=3D10a2bde1 Refactor code selecting best available initrd compression --- gen_initramfs.sh | 26 +++++++++++++++----------- 1 files changed, 15 insertions(+), 11 deletions(-) diff --git a/gen_initramfs.sh b/gen_initramfs.sh index 066c389..082d525 100755 --- a/gen_initramfs.sh +++ b/gen_initramfs.sh @@ -715,17 +715,21 @@ create_initramfs() { xz|lzma|bzip2|gzip|lzop) compression=3D${COMPRESS_INITRD_TYPE} ;; lzo) compression=3Dlzop ;; best) - 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}" ; then - compression=3Dlzma - 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}" ; then - compression=3Dgzip - elif grep -sq '^CONFIG_RD_LZO=3Dy' ${KERNEL_DIR}/.config && test -n= "${cmd_lzop}" ; then - compression=3Dlzop - fi ;; + for tuple in \ + 'CONFIG_RD_XZ cmd_xz xz' \ + 'CONFIG_RD_LZMA cmd_lzma lzma' \ + 'CONFIG_RD_BZIP2 cmd_bzip2 bzip' \ + 'CONFIG_RD_GZIP cmd_gzip gzip' \ + 'CONFIG_RD_LZO cmd_lzop lzop'; do + set -- ${tuple} + kernel_option=3D$1 + cmd_variable_name=3D$2 + if grep -sq "^${kernel_option}=3Dy" ${KERNEL_DIR}/.config && test = -n "${!cmd_variable_name}" ; then + compression=3D$3 + break + fi + done + ;; *) gen_die "Compression '${COMPRESS_INITRD_TYPE}' unknown" ;;