Permalink
Browse files

added 2900_ndiswrapper_gplonly.patch

  • Loading branch information...
1 parent f96e625 commit 6bf783fdd49fb3746b0c24389697e869f21405c0 @gebi gebi committed Mar 3, 2008
Showing with 79 additions and 0 deletions.
  1. +21 −0 2.6.24/2900_ndiswrapper_gplonly.patch
  2. +58 −0 2.6.24/README
@@ -0,0 +1,21 @@
+diff --git a/kernel/module.c b/kernel/module.c
+index 901cd6a..a11f523 100644
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -1933,8 +1933,15 @@ static struct module *load_module(void __user *umod,
+ /* Set up license info based on the info section */
+ set_license(mod, get_modinfo(sechdrs, infoindex, "license"));
+
++ /*
++ * ndiswrapper is under GPL by itself, but loads proprietary modules.
++ * Don't use add_taint_module(), as it would prevent ndiswrapper from
++ * using GPL-only symbols it needs.
++ */
+ if (strcmp(mod->name, "ndiswrapper") == 0)
+- add_taint_module(mod, TAINT_PROPRIETARY_MODULE);
++ add_taint(TAINT_PROPRIETARY_MODULE);
++
++ /* driverloader was caught wrongly pretending to be under GPL */
+ if (strcmp(mod->name, "driverloader") == 0)
+ add_taint_module(mod, TAINT_PROPRIETARY_MODULE);
+
View
@@ -0,0 +1,58 @@
+--------------------------------------------------------------------------
+Latest change: Mon Feb 11 08:54:29 CET 2008 [mika]
+--------------------------------------------------------------------------
+
+README
+--------------------------------------------------------------------------
+This patchset is for the latest linux kernel provided by grml.org.
+It is based on genpatches, ubuntu-2.6.git, debian patches and work by the
+grml-team.
+
+Patchset Numbering Scheme
+--------------------------------------------------------------------------
+
+FIXES
+1000-1400 linux-stable
+1400-1500 linux-stable queue
+1500-1700 security
+1700-1800 architecture-related
+1800-1900 mm/scheduling/misc
+1900-2000 filesystems
+2000-2100 networking core
+2100-2200 storage core
+2200-2300 power management (ACPI, APM)
+2300-2400 bus (USB, IEEE1394, PCI, PCMCIA, ...)
+2400-2500 network drivers
+2500-2600 storage drivers
+2600-2700 input
+2700-2900 media (graphics, sound, tv)
+2900-3000 other
+3000-4000 reserved
+
+FEATURES
+4000-4100 network
+4100-4200 storage
+4200-4300 graphics
+4300-4400 filesystem
+4400-4500 other
+
+GRML
+5000-5100 grml-specific
+
+
+Individual Patch Descriptions:
+--------------------------------------------------------------------------
+
+Patch: 2900_ndiswrapper_gplonly.patch
+From: http://kerneltrap.org/Linux/NDISwrapper_and_the_GPL
+Desc: Correct unintentional breakage of ndiswrapper
+
+Patch: 5000_grml-version.patch
+From: http://hg.grml.org/grml-kernel/
+Desc: adjust kernel version for the grml-system (add -grml)
+
+Patch: 5001_grml_logo.patch
+From: http://dufo.tugraz.at/~prokop/grml-kernel/
+Desc: grml-logo in framebuffer
+
+##############################################################################################

0 comments on commit 6bf783f

Please sign in to comment.