SPECS (LINUX_2_6): kernel.spec - rndis modules now in net/usb not ...

[zbyniu]

Author: zbyniu                       Date: Sat Aug 11 12:48:39 2007 GMT
Module: SPECS                         Tag: LINUX_2_6
---- Log message:
- rndis modules now in net/usb not usb/net
- problematic patches commented out; status - builds with grsec_full on ac at amd64

---- Files affected:
SPECS:
   kernel.spec (1.441.2.1747 -> 1.441.2.1748) 

---- Diffs:

================================================================
Index: SPECS/kernel.spec
diff -u SPECS/kernel.spec:1.441.2.1747 SPECS/kernel.spec:1.441.2.1748
--- SPECS/kernel.spec:1.441.2.1747	Sat Aug 11 01:37:56 2007
+++ SPECS/kernel.spec	Sat Aug 11 14:48:33 2007
@@ -760,7 +760,7 @@
 %patch11 -p1
 
 # kernel-pom-ng-set.patch
-%patch12 -p1
+#patch12 -p1
 
 # kernel-pom-ng-u32.patch
 %patch13 -p1
@@ -778,7 +778,7 @@
 ##%patch17 -p1
 
 # kernel-pom-ng-IPMARK.patch
-%patch18 -p1
+#patch18 -p1
 
 # kernel-pom-ng-connlimit.patch
 %patch19 -p1
@@ -808,10 +808,10 @@
 %endif
 
 # esfq
-%patch53 -p1
+#patch53 -p1
 
 %if %{with wrr}
-%patch52 -p1
+#patch52 -p1
 %endif
 
 # toshiba_acpi
@@ -824,7 +824,7 @@
 %patch57 -p1
 %endif
 
-%patch58 -p1
+#patch58 -p1
 
 
 # linux-2.6-sk98lin_v10.0.4.3.patch
@@ -1147,7 +1147,7 @@
 	ln -sf arch/%{_target_base_arch}/defconfig .config
 
 %ifarch sparc
-	sparc32 %{__make} clean \
+	ARCH=sparc %{__make} clean \
 		RCS_FIND_IGNORE='-name build-done -prune -o'
 %else
 	%{__make} %CrossOpts clean \
@@ -1168,7 +1168,7 @@
 	%{__make} %CrossOpts modules \
 		%{?with_verbose:V=1}
 %else
-	sparc32 %{__make} \
+	ARCH=sparc %{__make} \
 		%{?with_verbose:V=1}
 %endif
 %else
@@ -1444,9 +1444,9 @@
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/telephony/ixj_pcmcia.ko*
 %exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/host/sl811_cs.ko*
 %endif
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/net/cdc_ether.ko*
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/net/rndis_host.ko*
-%exclude /lib/modules/%{kernel_release}/kernel/drivers/usb/net/usbnet.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/usb/cdc_ether.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/usb/rndis_host.ko*
+%exclude /lib/modules/%{kernel_release}/kernel/drivers/net/usb/usbnet.ko*
 %ghost /lib/modules/%{kernel_release}/modules.*
 %dir %{_sysconfdir}/modprobe.d/%{kernel_release}
 
@@ -1480,9 +1480,9 @@
 
 %files net-rndis
 %defattr(644,root,root,755)
-/lib/modules/%{kernel_release}/kernel/drivers/usb/net/cdc_ether.ko*
-/lib/modules/%{kernel_release}/kernel/drivers/usb/net/rndis_host.ko*
-/lib/modules/%{kernel_release}/kernel/drivers/usb/net/usbnet.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/net/usb/cdc_ether.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/net/usb/rndis_host.ko*
+/lib/modules/%{kernel_release}/kernel/drivers/net/usb/usbnet.ko*
 
 %ifarch ppc-broken
 %if "%{_arch}" == "ppc"
@@ -1600,6 +1600,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.441.2.1748  2007/08/11 12:48:33  zbyniu
+- rndis modules now in net/usb not usb/net
+- problematic patches commented out; status - builds with grsec_full on ac at amd64
+
 Revision 1.441.2.1747  2007/08/10 23:37:56  zbyniu
 - up to 2.6.22.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kernel.spec?r1=1.441.2.1747&r2=1.441.2.1748&f=u