From 1cfcee7274a86ca36b533f9e72fbe8611566cb5e Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Fri, 7 Sep 2007 10:17:59 +0000 Subject: rename ldetect-lst.conf modprobe file as hardcoded-modules.alias and merge it in preferred-modules.alias at build time --- lst/Makefile | 6 ++---- lst/hardcoded-modules.alias | 1 + lst/modprobe.conf | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) create mode 100644 lst/hardcoded-modules.alias delete mode 100644 lst/modprobe.conf (limited to 'lst') 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/hardcoded-modules.alias b/lst/hardcoded-modules.alias new file mode 100644 index 00000000..227edfbb --- /dev/null +++ b/lst/hardcoded-modules.alias @@ -0,0 +1 @@ +alias pcmcia:m*c*f*fn*pfn*paC7B8DF9Dpb1700D087pc4B74BAA0pd* hostap_cs diff --git a/lst/modprobe.conf b/lst/modprobe.conf deleted file mode 100644 index 227edfbb..00000000 --- a/lst/modprobe.conf +++ /dev/null @@ -1 +0,0 @@ -alias pcmcia:m*c*f*fn*pfn*paC7B8DF9Dpb1700D087pc4B74BAA0pd* hostap_cs -- cgit v1.2.1