diff options
| author | Bill Nottingham <notting@redhat.com> | 2004-09-03 20:52:56 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2004-09-03 20:52:56 +0000 |
| commit | aa59db328af2f7df5b8a1f6dff3f4f1a6299ec34 (patch) | |
| tree | df6d30cd7548fe9dd81b2f5175133ab770c3838a /scripts | |
| parent | 2d0bab628521c764cc8b122b51e2707f8d6e607b (diff) | |
put pci.ids on the boot images
allow pci.ids and modules.pcimap on driver disks
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/mk-images | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/scripts/mk-images b/scripts/mk-images index 3206f8a43..d4d8e47db 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -106,12 +106,13 @@ TOPDIR=$(cd $TOPDIR; pwd) BOOTDISKDIR=$IMGPATH/usr/lib/anaconda-runtime/boot LANGTABLE=$IMGPATH/usr/lib/anaconda/lang-table PCITABLE=$IMGPATH/usr/share/hwdata/pcitable + PCIIDS=$IMGPATH/usr/share/hwdata/pci.ids CACHE=$KERNELBASE/.cache MODULESUSED=$KERNELBASE/modules-used touch $MODULESUSED - REQUIREMENTS="$TRIMPCITABLE $TRIMMODMAP $PCITABLE $GETMODDEPS $MODINFO + REQUIREMENTS="$TRIMPCITABLE $TRIMMODMAP $PCITABLE $PCIIDS $GETMODDEPS $MODINFO $FILTERMODDEPS $LANGTABLE $GETKEYMAPS $TRIMUSBMAP" dieLater= @@ -298,7 +299,8 @@ makemoduleball() { MMB_MODULESET=$(resdeps $2) rm -rf $MMB_DIR/modules $MMB_DIR/$MMB_NAME $MMB_DIR/modules.dep \ - $MMB_DIR/modules.pcimap $MMB_DIR/pcitable $MMB_DIR/$MMB_MODINFO + $MMB_DIR/modules.pcimap $MMB_DIR/pcitable $MMB_DIR/$MMB_MODINFO \ + $MMB_DIR/pci.ids mkdir -p $MMB_DIR/modules MMB_MODULESET=$(intcopymodules "$MMB_MODULESET" $MMB_DIR/modules) @@ -322,6 +324,8 @@ makemoduleball() { if [ "$(ls -s ../modules.usbmap |cut -f 1 -d ' ')" = "0" ]; then rm -f ../modules.usbmap fi + # create the pci.ids + awk '!/^(\t\t|#)/ { print ;if ($0 == "ffff Illegal Vendor ID") nextfile; }' < $PCIIDS > ../pci.ids if [ -n "$MMB_DD" ]; then echo $MMB_DD > $MMB_DIR/rhdd |