mkinitcpio: include modules.{builtin,order} for depmod call

When present, modules.order will allow depmod to order the binary module
indicies for faster lookups and more deterministic behavior in resolving
aliases. We can discard this file from the buildroot after depmod is
called.

modules.builtin.bin is added as well (generated from modules.builtin),
to allow modprobe to not fail when a symbol is provided as a builtin.

Signed-off-by: Dave Reisner <dreisner@archlinux.org>

1 files changed, 6 insertions, 1 deletions

diff --git a/mkinitcpio b/mkinitcpio
index bcf56e9..a1ea51a 100755
--- a/mkinitcpio
+++ b/mkinitcpio
@@ -353,8 +353,13 @@ if (( ${#ADDED_MODULES[*]} )); then
     popd >/dev/null
 
     msg "Generating module dependencies"
+    install -m644 -t "$BUILDROOT/lib/modules/$KERNELVERSION" \
+        "$BASEDIR/lib/modules/$KERNELVERSION"/modules.{builtin,order}
     depmod -b "$BUILDROOT" "${KERNELVERSION}"
-    rm "$BUILDROOT/lib/modules/$KERNELVERSION"/modules.!(dep.bin|alias.bin|symbols.bin)
+
+    # remove all non-binary module.* files
+    rm "$BUILDROOT/lib/modules/$KERNELVERSION"/modules.!(*.bin)
+
 else
     warning "No modules were added to the image. This is probably not what you want."
 fi