diff options
| author | Jeremy Katz <katzj@redhat.com> | 2002-12-12 21:36:42 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2002-12-12 21:36:42 +0000 |
| commit | c9a7c0a8d21d07c166693f4273f484e2a1a55445 (patch) | |
| tree | ac853267adcd5b6249614d30c953f276e590e4d0 | |
| parent | 7fb370e353924a3f562c81dddd44f1336c8601d9 (diff) | |
| download | anaconda-c9a7c0a8d21d07c166693f4273f484e2a1a55445.tar.gz anaconda-c9a7c0a8d21d07c166693f4273f484e2a1a55445.tar.xz anaconda-c9a7c0a8d21d07c166693f4273f484e2a1a55445.zip | |
1) find noarch packages properly with findPackage
2) pcmcia config is in hwdata now
3) only include modules for network/scsi
| -rwxr-xr-x | scripts/mk-images | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/mk-images b/scripts/mk-images index 030448303..53c83976e 100755 --- a/scripts/mk-images +++ b/scripts/mk-images @@ -108,7 +108,7 @@ findPackage() { for n in $dir/$name*{${BUILDARCH},noarch}.rpm; do thisName=$(rpm --qf '%{NAME}' -qp $n) if [ -z "$thisName" ]; then - return + continue fi if [ $thisName = $name ]; then echo $n @@ -798,7 +798,7 @@ for kernelvers in $vertag; do vertag="" fi - ppackage=$($LATEST $KERNELPATH kernel-pcmcia-cs) + ppackage=$($LATEST $KERNELPATH hwdata) if [ ! -f "$ppackage" ]; then ppackage="" fi @@ -824,7 +824,7 @@ for kernelvers in $vertag; do if [ -f $KERNELROOT/etc/pcmcia/config ]; then # This gets everything mentioned in /etc/pcmcia/config. We probably # want to do some module-info stuff here too - PCMCIAMODULES=$((perl -e 'while (<>) { s/^.*class.*module +"// || next; s/[" ]//g; s/,/\n/g; print }' $KERNELROOT/etc/pcmcia/config | sed 's/\.o//g') | sort -u) + PCMCIAMODULES=$((perl -e 'while (<>) { s/^.*class.*(network|scsi).*module +"// || next; s/[" ]//g; s/,/\n/g; print }' $KERNELROOT/etc/pcmcia/config | sed 's/\.o//g') | sort -u) fi allmods=$(find $KERNELROOT/lib/modules/$version -name *.o) |