rpms/kernel-xen/devel linux-2.6.12-license.patch, NONE, 1.1 kernel-xen.spec, 1.15, 1.16

[fedora-cvs-commits at redhat.com]

Author: quintela

Update of /cvs/dist/rpms/kernel-xen/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv4096

Modified Files:
	kernel-xen.spec 
Added Files:
	linux-2.6.12-license.patch 
Log Message:
added Dual BSD/GPL license to xen modules

linux-2.6.12-license.patch:
 blkfront/blkfront.c |    2 +-
 netfront/netfront.c |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE linux-2.6.12-license.patch ---
--- linux-2.6.12/drivers/xen/blkfront/blkfront.c.license	2005-12-08 02:45:16.000000000 +0100
+++ linux-2.6.12/drivers/xen/blkfront/blkfront.c	2005-12-08 02:45:42.000000000 +0100
@@ -820,7 +820,7 @@
 }
 module_exit(xlblk_exit);
 
-MODULE_LICENSE("BSD");
+MODULE_LICENSE("Dual BSD/GPL");
 
 
 /*
--- linux-2.6.12/drivers/xen/netfront/netfront.c.license	2005-12-08 02:47:08.000000000 +0100
+++ linux-2.6.12/drivers/xen/netfront/netfront.c	2005-12-08 02:46:41.000000000 +0100
@@ -1282,7 +1282,7 @@
 }
 module_exit(netif_exit);
 
-MODULE_LICENSE("BSD");
+MODULE_LICENSE("Dual BSD/GPL");
  
  
 /* ** /proc **/


Index: kernel-xen.spec
===================================================================
RCS file: /cvs/dist/rpms/kernel-xen/devel/kernel-xen.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kernel-xen.spec	7 Dec 2005 17:09:33 -0000	1.15
+++ kernel-xen.spec	8 Dec 2005 01:53:00 -0000	1.16
@@ -114,6 +114,7 @@
 
 Patch1000: linux-2.6.12-xen.patch
 Patch1001: linux-2.6.12-xen-no-tls-warn.patch
+Patch1002: linux-2.6.12-license.patch
 
 
 # END OF PATCH DEFINITIONS
@@ -210,7 +211,7 @@
 
 # This patch adds a "make nonint_oldconfig" which is non-interactive and
 # also gives a list of missing options at the end. Useful for automated
-# builds (as used in the buildsystem).
+# builds (as used in the buildsystem).eam
 %patch800 -p1
 
 #
@@ -219,6 +220,7 @@
 
 %patch1000 -p1
 %patch1001 -p1
+%patch1002 -p1
 
 
 #
@@ -311,7 +313,9 @@
     
     # Start installing the results
 
+%if "%{_enable_debug_packages}" == "1"
     mkdir -p $RPM_BUILD_ROOT/usr/lib/debug/boot
+%endif
     mkdir -p $RPM_BUILD_ROOT/%{image_install_path}
     install -m 644 .config $RPM_BUILD_ROOT/boot/config-$KernelVer
     install -m 644 System.map $RPM_BUILD_ROOT/boot/System.map-$KernelVer
@@ -378,9 +382,10 @@
     #
     # save the vmlinux file for kernel debugging into the kernel-debuginfo rpm
     #
+%if "%{_enable_debug_packages}" == "1"
     mkdir -p $RPM_BUILD_ROOT/usr/lib/debug/lib/modules/$KernelVer
     cp vmlinux $RPM_BUILD_ROOT/usr/lib/debug/lib/modules/$KernelVer
-
+%endif
     find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name "*.ko" -type f >modnames
 
     # mark modules executable so that strip-to-file can strip them
@@ -529,7 +534,9 @@
 /usr/src/kernels/%{KVERREL}guest-%{_target_cpu}
 
 %changelog
-* Wed Dec  7 2005 Juan Quintela <quintela at redhat.com>
+* Thu Dec  8 2005 Juan Quintela <quintela at trasno.org>
+- change BSD to Dual BSD/GPL licenses (agreed with upstream)
+- Stole %%{_enable_debug_packages} from upstream
 - patch 2.6.12.6
 - Updated to 3.0.0 (20051206)