diff options
| -rwxr-xr-x | convert/uniquify-modalias.pl | 5 | ||||
| -rw-r--r-- | lst/Makefile | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/convert/uniquify-modalias.pl b/convert/uniquify-modalias.pl index 90ed0f10..89345ce5 100755 --- a/convert/uniquify-modalias.pl +++ b/convert/uniquify-modalias.pl @@ -102,9 +102,8 @@ sub print_module { print STDERR "unable to choose for $modalias " . join(" ", map { $_->[1] } @modules) . "\n"; } -#- we are only interested in the last group: -# /lib/modules/`uname -r`/modules.alias -my $alias_group = top(modalias::get_alias_groups()); +my $alias_group = {}; +modalias::parse_path($alias_group, "../lst/fallback-modules.alias"); foreach my $class (qw(pci pcmcia usb)) { my @class_other = group_by2(@{$alias_group->{$class}{other}}); diff --git a/lst/Makefile b/lst/Makefile index 559e1bc8..ceaedfaa 100644 --- a/lst/Makefile +++ b/lst/Makefile @@ -15,7 +15,7 @@ TMP_TABLES = $(TABLES:%=%.tmp) build: preferred-modules.alias clean: - rm -f *~ *.tmp ScannerDB.gz preferred-modules.alias + rm -f *~ *.tmp ScannerDB.gz preferred-modules.alias fallback-modules.alias check: @../convert/merge2pcitable.pl pcitable pcitable.x86_64 pcitable.x86_64 > .pcitable @@ -27,7 +27,10 @@ check: @cd ../convert; ./verify_Cards.pl @rm -f .pcitable .usbtable -preferred-modules.alias: hardcoded-modules.alias +fallback-modules.alias: + cp `ls -tr /lib/modules/*/modules.alias | tail -1` fallback-modules.alias + +preferred-modules.alias: hardcoded-modules.alias fallback-modules.alias @../convert/uniquify-modalias.pl > $@ 2>undecided.alias @cat hardcoded-modules.alias >> $@ @@ -55,5 +58,5 @@ install: $(TMP_TABLES) $(TABLES3) install -m 644 ScannerDB.gz scannerconfigs Cards+ MonitorsDB isdn.db $(dir) - install -m 644 `ls -tr /lib/modules/*/modules.alias | tail -1` $(dir)/fallback-modules.alias + install -m 644 fallback-modules.alias $(dir)/fallback-modules.alias install -m 644 preferred-modules.alias $(dir)/preferred-modules.alias |