wok rev 3436

module-init-tools/depmod: force full path for busybox modprobe
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Jun 13 16:45:39 2009 +0200 (2009-06-13)
parents f0f3070ff8fb
children bac358cff06c
files module-init-tools/receipt module-init-tools/stuff/depmod.u
line diff
     1.1 --- a/module-init-tools/receipt	Sat Jun 13 16:20:43 2009 +0200
     1.2 +++ b/module-init-tools/receipt	Sat Jun 13 16:45:39 2009 +0200
     1.3 @@ -15,8 +15,15 @@
     1.4  compile_rules()
     1.5  {
     1.6  	cd $src
     1.7 -	[ -f done.lzlib.u ] || patch -p1 < ../stuff/lzlib.u
     1.8 -	touch done.lzlib.u
     1.9 +	for patch_file in lzlib depmod; do
    1.10 +		if [ -f done.$patch_file ]; then
    1.11 +			echo "Skipping $patch_file"
    1.12 +			continue
    1.13 +		fi
    1.14 +		echo "Apply $patch_file.u"
    1.15 +		patch -p1 < ../stuff/$patch_file.u || return 1
    1.16 +		touch done.$patch_file
    1.17 +	done
    1.18  	./configure --enable-zlib --prefix=/usr \
    1.19  	--sbindir=/sbin --bindir=/bin --sysconfdir=/etc \
    1.20  	--infodir=/usr/share/info --mandir=/usr/share/man \
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/module-init-tools/stuff/depmod.u	Sat Jun 13 16:45:39 2009 +0200
     2.3 @@ -0,0 +1,22 @@
     2.4 +--- module-init-tools-3.9/depmod.c
     2.5 ++++ module-init-tools-3.9/depmod.c
     2.6 +@@ -395,16 +395,16 @@
     2.7 + {
     2.8 + 	struct module *i;
     2.9 + 
    2.10 ++	(void) dirname; /* force full path for busybox modprobe */
    2.11 + 	for (i = modules; i; i = i->next) {
    2.12 + 		struct list_head *j, *tmp;
    2.13 + 		order_dep_list(i, i);
    2.14 + 
    2.15 +-		fprintf(out, "%s:", compress_path(i->pathname, dirname));
    2.16 ++		fprintf(out, "%s:", i->pathname);
    2.17 + 		list_for_each_safe(j, tmp, &i->dep_list) {
    2.18 + 			struct module *dep
    2.19 + 				= list_entry(j, struct module, dep_list);
    2.20 +-			fprintf(out, " %s",
    2.21 +-			        compress_path(dep->pathname, dirname));
    2.22 ++			fprintf(out, " %s", dep->pathname);
    2.23 + 			list_del_init(j);
    2.24 + 		}
    2.25 + 		fprintf(out, "\n");