ngompa/kernel-rpm
1
0
Fork 0
forked from rpms/kernel
Code Pull Requests Activity

Avoid unnecessary modprobe invocations during compat-wireless build

Browse Source
This commit is contained in:
John W. Linville 2012-01-03 13:39:54 -05:00
parent 54daf00b3e
commit 37e219b967
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
compat-wireless-config-fixups.patch
View File

@ -1,6 +1,6 @@
diff -up compat-wireless-2011-12-18/config.mk.orig compat-wireless-2011-12-18/config.mk diff -up compat-wireless-2011-12-18/config.mk.orig compat-wireless-2011-12-18/config.mk
--- compat-wireless-2011-12-18/config.mk.orig 2012-01-03 10:06:27.899439404 -0500 --- compat-wireless-2011-12-18/config.mk.orig 2012-01-03 13:35:41.795494109 -0500
+++ compat-wireless-2011-12-18/config.mk 2012-01-03 10:06:47.652192463 -0500 +++ compat-wireless-2011-12-18/config.mk 2012-01-03 13:35:54.598334052 -0500
@@ -14,6 +14,9 @@ else @@ -14,6 +14,9 @@ else
include $(KLIB_BUILD)/.config include $(KLIB_BUILD)/.config
endif endif
@ -30,14 +30,14 @@ diff -up compat-wireless-2011-12-18/config.mk.orig compat-wireless-2011-12-18/co
endif #CONFIG_CRC_CCITT endif #CONFIG_CRC_CCITT
CONFIG_RT2X00_LIB_USB=m CONFIG_RT2X00_LIB_USB=m
diff -up compat-wireless-2011-12-18/drivers/misc/eeprom/Makefile.orig compat-wireless-2011-12-18/drivers/misc/eeprom/Makefile diff -up compat-wireless-2011-12-18/drivers/misc/eeprom/Makefile.orig compat-wireless-2011-12-18/drivers/misc/eeprom/Makefile
--- compat-wireless-2011-12-18/drivers/misc/eeprom/Makefile.orig 2012-01-03 10:06:27.900439392 -0500 --- compat-wireless-2011-12-18/drivers/misc/eeprom/Makefile.orig 2012-01-03 13:35:41.795494109 -0500
+++ compat-wireless-2011-12-18/drivers/misc/eeprom/Makefile 2012-01-03 10:06:32.150386263 -0500 +++ compat-wireless-2011-12-18/drivers/misc/eeprom/Makefile 2012-01-03 13:35:54.598334052 -0500
@@ -1 +1 @@ @@ -1 +1 @@
-obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o -obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o
+#obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o +#obj-$(CONFIG_EEPROM_93CX6) += eeprom_93cx6.o
diff -up compat-wireless-2011-12-18/drivers/net/ethernet/atheros/Makefile.orig compat-wireless-2011-12-18/drivers/net/ethernet/atheros/Makefile diff -up compat-wireless-2011-12-18/drivers/net/ethernet/atheros/Makefile.orig compat-wireless-2011-12-18/drivers/net/ethernet/atheros/Makefile
--- compat-wireless-2011-12-18/drivers/net/ethernet/atheros/Makefile.orig 2012-01-03 10:06:27.900439392 -0500 --- compat-wireless-2011-12-18/drivers/net/ethernet/atheros/Makefile.orig 2012-01-03 13:35:41.795494109 -0500
+++ compat-wireless-2011-12-18/drivers/net/ethernet/atheros/Makefile 2012-01-03 10:06:32.150386263 -0500 +++ compat-wireless-2011-12-18/drivers/net/ethernet/atheros/Makefile 2012-01-03 13:35:54.599334040 -0500
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
# Makefile for the Atheros network device drivers. # Makefile for the Atheros network device drivers.
# #
@ -51,8 +51,8 @@ diff -up compat-wireless-2011-12-18/drivers/net/ethernet/atheros/Makefile.orig c
+#obj-$(CONFIG_ATL1E) += atl1e/ +#obj-$(CONFIG_ATL1E) += atl1e/
+#obj-$(CONFIG_ATL1C) += atl1c/ +#obj-$(CONFIG_ATL1C) += atl1c/
diff -up compat-wireless-2011-12-18/drivers/net/usb/Makefile.orig compat-wireless-2011-12-18/drivers/net/usb/Makefile diff -up compat-wireless-2011-12-18/drivers/net/usb/Makefile.orig compat-wireless-2011-12-18/drivers/net/usb/Makefile
--- compat-wireless-2011-12-18/drivers/net/usb/Makefile.orig 2012-01-03 10:06:27.900439392 -0500 --- compat-wireless-2011-12-18/drivers/net/usb/Makefile.orig 2012-01-03 13:35:41.796494097 -0500
+++ compat-wireless-2011-12-18/drivers/net/usb/Makefile 2012-01-03 10:06:32.150386263 -0500 +++ compat-wireless-2011-12-18/drivers/net/usb/Makefile 2012-01-03 13:35:54.599334040 -0500
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
# Makefile for USB Network drivers # Makefile for USB Network drivers
# #
@ -65,8 +65,19 @@ diff -up compat-wireless-2011-12-18/drivers/net/usb/Makefile.orig compat-wireles
+#obj-$(CONFIG_USB_COMPAT_USBNET) += usbnet.o +#obj-$(CONFIG_USB_COMPAT_USBNET) += usbnet.o
diff -up compat-wireless-2011-12-18/Makefile.orig compat-wireless-2011-12-18/Makefile diff -up compat-wireless-2011-12-18/Makefile.orig compat-wireless-2011-12-18/Makefile
--- compat-wireless-2011-12-18/Makefile.orig 2012-01-03 10:06:27.901439380 -0500 --- compat-wireless-2011-12-18/Makefile.orig 2012-01-03 13:35:41.796494097 -0500
+++ compat-wireless-2011-12-18/Makefile 2012-01-03 10:06:32.150386263 -0500 +++ compat-wireless-2011-12-18/Makefile 2012-01-03 13:36:14.062090719 -0500
@@ -8,8 +8,8 @@ endif
export KLIB_BUILD ?= $(KLIB)/build
# Sometimes not available in the path
MODPROBE := /sbin/modprobe
-MADWIFI=$(shell $(MODPROBE) -l ath_pci)
-OLD_IWL=$(shell $(MODPROBE) -l iwl4965)
+MADWIFI=""
+OLD_IWL=""
DESTDIR?=
@@ -41,8 +41,8 @@ endif @@ -41,8 +41,8 @@ endif
endif endif

3
kernel.spec
View File

@ -2286,6 +2286,9 @@ fi
# ||----w | # ||----w |
# || || # || ||
%changelog %changelog
* Tue Jan 03 2012 John W. Linville <linville@redhat.com>
- Avoid unnecessary modprobe invocations during compat-wireless build
* Tue Jan 03 2012 Josh Boyer <jwboyer@redhat.com> * Tue Jan 03 2012 Josh Boyer <jwboyer@redhat.com>
- Add bluetooth support for BCM20102A0 21e3 (rhbz 770233) - Add bluetooth support for BCM20102A0 21e3 (rhbz 770233)