Gentoo Archives: gentoo-commits

From: Sebastian Pipping <sping@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/genkernel:master commit in: /
Date: Sun, 08 Apr 2012 18:34:09
Message-Id: 1333909621.0da4543b8a23b882e536293a8af095707ebafb91.sping@gentoo
1 commit: 0da4543b8a23b882e536293a8af095707ebafb91
2 Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org>
3 AuthorDate: Sun Apr 8 18:27:01 2012 +0000
4 Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org>
5 CommitDate: Sun Apr 8 18:27:01 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=0da4543b
7
8 Support comression "lzop" (not just "lzo") as wrongly advertised by comments in genkernel.conf before
9
10 ---
11 ChangeLog | 4 ++++
12 gen_initramfs.sh | 2 +-
13 2 files changed, 5 insertions(+), 1 deletions(-)
14
15 diff --git a/ChangeLog b/ChangeLog
16 index c728da5..2533e58 100644
17 --- a/ChangeLog
18 +++ b/ChangeLog
19 @@ -6,6 +6,10 @@
20 # $Id$
21
22 08 Apr 2012; Sebastian Pipping <sping@g.o> gen_initramfs.sh:
23 + Support comression "lzop" (not just "lzo") as wrongly advertised by comments
24 + in genkernel.conf before
25 +
26 + 08 Apr 2012; Sebastian Pipping <sping@g.o> gen_initramfs.sh:
27 Error out on unknown initrd compression, reported by Peter Gantner (bug
28 #411197)
29
30
31 diff --git a/gen_initramfs.sh b/gen_initramfs.sh
32 index a33fa7e..066c389 100755
33 --- a/gen_initramfs.sh
34 +++ b/gen_initramfs.sh
35 @@ -712,7 +712,7 @@ create_initramfs() {
36 pkg_lzop='app-arch/lzop'
37 local compression
38 case ${COMPRESS_INITRD_TYPE} in
39 - xz|lzma|bzip2|gzip) compression=${COMPRESS_INITRD_TYPE} ;;
40 + xz|lzma|bzip2|gzip|lzop) compression=${COMPRESS_INITRD_TYPE} ;;
41 lzo) compression=lzop ;;
42 best)
43 if grep -sq '^CONFIG_RD_XZ=y' ${KERNEL_DIR}/.config && test -n "${cmd_xz}" ; then