handle depfile per kernel, not just 2.4* modules.dep

1 files changed, 5 insertions, 3 deletions

diff --git a/kernel/update_kernel b/kernel/update_kernel
index 26f2734fb..1131e5d0d 100755
--- a/kernel/update_kernel
+++ b/kernel/update_kernel
@@ -27,7 +27,7 @@ function create_modules() {
     kernel_path=$1
     kern=$2
     echo "Updating modules in '`pwd`' for kernel '$kern'"
-    cp -f `find $kernel_path/lib/modules/ -name "*.o"` .
+    find $kernel_path/lib/modules/ -name "*.o" -exec cp -f {} . \;
     /sbin/depmod -F $kernel_path/boot/System.map* -e *.o | perl -pe 's/\\\n//' \
 	| perl -ne 's/\.o//g; s/[ \t]+/ /g; print if /: /' > modules.dep
     perl -pi -e 's/((plip|ppa|imm): parport)/$1 parport_pc/' modules.dep
@@ -45,8 +45,9 @@ function create_modules_mar() {
     echo "done"
     mv modules.cz ../modules.cz-$kern
     for i in network network_gigabit_usb network_gigabit network_usb cdrom hd hdcdrom_usb pcmcia all; do
-	modules_var="${i}_modules"
-	eval "create_marfile ${i}_modules.mar \$$modules_var"
+        modules_with_deps=`perl $GIBASEDIR/kernel/dependencies.pl $GIBASEDIR/kernel/all.modules/$kern/modules.pl ${i}_modules`
+        if [ -n "$MOVE" ]; then modules_with_deps="$modules_with_deps loop.o gzloop.o isofs.o zlib_inflate.o"; fi
+	eval "create_marfile ${i}_modules.mar \$$modules_with_deps"
     done
     echo
 }
@@ -60,6 +61,7 @@ else
         if [ -n "$1" ]; then
             file=$1
             rpm=$2
+            MOVE=1
         else
             file=$RPMS/kernel-BOOT-*.rpm
             rpm=$(rpm -qp --qf '%{name}' $file | perl -pe 's/kernel-BOOT-((\.?[0-9]+){3})\.(.*)/$1-${3}BOOT/')