diff options
| author | Maarten Vanraes <alien@mageia.org> | 2013-03-13 19:52:07 +0000 |
|---|---|---|
| committer | Maarten Vanraes <alien@mageia.org> | 2013-03-13 19:52:07 +0000 |
| commit | 76b600e66d3056d8492f8ffb389a6a513b444f9f (patch) | |
| tree | 96ca93264780c50ce49b6bb226d4b3f107739498 | |
| parent | a808d4342041e1fd111a4948535c9efb891cf799 (diff) | |
| download | drakx-76b600e66d3056d8492f8ffb389a6a513b444f9f.tar drakx-76b600e66d3056d8492f8ffb389a6a513b444f9f.tar.gz drakx-76b600e66d3056d8492f8ffb389a6a513b444f9f.tar.bz2 drakx-76b600e66d3056d8492f8ffb389a6a513b444f9f.tar.xz drakx-76b600e66d3056d8492f8ffb389a6a513b444f9f.zip | |
- fix loading modules with "-" in their names (mga#9242)
- add an easy buildtarget for testing
| -rw-r--r-- | mdk-stage1/Makefile | 10 | ||||
| -rw-r--r-- | mdk-stage1/NEWS | 5 | ||||
| -rw-r--r-- | mdk-stage1/modules.c | 9 |
3 files changed, 14 insertions, 10 deletions
diff --git a/mdk-stage1/Makefile b/mdk-stage1/Makefile index 0f13757dc..92a30d7f5 100644 --- a/mdk-stage1/Makefile +++ b/mdk-stage1/Makefile @@ -15,7 +15,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -VERSION=1.74.1 +VERSION=1.75 PRODUCT=drakx-installer-binaries # @@ -217,6 +217,14 @@ tar: fi; $(info $(PRODUCT)-$(VERSION).tar.xz is ready) +dist-svn-test: + mkdir -p $(PRODUCT)-$(VERSION) + svn export -q . $(PRODUCT)-$(VERSION)/mdk-stage1 + svn export -q ../kernel $(PRODUCT)-$(VERSION)/kernel + cp ../Makefile.config $(PRODUCT)-$(VERSION)/ + tar cfa $(PRODUCT)-$(VERSION).tar.xz $(PRODUCT)-$(VERSION) + rm -rf $(PRODUCT)-$(VERSION) + dist-svn: mkdir -p $(PRODUCT)-$(VERSION) svn export -q -rBASE . $(PRODUCT)-$(VERSION)/mdk-stage1 diff --git a/mdk-stage1/NEWS b/mdk-stage1/NEWS index cafc17990..843579e0a 100644 --- a/mdk-stage1/NEWS +++ b/mdk-stage1/NEWS @@ -1,4 +1,7 @@ -- 1.74.1 +1.75 +- fix loading modules with "-" in their names (mga#9242) + +1.74.1 - update list_modules for xen dom0 and virtio support (#9242) 1.74 diff --git a/mdk-stage1/modules.c b/mdk-stage1/modules.c index 0c9aa0c32..3b4a94279 100644 --- a/mdk-stage1/modules.c +++ b/mdk-stage1/modules.c @@ -92,20 +92,13 @@ static char *kernel_module_extension(void) static char *filename2modname(char * filename) { - char *modname, *p; + char *modname; modname = strdup(basename(filename)); if (strstr(modname, kernel_module_extension())) { modname[strlen(modname)-strlen(kernel_module_extension())] = '\0'; /* remove trailing .ko.gz */ } - p = modname; - while (p && *p) { - if (*p == '-') - *p = '_'; - p++; - } - return modname; } |