[gentoo-commits] proj/genkernel:ryao commit in: /

["Richard Yao" <ryao@gentoo.org>]

commit:     26dd05c7c47e06cd0d883714f41cc053209eb2cc
Author:     Richard Yao <ryao <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  6 05:53:44 2013 +0000
Commit:     Richard Yao <ryao <AT> gentoo <DOT> org>
CommitDate: Thu Jun  6 05:53:44 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/genkernel.git;a=commit;h=26dd05c7

Replace existing modules.* files with modules.dep.bb, bug #472312

Busybox has code that enables us to avoid using a modules.dep file at
the expense of some speed. It was found that it fails to get
dependencies correct, which prevents some modules from loading properly.
We switch to explicit generation of modules.dep.bb to resolve this. At
the same time, we remove various modules.* files that are not used by
busybox to save space. The inclusion of modules.dep.bb should make
module loading slightly faster. The removal of the modules.* should
make the initramfs slightly smaller.

Signed-off-by: Richard Yao <ryao <AT> gentoo.org>

---
 gen_initramfs.sh | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/gen_initramfs.sh b/gen_initramfs.sh
index 6ad51c1..7ff6ea0 100755
--- a/gen_initramfs.sh
+++ b/gen_initramfs.sh
@@ -796,7 +796,7 @@ create_initramfs() {
 		append_data 'overlay'
 	fi
 
-	# Finalize cpio by removing duplicate files
+	# Finalize cpio by removing duplicate files and generating modules.dep.bb
 	print_info 1 "        >> Finalizing cpio"
 	local TDIR="${TEMP}/initramfs-final"
 	mkdir -p "${TDIR}"
@@ -804,6 +804,23 @@ create_initramfs() {
 
 	cpio --quiet -i -F "${CPIO}" 2> /dev/null \
 		|| gen_die "extracting cpio for finalization"
+
+	# Remove unused modules.* files
+	rm "${TDIR}/lib/modules/${KV}/modules."*
+
+	# Hack to workaround broken `busybox depmod -b`
+	touch "${TDIR}/proc/modules"
+	if [ ${UID} -eq 0 ]
+	then
+		chroot "${TDIR}" /bin/busybox depmod "${KV}" \
+			|| gen_die "generating busybox modules.dep"
+
+	else
+			fakechroot fakeroot chroot "${TDIR}" /bin/busybox depmod "${KV}" \
+			|| gen_die "generating busybox modules.dep"
+	fi
+	rm "${TDIR}/proc/modules"
+
 	find . -print | cpio ${CPIO_ARGS} -F "${CPIO}" 2>/dev/null \
 		|| gen_die "recompressing cpio"