diff options
| author | Olivier Blin <oblin@mandriva.com> | 2007-09-07 10:17:59 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2007-09-07 10:17:59 +0000 |
| commit | 1cfcee7274a86ca36b533f9e72fbe8611566cb5e (patch) | |
| tree | 0559b6076f88a6fa5780b76eb280e73eefd8ada7 | |
| parent | 6a9e6c7dfa9e62657c17254cf096c16a05dcdf01 (diff) | |
| download | ldetect-lst-1cfcee7274a86ca36b533f9e72fbe8611566cb5e.tar ldetect-lst-1cfcee7274a86ca36b533f9e72fbe8611566cb5e.tar.gz ldetect-lst-1cfcee7274a86ca36b533f9e72fbe8611566cb5e.tar.bz2 ldetect-lst-1cfcee7274a86ca36b533f9e72fbe8611566cb5e.tar.xz ldetect-lst-1cfcee7274a86ca36b533f9e72fbe8611566cb5e.zip | |
rename ldetect-lst.conf modprobe file as hardcoded-modules.alias and merge it in preferred-modules.alias at build time
| -rw-r--r-- | lst/Makefile | 6 | ||||
| -rw-r--r-- | lst/hardcoded-modules.alias (renamed from lst/modprobe.conf) | 0 |
2 files changed, 2 insertions, 4 deletions
diff --git a/lst/Makefile b/lst/Makefile index 496b8ad9..559e1bc8 100644 --- a/lst/Makefile +++ b/lst/Makefile @@ -27,8 +27,9 @@ check: @cd ../convert; ./verify_Cards.pl @rm -f .pcitable .usbtable -preferred-modules.alias: +preferred-modules.alias: hardcoded-modules.alias @../convert/uniquify-modalias.pl > $@ 2>undecided.alias + @cat hardcoded-modules.alias >> $@ $(TMP_TABLES1): %.tmp: % ../convert/merge2pcitable.pl pcitable $< $<.$(ARCH) > $@ @@ -54,8 +55,5 @@ install: $(TMP_TABLES) $(TABLES3) install -m 644 ScannerDB.gz scannerconfigs Cards+ MonitorsDB isdn.db $(dir) - mkdir -p $(modprobe_dir) - install -m 644 modprobe.conf $(modprobe_dir)/$(project).conf - install -m 644 `ls -tr /lib/modules/*/modules.alias | tail -1` $(dir)/fallback-modules.alias install -m 644 preferred-modules.alias $(dir)/preferred-modules.alias diff --git a/lst/modprobe.conf b/lst/hardcoded-modules.alias index 227edfbb..227edfbb 100644 --- a/lst/modprobe.conf +++ b/lst/hardcoded-modules.alias |