summaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2004-10-21 21:08:01 +0000
committerBill Nottingham <notting@redhat.com>2004-10-21 21:08:01 +0000
commitf88dfe40466ed949052fae52587dd100259f8c06 (patch)
tree553f1fd7ef911463a919389771451d40e7368383 /scripts
parent9e6b9e68829f6e77dd8905f0802bdb31ca56bcbf (diff)
downloadanaconda-f88dfe40466ed949052fae52587dd100259f8c06.tar.gz
anaconda-f88dfe40466ed949052fae52587dd100259f8c06.tar.xz
anaconda-f88dfe40466ed949052fae52587dd100259f8c06.zip
add pciid trimming here
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/mk-images6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/mk-images b/scripts/mk-images
index 1e2dd892b..cc184f0e5 100755
--- a/scripts/mk-images
+++ b/scripts/mk-images
@@ -94,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
+ TRIMPCIIDS=$IMGPATH/usr/lib/anaconda-runtime/trimpciids
TRIMUSBMAP=$IMGPATH/usr/lib/anaconda-runtime/trimusbmap
GETKEYMAPS=$IMGPATH/usr/lib/anaconda-runtime/getkeymaps
KEYMAPS=/tmp/keymaps-$BUILDARCH.$$
@@ -112,7 +113,7 @@ TOPDIR=$(cd $TOPDIR; pwd)
touch $MODULESUSED
- REQUIREMENTS="$TRIMPCITABLE $TRIMMODMAP $PCITABLE $PCIIDS $GETMODDEPS $MODINFO
+ REQUIREMENTS="$TRIMPCITABLE $TRIMMODMAP $TRIMPCIIDS $PCITABLE $PCIIDS $GETMODDEPS $MODINFO
$FILTERMODDEPS $LANGTABLE $GETKEYMAPS $TRIMUSBMAP"
dieLater=
@@ -325,7 +326,8 @@ makemoduleball() {
rm -f ../modules.usbmap
fi
# create the pci.ids
- awk '!/^(\t\t|#)/ { print ;if ($0 == "ffff Illegal Vendor ID") nextfile; }' < $PCIIDS > ../pci.ids
+ awk '!/^(\t\t|#)/ { print ;if ($0 == "ffff Illegal Vendor ID") nextfile; }' < $PCIIDS | \
+ $TRIMPCIIDS ../pcitable ../modules.pcimap > ../pci.ids
if [ -n "$MMB_DD" ]; then
echo $MMB_DD > $MMB_DIR/rhdd