From: Sebastian Pipping <sebastian@pipping.org>
Date: Mon, 16 Apr 2012 02:37:01 +0000 (+0200)
Subject: Merge branch 'cryptsetup'
X-Git-Tag: v3.4.31~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f1e3cd9290cd700f407a6d323454f75cd4c53730;p=genkernel.git

Merge branch 'cryptsetup'

Conflicts:
	ChangeLog
---

f1e3cd9290cd700f407a6d323454f75cd4c53730
diff --cc ChangeLog
index 8490dc3,fcdde94..340de2c
--- a/ChangeLog
+++ b/ChangeLog
@@@ -5,12 -5,12 +5,18 @@@
  # Distributed under the GPL v2
  # $Id$
  
-   14 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
++  16 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
 +  Release copy_binaries function as public domain.
 +
-   14 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
++  16 Apr 2012; Robin H. Johnson <robbat2@gentoo.org> gen_initramfs.sh:
 +  Handle other binary paths for LVM.
 +
+   16 Apr 2012; Sebastian Pipping <sping@gentoo.org> genkernel:
+   Bump version to 3.4.30
+ 
+   16 Apr 2012; Sebastian Pipping <sping@gentoo.org> gen_initramfs.sh:
+   Support a non-static cryptsetup binary (bug #409277)
+ 
    09 Apr 2012; Sebastian Pipping <sping@gentoo.org> defaults/initrd.scripts,
    defaults/keymaps/keymapList, defaults/keymaps/sf.map:
    Add keymap "sf" from Pentoo
diff --cc gen_initramfs.sh
index 3dd757b,720a25e..ca4f090
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@@ -3,16 -3,6 +3,17 @@@
  
  CPIO_ARGS="--quiet -o -H newc"
  
 +# The copy_binaries function is explicitly released into the public domain to
 +# encourage wide adoption and re-use.  That means:
 +# - You may use the code of copy_binaries() as Public domain outside of genkernel
 +# - Past and future changes to copy_binaries() still need to be licensable under
 +#   <GPL v2 or later> to maintain license compatibility with genkernel itself
 +# Written by: 
++# - Sebastian Pipping <sebastian@pipping.org> (partly rewrite)
 +# - Robin H. Johnson <robbat2@gentoo.org> (complete rewrite)
 +# - Richard Yao <ryao@cs.stonybrook.edu> (original concept)
 +# Usage:
 +# copy_binaries DESTDIR BINARIES...
  copy_binaries() {
  	local destdir=$1
  	shift