[kernel/f16] Drop compat-wireless infrastructure in preparation for 3.3 rebase
Josh Boyer
jwboyer at fedoraproject.org
Mon Mar 19 23:24:30 UTC 2012
commit d8b686023e84924ae01d8e0b733c63d38f08ea4c
Author: Josh Boyer <jwboyer at redhat.com>
Date: Mon Mar 19 13:39:58 2012 -0400
Drop compat-wireless infrastructure in preparation for 3.3 rebase
...-kernel-panic-during-driver-initilization.patch | 94 ---
ath9k-fix-a-WEP-crypto-related-regression.patch | 43 --
...on-rates-with-idx-1-in-ath9k-rate-control.patch | 39 --
...se-WARN_ON_ONCE-in-ath_rc_get_highest_rix.patch | 29 -
ath9k_hw-fix-a-RTS-CTS-timeout-regression.patch | 50 --
...hw-prevent-writes-to-const-data-on-AR9160.patch | 117 ----
...ion-to-avoid-duplicating-device-support-w.patch | 47 --
bcma-Fix-mem-leak-in-bcma_bus_scan.patch | 51 --
bcma-don-t-fail-for-bad-SPROM-CRC.patch | 36 -
...mac-fix-endless-retry-of-A-MPDU-transmiss.patch | 56 --
...mac-only-print-block-ack-timeout-message-.patch | 37 -
brcmsmac-fix-tx-queue-flush-infinite-loop.patch | 51 --
compat-wireless-config-fixups.patch | 67 --
compat-wireless-integrated-build.patch | 12 -
compat-wireless-pr_fmt-warning-avoidance.patch | 710 --------------------
...s-rtl8192cu-Fix-WARNING-on-suspend-resume.patch | 131 ----
config-backports | 29 -
...-t-mess-up-QoS-counters-with-non-QoS-fram.patch | 89 ---
iwlwifi-fix-PCI-E-transport-inta-race.patch | 51 --
iwlwifi-fix-key-removal.patch | 56 --
...e-Tx-aggregation-enabled-on-ra-be-at-DEBU.patch | 30 -
kernel.spec | 190 +-----
mac80211-Fix-a-rwlock-bad-magic-bug.patch | 89 ---
...x-a-warning-on-changing-to-monitor-mode-f.patch | 72 --
...e-the-right-headroom-size-for-mesh-mgmt-f.patch | 83 ---
mac80211-call-rate-control-only-after-init.patch | 91 ---
...-not-call-rate-control-.tx_status-before-.patch | 33 -
mac80211-fix-debugfs-key-station-symlink.patch | 43 --
...1-set-bss_conf.idle-when-vif-is-connected.patch | 37 -
...meout-a-single-frame-in-the-rx-reorder-bu.patch | 33 -
mac80211-update-oper_channel-on-ibss-join.patch | 31 -
...ro-initialize-count-field-in-ieee80211_tx.patch | 39 --
...-option-to-allow-external-modules-to-avoi.patch | 80 ---
...iex-add-NULL-checks-in-driver-unload-path.patch | 66 --
...ar-previous-security-setting-during-assoc.patch | 55 --
...handle-association-failure-case-correctly.patch | 67 --
...ix-wrong-128dBm-when-signal-is-stronger-t.patch | 55 --
...0-fix-a-possible-NULL-pointer-dereference.patch | 37 -
...odify-rtl_pci_init-to-return-0-on-success.patch | 40 --
sources | 1 -
ssb-fix-cardbus-slot-in-hostmode.patch | 34 -
...rmware-needs-duration_id-set-to-zero-for-.patch | 51 --
42 files changed, 14 insertions(+), 3038 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 95f32d0..e4b43f7 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -54,7 +54,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
-%global baserelease 4
+%global baserelease 5
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@@ -163,9 +163,6 @@ Summary: The Linux kernel
# should we do C=1 builds with sparse
%define with_sparse %{?_with_sparse: 1} %{?!_with_sparse: 0}
-# Include driver backports (e.g. compat-wireless) in the kernel build.
-%define with_backports %{?_without_backports: 0} %{?!_without_backports: 1}
-
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'.
@@ -204,20 +201,6 @@ Summary: The Linux kernel
# The kernel tarball/base version
%define kversion 3.%{base_sublevel}
-# The compat-wireless version
-%define cwversion 3.3-rc1-2
-
-#######################################################################
-# If cwversion is less than kversion, make sure with_backports is
-# turned-off.
-#
-# For rawhide, disable with_backports immediately after a rebase...
-#
-# (Uncomment the '#' and both spaces below to disable with_backports.)
-#
-# % define with_backports 0
-#######################################################################
-
%define make_target bzImage
%define KVERREL %{version}-%{release}.%{_target_cpu}
@@ -384,7 +367,6 @@ Summary: The Linux kernel
%define make_target image
%define kernel_image arch/s390/boot/image
%define with_tools 0
-%define with_backports 0
%endif
%ifarch sparc64
@@ -464,7 +446,6 @@ Summary: The Linux kernel
%define with_pae 0
%define with_debuginfo 0
%define with_tools 0
-%define with_backports 0
%define _enable_debug_packages 0
%endif
@@ -583,7 +564,6 @@ BuildRequires: rpm-build >= 4.4.2.1-4
%endif
Source0: ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-%{kversion}.tar.xz
-Source1: compat-wireless-%{cwversion}.tar.bz2
Source11: genkey
Source14: find-provides
@@ -617,8 +597,6 @@ Source112: config-arm-kirkwood
Source113: config-arm-imx
Source114: config-arm-highbank
-Source200: config-backports
-
# This file is intentionally left empty in the stock kernel. Its a nicety
# added for those wanting to do custom rebuilds with altered config opts.
Source1000: config-local
@@ -701,7 +679,6 @@ Patch471: floppy-drop-disable_hlt-warning.patch
Patch510: linux-2.6-silence-noise.patch
Patch520: quite-apm.patch
Patch530: linux-2.6-silence-fbcon-logo.patch
-Patch540: modpost-add-option-to-allow-external-modules-to-avoi.patch
Patch700: linux-2.6-e1000-ich9-montevina.patch
@@ -824,49 +801,6 @@ Patch21350: x86-ioapic-add-register-checks-for-bogus-io-apic-entries.patch
Patch22000: weird-root-dentry-name-debug.patch
-# compat-wireless patches
-Patch50000: compat-wireless-config-fixups.patch
-Patch50001: compat-wireless-pr_fmt-warning-avoidance.patch
-Patch50002: compat-wireless-integrated-build.patch
-Patch50100: compat-wireless-rtl8192cu-Fix-WARNING-on-suspend-resume.patch
-
-# Pending upstream fixes
-Patch50101: mac80211-fix-debugfs-key-station-symlink.patch
-Patch50102: brcmsmac-fix-tx-queue-flush-infinite-loop.patch
-Patch50103: mac80211-Use-the-right-headroom-size-for-mesh-mgmt-f.patch
-Patch50105: b43-add-option-to-avoid-duplicating-device-support-w.patch
-Patch50106: mac80211-update-oper_channel-on-ibss-join.patch
-Patch50107: mac80211-set-bss_conf.idle-when-vif-is-connected.patch
-Patch50108: iwlwifi-fix-PCI-E-transport-inta-race.patch
-Patch50109: bcma-Fix-mem-leak-in-bcma_bus_scan.patch
-Patch50110: rt2800lib-fix-wrong-128dBm-when-signal-is-stronger-t.patch
-Patch50111: iwlwifi-make-Tx-aggregation-enabled-on-ra-be-at-DEBU.patch
-Patch50112: ssb-fix-cardbus-slot-in-hostmode.patch
-Patch50113: iwlwifi-don-t-mess-up-QoS-counters-with-non-QoS-fram.patch
-Patch50114: mac80211-timeout-a-single-frame-in-the-rx-reorder-bu.patch
-Patch50115: ath9k-use-WARN_ON_ONCE-in-ath_rc_get_highest_rix.patch
-Patch50116: mwifiex-handle-association-failure-case-correctly.patch
-Patch50117: ath9k-Fix-kernel-panic-during-driver-initilization.patch
-Patch50118: mwifiex-add-NULL-checks-in-driver-unload-path.patch
-Patch50119: ath9k-fix-a-WEP-crypto-related-regression.patch
-Patch50120: ath9k_hw-fix-a-RTS-CTS-timeout-regression.patch
-Patch50121: bcma-don-t-fail-for-bad-SPROM-CRC.patch
-Patch50122: zd1211rw-firmware-needs-duration_id-set-to-zero-for-.patch
-Patch50123: mac80211-Fix-a-rwlock-bad-magic-bug.patch
-Patch50124: rtlwifi-Modify-rtl_pci_init-to-return-0-on-success.patch
-Patch50125: mac80211-call-rate-control-only-after-init.patch
-Patch50126: mac80211-do-not-call-rate-control-.tx_status-before-.patch
-Patch50127: mwifiex-clear-previous-security-setting-during-assoc.patch
-Patch50128: ath9k-stop-on-rates-with-idx-1-in-ath9k-rate-control.patch
-Patch50129: ath9k_hw-prevent-writes-to-const-data-on-AR9160.patch
-Patch50130: rt2x00-fix-a-possible-NULL-pointer-dereference.patch
-Patch50131: iwlwifi-fix-key-removal.patch
-Patch50132: mac80211-zero-initialize-count-field-in-ieee80211_tx.patch
-Patch50133: mac80211-Fix-a-warning-on-changing-to-monitor-mode-f.patch
-Patch50134: brcm80211-smac-fix-endless-retry-of-A-MPDU-transmiss.patch
-Patch50135: brcm80211-smac-only-print-block-ack-timeout-message-.patch
-
-
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1327,16 +1261,6 @@ cp %{SOURCE15} .
# Dynamically generate kernel .config files from config-* files
make -f %{SOURCE20} VERSION=%{version} configs
-%if %{with_backports}
-# Turn-off bits provided by compat-wireless
-for i in %{all_arch_configs}
-do
- mv $i $i.tmp
- ./merge.pl %{SOURCE200} $i.tmp > $i
- rm $i.tmp
-done
-%endif
-
%if %{?all_arch_configs:1}%{!?all_arch_configs:0}
#if a rhel kernel, apply the rhel config options
%if 0%{?rhel}
@@ -1454,11 +1378,6 @@ ApplyPatch linux-2.6-silence-noise.patch
# Make fbcon not show the penguins with 'quiet'
ApplyPatch linux-2.6-silence-fbcon-logo.patch
-%if %{with_backports}
-# modpost: add option to allow external modules to avoid taint
-ApplyPatch modpost-add-option-to-allow-external-modules-to-avoi.patch
-%endif
-
# Changes to upstream defaults.
@@ -1617,72 +1536,14 @@ done
# end of kernel config
%endif
+# get rid of unwanted files resulting from patch fuzz
+find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null
+
# remove unnecessary SCM files
find . -name .gitignore -exec rm -f {} \; >/dev/null
cd ..
-%if %{with_backports}
-
-# Always start fresh
-rm -rf compat-wireless-%{cwversion}
-
-# Extract the compat-wireless bits
-%setup -q -n kernel-%{kversion}%{?dist} -T -D -a 1
-
-cd compat-wireless-%{cwversion}
-
-ApplyPatch compat-wireless-config-fixups.patch
-ApplyPatch compat-wireless-pr_fmt-warning-avoidance.patch
-ApplyPatch compat-wireless-integrated-build.patch
-
-ApplyPatch compat-wireless-rtl8192cu-Fix-WARNING-on-suspend-resume.patch
-
-# Pending upstream fixes
-ApplyPatch mac80211-fix-debugfs-key-station-symlink.patch
-ApplyPatch brcmsmac-fix-tx-queue-flush-infinite-loop.patch
-ApplyPatch mac80211-Use-the-right-headroom-size-for-mesh-mgmt-f.patch
-ApplyPatch b43-add-option-to-avoid-duplicating-device-support-w.patch
-ApplyPatch mac80211-update-oper_channel-on-ibss-join.patch
-ApplyPatch mac80211-set-bss_conf.idle-when-vif-is-connected.patch
-ApplyPatch iwlwifi-fix-PCI-E-transport-inta-race.patch
-ApplyPatch bcma-Fix-mem-leak-in-bcma_bus_scan.patch
-ApplyPatch rt2800lib-fix-wrong-128dBm-when-signal-is-stronger-t.patch
-ApplyPatch iwlwifi-make-Tx-aggregation-enabled-on-ra-be-at-DEBU.patch
-ApplyPatch ssb-fix-cardbus-slot-in-hostmode.patch
-ApplyPatch iwlwifi-don-t-mess-up-QoS-counters-with-non-QoS-fram.patch
-ApplyPatch mac80211-timeout-a-single-frame-in-the-rx-reorder-bu.patch
-ApplyPatch ath9k-use-WARN_ON_ONCE-in-ath_rc_get_highest_rix.patch
-ApplyPatch mwifiex-handle-association-failure-case-correctly.patch
-ApplyPatch ath9k-Fix-kernel-panic-during-driver-initilization.patch
-ApplyPatch mwifiex-add-NULL-checks-in-driver-unload-path.patch
-ApplyPatch ath9k-fix-a-WEP-crypto-related-regression.patch
-ApplyPatch ath9k_hw-fix-a-RTS-CTS-timeout-regression.patch
-ApplyPatch bcma-don-t-fail-for-bad-SPROM-CRC.patch
-ApplyPatch zd1211rw-firmware-needs-duration_id-set-to-zero-for-.patch
-ApplyPatch mac80211-Fix-a-rwlock-bad-magic-bug.patch
-ApplyPatch rtlwifi-Modify-rtl_pci_init-to-return-0-on-success.patch
-ApplyPatch mac80211-call-rate-control-only-after-init.patch
-ApplyPatch mac80211-do-not-call-rate-control-.tx_status-before-.patch
-ApplyPatch mwifiex-clear-previous-security-setting-during-assoc.patch
-ApplyPatch ath9k-stop-on-rates-with-idx-1-in-ath9k-rate-control.patch
-ApplyPatch ath9k_hw-prevent-writes-to-const-data-on-AR9160.patch
-ApplyPatch rt2x00-fix-a-possible-NULL-pointer-dereference.patch
-ApplyPatch iwlwifi-fix-key-removal.patch
-ApplyPatch mac80211-zero-initialize-count-field-in-ieee80211_tx.patch
-ApplyPatch mac80211-Fix-a-warning-on-changing-to-monitor-mode-f.patch
-ApplyPatch brcm80211-smac-fix-endless-retry-of-A-MPDU-transmiss.patch
-ApplyPatch brcm80211-smac-only-print-block-ack-timeout-message-.patch
-
-ApplyPatch rt2x00_fix_MCU_request_failures.patch
-
-cd ..
-
-%endif
-
-# get rid of unwanted files resulting from patch fuzz
-find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null
-
###
### build
###
@@ -1805,9 +1666,7 @@ BuildKernel() {
# dirs for additional modules per module-init-tools, kbuild/modules.txt
mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/extra
mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/updates
-%if %{with_backports}
- mkdir -p $RPM_BUILD_ROOT/lib/modules/$KernelVer/backports
-%endif
+
# first copy everything
cp --parents `find -type f -name "Makefile*" -o -name "Kconfig*"` $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
cp Module.symvers $RPM_BUILD_ROOT/lib/modules/$KernelVer/build
@@ -1900,6 +1759,12 @@ BuildKernel() {
rm -f modinfo modnames
+ # remove files that will be auto generated by depmod at rpm -i time
+ for i in alias alias.bin builtin.bin ccwmap dep dep.bin ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols symbols.bin usbmap
+ do
+ rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$i
+ done
+
# Move the devel headers out of the root file system
mkdir -p $RPM_BUILD_ROOT/usr/src/kernels
mv $RPM_BUILD_ROOT/lib/modules/$KernelVer/build $RPM_BUILD_ROOT/$DevelDir
@@ -1913,32 +1778,6 @@ BuildKernel() {
# prune junk from kernel-devel
find $RPM_BUILD_ROOT/usr/src/kernels -name ".*.cmd" -exec rm -f {} \;
-%if %{with_backports}
-
- cd ../compat-wireless-%{cwversion}/
-
- install -m 644 config.mk \
- $RPM_BUILD_ROOT/boot/config.mk-compat-wireless-%{cwversion}-$KernelVer
-
- make -s ARCH=$Arch V=1 %{?_smp_mflags} \
- KLIB_BUILD=../linux-%{kversion}.%{_target_cpu} \
- KMODPATH_ARG="INSTALL_MOD_PATH=$RPM_BUILD_ROOT" \
- KMODDIR="backports" install-modules %{?sparse_mflags}
-
- # mark modules executable so that strip-to-file can strip them
- find $RPM_BUILD_ROOT/lib/modules/$KernelVer/backports -name "*.ko" \
- -type f | xargs --no-run-if-empty chmod u+x
-
- cd -
-
-%endif
-
- # remove files that will be auto generated by depmod at rpm -i time
- for i in alias alias.bin builtin.bin ccwmap dep dep.bin ieee1394map inputmap isapnpmap ofmap pcimap seriomap symbols symbols.bin usbmap
- do
- rm -f $RPM_BUILD_ROOT/lib/modules/$KernelVer/modules.$i
- done
-
}
###
@@ -2337,10 +2176,6 @@ fi
/lib/modules/%{KVERREL}%{?2:.%{2}}/source\
/lib/modules/%{KVERREL}%{?2:.%{2}}/extra\
/lib/modules/%{KVERREL}%{?2:.%{2}}/updates\
-%if %{with_backports}\
-/boot/config.mk-compat-wireless-%{cwversion}-%{KVERREL}%{?2:.%{2}}\
-/lib/modules/%{KVERREL}%{?2:.%{2}}/backports\
-%endif\
%ifarch %{vdso_arches}\
/lib/modules/%{KVERREL}%{?2:.%{2}}/vdso\
/etc/ld.so.conf.d/kernel-%{KVERREL}%{?2:.%{2}}.conf\
@@ -2386,6 +2221,9 @@ fi
# and build.
%changelog
+* Mon Mar 19 2012 Josh Boyer <jwboyer at redhat.com>
+- Drop compat-wireless infrastructure in preparation for 3.3 rebase
+
* Fri Mar 16 2012 Justin M. Forbes <jforbes at redhat.com>
- re-enable threading on hibernate compression/decompression
diff --git a/sources b/sources
index ea05b23..a003ef5 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
364066fa18767ec0ae5f4e4abcf9dc51 linux-3.2.tar.xz
-8cfe037a7a7a356278ec3638e25ad506 compat-wireless-3.3-rc1-2.tar.bz2
7481fa09f2efda915ed19a9da33a2e59 patch-3.2.10.xz
More information about the scm-commits
mailing list