Put e100 (and other) firmware in its own directory if needed (#494778).

1 files changed, 9 insertions, 1 deletions

diff --git a/scripts/mk-images b/scripts/mk-images
index e1b278bd0..e0dc4ab40 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -293,7 +293,15 @@ makemoduletree() {
     echo "Copying required firmware..."
     find $MMB_DIR/lib/modules/ -name *.ko | while read module ; do
         for fw in $(modinfo -F firmware $module); do
-            cp $KERNELROOT/lib/firmware/$fw $MBD_DIR/firmware
+            dest=$MBD_DIR/firmware/$fw
+            destdir=$(dirname $dest)
+
+            # Some firmware files are expected to be in their own directories.
+            if [ ! -d $destdir ]; then
+                mkdir -p $destdir
+            fi
+
+            cp $KERNELROOT/lib/firmware/$fw $dest
         done
     done