wok-6.x rev 1478

busybox/depmod: add ignored options uqrC
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sat Oct 04 14:30:26 2008 +0000 (2008-10-04)
parents 2a0038b01ed7
children 34c8cf508889
files busybox/receipt busybox/stuff/busybox-1.12.0-zmodules.u
line diff
     1.1 --- a/busybox/receipt	Sat Oct 04 13:18:21 2008 +0000
     1.2 +++ b/busybox/receipt	Sat Oct 04 14:30:26 2008 +0000
     1.3 @@ -17,13 +17,10 @@
     1.4  {
     1.5      cd $src
     1.6      while read file; do
     1.7 -    	if [ -f done.$file ]; then
     1.8 -    		echo "Skipping $file"
     1.9 -    		continue
    1.10 -    	fi
    1.11 +    	[ -f done.$file ] && continue
    1.12      	echo "Apply $file..."
    1.13      	patch -p1 < ../stuff/$file || return 1
    1.14 -    	touch done.$file
    1.15 +	touch done.$file
    1.16      done <<EOT
    1.17  $PACKAGE-$VERSION-vcsa2txt.u
    1.18  $PACKAGE-$VERSION-dhcpc.u
     2.1 --- a/busybox/stuff/busybox-1.12.0-zmodules.u	Sat Oct 04 13:18:21 2008 +0000
     2.2 +++ b/busybox/stuff/busybox-1.12.0-zmodules.u	Sat Oct 04 14:30:26 2008 +0000
     2.3 @@ -170,3 +170,24 @@
     2.4   
     2.5   				/* Cope with blank lines */
     2.6   				if ((next - deps - ext + 1) <= 0)
     2.7 +
     2.8 +--- busybox-1.12.0/modutils/depmod.c
     2.9 ++++ busybox-1.12.0/modutils/depmod.c
    2.10 +@@ -109,11 +109,15 @@
    2.11 + 		ARG_b = (1<<2), /* not /lib/modules/$(uname -r)/ but this base-dir */
    2.12 + 		ARG_e = (1<<3), /* with -F, print unresolved symbols */
    2.13 + 		ARG_F = (1<<4), /* System.map that contains the symbols */
    2.14 +-		ARG_n = (1<<5)  /* dry-run, print to stdout only */
    2.15 ++		ARG_n = (1<<5), /* dry-run, print to stdout only */
    2.16 ++		ARG_u = (1<<6), /* unresolved-error: ignored */
    2.17 ++		ARG_q = (1<<7), /* quiet: ignored */
    2.18 ++		ARG_r = (1<<8), /* root: ignored */
    2.19 ++		ARG_C = (1<<9)  /* config: ignored */
    2.20 + 	};
    2.21 + 	INIT_G();
    2.22 + 
    2.23 +-	getopt32(argv, "aAb:eF:n", &moddir_base, &system_map);
    2.24 ++	getopt32(argv, "aAb:eF:nuqrC", &moddir_base, &system_map);
    2.25 + 	argv += optind;
    2.26 + 
    2.27 + 	/* If a version is provided, then that kernel version’s module directory