summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2004-05-17 22:51:49 +0000
committerJeremy Katz <katzj@redhat.com>2004-05-17 22:51:49 +0000
commit330a18b5e0d7267ec6eb7ab4e95e684c1da86ccf (patch)
tree13b7696b014515e55b199215a2ab1b281a911677
parentca367e3d669b935fde69b40c7b6a27aea8d52193 (diff)
downloadanaconda-330a18b5e0d7267ec6eb7ab4e95e684c1da86ccf.tar.gz
anaconda-330a18b5e0d7267ec6eb7ab4e95e684c1da86ccf.tar.xz
anaconda-330a18b5e0d7267ec6eb7ab4e95e684c1da86ccf.zip
make a modules.usbmap
-rwxr-xr-xscripts/mk-images8
1 files changed, 7 insertions, 1 deletions
diff --git a/scripts/mk-images b/scripts/mk-images
index 79eca6a13..1b8b1e469 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -42,6 +42,7 @@ TOPDIR=$(cd $TOPDIR; pwd)
KERNELBASE=/tmp/updboot.kernel.$$
MODDEPS=$KERNELBASE/moddeps
MODMAPS=$KERNELBASE/modules.pcimap
+ USBMAPS=$KERNELBASE/modules.usbmap
BUILDARCH=$5
KERNELNAME=vmlinuz
@@ -93,6 +94,7 @@ TOPDIR=$(cd $TOPDIR; pwd)
# Stuff that we need
TRIMPCITABLE=$IMGPATH/usr/lib/anaconda-runtime/trimpcitable
TRIMMODMAP=$IMGPATH/usr/lib/anaconda-runtime/trimmodmap
+ TRIMUSBMAP=$IMGPATH/usr/lib/anaconda-runtime/trimusbmap
GETKEYMAPS=$IMGPATH/usr/lib/anaconda-runtime/getkeymaps
KEYMAPS=/tmp/keymaps-$BUILDARCH.$$
SCREENFONT=$IMGPATH/usr/lib/anaconda-runtime/screenfont-${BASEARCH}.gz
@@ -110,7 +112,7 @@ TOPDIR=$(cd $TOPDIR; pwd)
touch $MODULESUSED
REQUIREMENTS="$TRIMPCITABLE $TRIMMODMAP $PCITABLE $GETMODDEPS $MODINFO
- $FILTERMODDEPS $LANGTABLE $GETKEYMAPS"
+ $FILTERMODDEPS $LANGTABLE $GETKEYMAPS $TRIMUSBMAP"
dieLater=
for n in $REQUIREMENTS; do
@@ -177,6 +179,7 @@ rundepmod () {
$FAKEARCH /sbin/depmod -a -F $KERNELROOT/boot/System.map-$version \
-b $KERNELROOT $version
mv $KERNELROOT/lib/modules/$version/modules.pcimap $MODMAPS
+ mv $KERNELROOT/lib/modules/$version/modules.usbmap $USBMAPS
cat $KERNELROOT/lib/modules/$version/modules.dep | $FILTERMODDEPS > $final
}
@@ -313,6 +316,9 @@ makemoduleball() {
# create the modules.pcimap
$TRIMMODMAP $PCITABLE $(find . -name *.ko -exec basename {} \;) < $MODMAPS > ../modules.pcimap
+ # create the modules.usbmap
+ $TRIMUSBMAP $(find . -name *.ko -exec basename {} \;) < $USBMAPS > ../modules.usbmap
+
if [ -n "$MMB_DD" ]; then
echo $MMB_DD > $MMB_DIR/rhdd
fi