I just pulled from kohler/master and tried click patchless on a Fedora14 with a
recent kernel 2.6.35.6-48.fc14.i686 #1 SMP. I had to add Joonwoo's 3/12
(declare kobj_ns_type) and 4/12 (NETREG_REGISTERED scoping issue) patches in
order to compile the kernel object. Since fixincludes.pl changed from the time
Joonwoo submitted his patches, I am providing a patch against the most recent
code.
Roman
diff --git a/linuxmodule/fixincludes.pl b/linuxmodule/fixincludes.pl
index 4f48e05..f0ab7c2 100755
--- a/linuxmodule/fixincludes.pl
+++ b/linuxmodule/fixincludes.pl
@@ -208,6 +208,14 @@ sub one_includeroot ($$) {
if ($d eq "sched.h") {
s<^(extern char ___assert_task_state)((?:.*?\n)*?.*?\;.*)$><\#ifndef __cplusplus\n$1$2\n\#endif>mg;
}
+ if ($d eq "kobject.h") {
+ s{(^\#include \<linux\/sysfs.h\>(.*\n)*)(^enum kobj_ns_type\s\{\n([^\}].*\n)*\}\;)((.*\n)*)}{"$3\n$1\/*\n$3\n*\/$5"}emg;
+ }
+ if ($d eq "netdevice.h") {
+ s{(.*)(\(.*\b)(NETREG_.+)(\b\))}{#ifdef __cplusplus\n$1$2net_device::$3$4\n#else\n$1$2$3$4\n#endif}g;
+ }
+
+
# unquote.
$_ = sunprotect($_);
_______________________________________________
click mailing list
[email protected]
https://amsterdam.lcs.mit.edu/mailman/listinfo/click
