summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2003-01-30 22:32:46 +0000
committerPascal Rigaux <pixel@mandriva.com>2003-01-30 22:32:46 +0000
commita710f81d32c56f1e3b01df628943bb106c5d8d9b (patch)
tree84184851cf07a3e714e5e003bc94aad815658ac1
parentec815a27fce568a825371eee2ba7239ae7703147 (diff)
downloaddrakx-a710f81d32c56f1e3b01df628943bb106c5d8d9b.tar
drakx-a710f81d32c56f1e3b01df628943bb106c5d8d9b.tar.gz
drakx-a710f81d32c56f1e3b01df628943bb106c5d8d9b.tar.bz2
drakx-a710f81d32c56f1e3b01df628943bb106c5d8d9b.tar.xz
drakx-a710f81d32c56f1e3b01df628943bb106c5d8d9b.zip
- remove other & usb, add hd_usb & network_gigabit_usb
- call modules.pl after generating modules.dep
-rwxr-xr-xkernel/update_kernel25
1 files changed, 19 insertions, 6 deletions
diff --git a/kernel/update_kernel b/kernel/update_kernel
index 092e77e76..bbfa405c3 100755
--- a/kernel/update_kernel
+++ b/kernel/update_kernel
@@ -24,12 +24,14 @@ function create_modules() {
perl -pi -e 's/((plip|ppa|imm): parport)/$1 parport_pc/' modules.dep
/sbin/modinfo -f '%{filename} %{description}\n' *.o | perl -lne 'print "$1\t$2" if /(.*?)\.o "(.*)"/' > modules.description
+}
+function create_modules_mar() {
echo -n "packdrake $kern: "
ls *.o | packdrake -b9s "modules.cz" 400000
echo "done"
mv modules.cz ../modules.cz-$kern
- for i in network cdrom hd usb other pcmcia all; do
+ for i in network network_gigabit_usb cdrom hd hd_usb pcmcia all; do
modules_var="${i}_modules"
eval "create_marfile ${i}_modules.mar \$$modules_var"
done
@@ -63,8 +65,6 @@ fi
ARCH=`uname -m | sed -e 's/i.86/i386/' -e 's/sparc.*/sparc/'`
-eval `perl modules.pl images`
-
if [ "$ARCH" == "i386" ]; then
for i in $ALL_KERNELS/*/boot/vmlinuz*; do
#disable any existing resolution!!!
@@ -87,14 +87,27 @@ for i in $ALL_KERNELS/*; do
(
mkdir all.modules/$kern
cd all.modules/$kern
+
+ create_modules ../../$i $kern
+ ) || exit 1
+done
+cp -f all.modules/$main/modules.description .
+
+eval `perl modules.pl images`
+
+for i in $ALL_KERNELS/*; do
+ kern=`basename $i`
+ (
+ cd all.modules/$kern
+
if [ "$kern" = "$main" ]; then
- create_modules ../../$i $kern
+ create_modules_mar ../../$i $kern
else
echo "$kern ($main)"
- create_modules ../../$i $kern 2>/dev/null
+ create_modules_mar ../../$i $kern 2>/dev/null
fi
) || exit 1
done
-cp -f all.modules/$main/modules.description .
+
./check_mar.pl