[gentoo-genkernel] [PATCH] e2fsprogs

[Rick \\\"Zero_Chaos\\\" Farina]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

I have chosen (under duress) to break up my patch to make it a bit more
manageable.  When this is all done I'm certain this will make the
outcome far better for everyone.

To that end, here is the first part for review (not acceptance) which is
likely horribly whitespace damaged since I'm just going to copy and
paste it.

I can't figure out to prevent line wrap so, sorry about that.

This is as close as I can get to mimicking blkid style inclusion of the
e2fs progs that I need. I see two potential issues.
1.) This isn't really conditional in any way afaict
2.) I *need* the e2fs progs for other parts of my patchset but if
e2fsprogs are not installed on the system won't this fail horribly? Do
we add e2fsprogs to the rdep of the ebuild or what?

thanks,
Zero

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index ac90830..75bb47f 100755
- --- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -127,6 +127,26 @@ append_busybox() {
 	rm -rf "${TEMP}/initramfs-busybox-temp" > /dev/null
 }

+# Used to add e2fs file making inside initramfs for aufs changes saving
+append_e2fstools(){
+	if [ -d "${TEMP}/initramfs-e2fsprogs-temp" ]
+	then
+		rm -r "${TEMP}/initramfs-e2fsprogs-temp/"
+	fi
+	#print_info 1 'E2FSTOOLS: Adding support (compiling binaries)...'
+	# Using different name for blkid compatibility
+	#compile_e2fstools
+	cd ${TEMP}
+	mkdir -p "${TEMP}/initramfs-e2fsprogs-temp/"
+	#XXX: do we want to add an if statement here or just include it? I say
include it...
+	copy_binaries "${TEMP}"/initramfs-e2fsprogs-temp/ /sbin/{e2fsck,mke2fs}
+	#/bin/tar -jxpf "${E2FSPROGS_BINCACHE}" -C
"${TEMP}/initramfs-e2fsprogs-temp/" ||
+	#	gen_die "Could not extract e2fsprogs binary cache!"
+	cd "${TEMP}/initramfs-e2fsprogs-temp/"
+	find . -print | cpio ${CPIO_ARGS} --append -F "${CPIO}"
+	rm -rf "${TEMP}/initramfs-e2fsprogs-temp" > /dev/null
+}
+
 append_blkid(){
 	if [ -d "${TEMP}/initramfs-blkid-temp" ]
 	then
@@ -624,6 +644,7 @@ append_auxilary() {
 		rm -r "${TEMP}/initramfs-aux-temp/"
 	fi
 	mkdir -p "${TEMP}/initramfs-aux-temp/etc"
+	mkdir -p "${TEMP}/initramfs-aux-temp/bin"
 	mkdir -p "${TEMP}/initramfs-aux-temp/sbin"
 	if [ -f "${CMD_LINUXRC}" ]
 	then
@@ -741,6 +762,7 @@ create_initramfs() {
 	append_data 'base_layout'
 	append_data 'auxilary' "${BUSYBOX}"
 	append_data 'busybox' "${BUSYBOX}"
+	append_data 'e2fstools'
 	append_data 'lvm' "${LVM}"
 	append_data 'dmraid' "${DMRAID}"
 	append_data 'iscsi' "${ISCSI}"
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJQN+YsAAoJEKXdFCfdEflKzYgQALBWW+3mULQJD2/ITFzfDwlv
LPztO6X78Ddi1T7oCcwXjxwdAJYUtHqGrR/56Lhgablnl3VFNGJXWEf31M1sjCD3
qu1PUMb1cr0x+vz4WnGAg92KEKNLaOiNFFTAIZFNBY3ZzfqYREBC+bgZGNYc8Dnt
8q3jiEQRwfb1Mkx7kwoGxoknAu1u4gggDnwOAhglgGnISLvhNgg6g5MCCK/YVf2W
6z/ZR90+jVn2JJ7ULwLkgkIR5hAepKZJB44lD/PXReZHDTI9yEHnHksBF9DwRF7x
brsDLeNLh38xKv+rr72CTv4RAOyV8us7MJaASqVc6qOLUqXxLgLbx27XOrZKr7cP
H+ceApmYd4cP04NzGzGqDEPnXMlE4V+fj0kQDpCmZ8yG9n6ae7zZ5TyYOhmLqpqt
+SyLDDA3u5SRR3xo6KHcRBVBXf1nvxZq1RsRhwTE/Nhcg5pWXEJcj2H45HohfwrK
BviIDHC60sy0FvRp4ndXVXGBlmCLCekNq5VJXEv2o6HSGbA+hxT2gK/sILym9ym/
GZ6MIqzWVJQpEKvipVpJOMFD95o+Q9iNIezL6UwoRM/Tbj4MQE9oa0sww+ikavri
NGoIyJZ73+8TkM/lI9Jr29YJ0WvyLvII161TiC59mIxDOEON5/mUptwzDqXKaEjo
pqe3lJG7ighBPf0CznFJ
=aD5n
-----END PGP SIGNATURE-----