On Sun, 20 Apr 2003 09:54:53 +1000,
Brian May <[EMAIL PROTECTED]> wrote:
>modutils >= 2.4.17 is not available for woody. You
>have two options: 2.4.15 for stable or 2.4.21 for unstable.
>
>This means you would have to recompile 2.4.21.
>
>Recompiling is easy, I have a version at
><URL:http://www.microcomaustralia.com.au/debian/pool/main/m/modutils/>.
>You can use this for testing purposes.
>
>It does not solve the issue though that the versions of the packages as
>supplied with woody might be broken.
>
>We don't really want to force all woody users to upgrade to unstable
>before we are ready to release just to get working binutils+modutils
>combination, do we?
This is the required patch backported to modutils 2.4.15. Apply it to
woody. I am surprised that this is necessary, Wichert knew about this
problem when binutils was first upgraded.
Index: 15.14/depmod/depmod.c
--- 15.14/depmod/depmod.c Fri, 01 Mar 2002 11:39:06 +1100 kaos
(modutils-2.4/24_depmod.c 1.17 644)
+++ 15.14(w)/depmod/depmod.c Sun, 20 Apr 2003 10:07:11 +1000 kaos
(modutils-2.4/24_depmod.c 1.17 644)
@@ -1059,12 +1059,9 @@ static int addksyms(char *file_syms)
if (!isspace(*line)) /* Adressless symbol? */
p = strtok(NULL, " \t\n");
/* The second word is either the symbol name or a type */
- if (p && strlen(p) == 1) { /* System.map */
+ if (p && p[0] && !p[1]) { /* System.map */
is_mapfile = 1;
- if (*p != '?')
- p = NULL;
- else
- p = strtok(NULL, " \t\n");
+ p = strtok(NULL, " \t\n");
} else { /* /proc/ksyms copy */
if (p && strtok(NULL, " \t\n"))
p = NULL;
@@ -1082,7 +1079,7 @@ static int addksyms(char *file_syms)
if (!isspace(*line)) /* Adressless symbol? */
p = strtok(NULL, " \t\n");
if (is_mapfile) {
- if (*p != '?')
+ if (!p || !p[0] || p[1])
continue;
p = strtok(NULL, " \t\n");
/* Sparc has symbols like '.div' that need to be
