[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#479271: linux-kbuild-2.6.25: custom modpost breaks building external modules

Package: linux-kbuild-2.6.25
Version: 2.6.25-1
Severity: important
Tags: patch

modpost has gained additional cli parameters in 2.6.25, while the custom 
wrapper included in linux-kbuild-2.6 hasn't been adapted to those yet. 
This breaks compiling any external module package with/ against it (this 
is not specific to lirc or amd64):

$ LANG= m-a --kvers-list 2.6.25-1-amd64 --kernel-dir /usr/src/linux-headers-2.6.25-1-amd64/ --userdir /tmp/pkg/ --text-mode build lirc
mkdir -p /tmp/pkg/usr_src/modules/lirc/drivers/lirc_dev/.tmp_versions ; rm -f /tmp/pkg/usr_src/modules/lirc/drivers/lirc_dev/.tmp_versions/*
/usr/bin/make -f scripts/Makefile.build obj=/tmp/pkg/usr_src/modules/lirc/drivers/lirc_dev
   gcc-4.1 -Wp,-MD,/tmp/pkg/usr_src/modules/lirc/drivers/lirc_dev/.lirc_dev.o.d  -nostdinc -isystem /usr/lib/gcc/x86_64-linux-gnu/4.1.3/include -D__KERNEL__ -Iinclude  -include include/linux/autoconf.h -Wall -Wundef -Wstrict-prototypes -Wno-trigraphs -fno-strict-aliasing -fno-common -Werror-implicit-function-declaration -Os  -fno-stack-protector -m64 -mtune=generic -mno-red-zone -mcmodel=kernel -funit-at-a-time -maccumulate-outgoing-args    -pipe -Wno-sign-compare -fno-asynchronous-unwind-tables -mno-sse -mno-mmx -mno-sse2 -mno-3dnow  -fomit-frame-pointer -Wdeclaration-after-statement -Wno-pointer-sign   -DIRCTL_DEV_MAJOR=61 -DEXPORT_SYMTAB -DHAVE_CONFIG_H -I. -I. -I../.. -I/tmp/pkg/usr_src/modules/lirc/drivers/lirc_dev/../.. -I/usr/src/linux-headers-2.6.25-1-amd64//include/ -I/usr/src/linux-headers-2.6.25-1-amd64//drivers/media/video/  -DMODULE -D"KBUILD_STR(s)=#s" -D"KBUILD_BASENAME=KBUILD_STR(lirc_dev)"  -D"KBUILD_MODNAME=KBUILD_STR(lirc_dev)" -c -o /tmp/pkg/usr_src/modules/lirc/drivers/lirc_dev/.tmp_lirc_dev.o /tmp/pkg/usr_src/modules/lirc/drivers/lirc_dev/lirc_dev.c
(cat /dev/null;   echo kernel//tmp/pkg/usr_src/modules/lirc/drivers/lirc_dev/lirc_dev.ko;) > /tmp/pkg/usr_src/modules/lirc/drivers/lirc_dev/modules.order
  Building modules, stage 2.
/usr/bin/make -f /usr/src/linux-headers-2.6.25-1-amd64/scripts/Makefile.modpost
  scripts/mod/modpost -m  -i /usr/src/linux-headers-2.6.25-1-amd64/Module.symvers -I /tmp/pkg/usr_src/modules/lirc/drivers/lirc_dev/Module.symvers -o /tmp/pkg/usr_src/modules/lirc/drivers/lirc_dev/Module.symvers -S   -w -c -s
scripts/mod/modpost: invalid option -- S
make[6]: *** [__modpost] Error 1
make[5]: *** [modules] Error 2

Please apply the attached patch, which tells linux-kbuild-2.6's custom 
modpost wrapper about the newly added cli parameters supported, and 
required, by kernel 2.6.25's modpost. Successfully tested on amd64/ i386 
and using module-assistant/ a linux-modules-extra-2.6 variant with several
different ${modules}-source packages.

	Stefan Lippers-Hollmann

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.25-1.slh.2-sidux-amd64 (SMP w/2 CPU cores; PREEMPT)
Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages linux-kbuild-2.6.25 depends on:
ii  libc6                         2.7-10     GNU C Library: Shared libraries

linux-kbuild-2.6.25 recommends no packages.

-- no debconf information
diff -Nrup a/src/mod/modpost.c b/src/mod/modpost.c
--- a/src/mod/modpost.c	2008-05-04 00:48:29.000000000 +0200
+++ b/src/mod/modpost.c	2008-05-04 00:49:15.000000000 +0200
@@ -13,17 +13,21 @@ int main (int argc, char *argv[])
   int opt;
   FILE *file;
-  while ((opt = getopt (argc, argv, "ai:I:mo:sw")) != -1)
+  while ((opt = getopt (argc, argv, "i:I:cmsSo:awM:K:")) != -1)
-      case 'a':
       case 'i':
       case 'I':
+      case 'c':
       case 'm':
-      case 'o':
       case 's':
+      case 'S':
+      case 'o':
+      case 'a':
       case 'w':
+      case 'M':
+      case 'K':
         return EXIT_FAILURE;

Attachment: signature.asc
Description: This is a digitally signed message part.

Reply to: