diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-01-05 14:00:32 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-01-05 14:00:32 -0500 |
| commit | 7fee57a29682911a8eb2a3ff8e2a0d3b5a45e657 (patch) | |
| tree | 494db69e9fef377f118a391594081d7b81d6850b /kernel.spec | |
| parent | ac403a617cea3f1c74a56bb54c2ee3b17988fee9 (diff) | |
| download | kernel-7fee57a29682911a8eb2a3ff8e2a0d3b5a45e657.tar.gz kernel-7fee57a29682911a8eb2a3ff8e2a0d3b5a45e657.tar.xz kernel-7fee57a29682911a8eb2a3ff8e2a0d3b5a45e657.zip | |
Patch compat-wireless build to avoid "pr_fmt redefined" warnings
Disable CONFIG_BRCMFMAC builds (needs unknown symbol __bad_udelay)
Include compat-wireless in removal of files resulting from patch fuzz
Diffstat (limited to 'kernel.spec')
| -rw-r--r-- | kernel.spec | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/kernel.spec b/kernel.spec index 55ff2fa29..a36276f1e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -753,7 +753,8 @@ Patch21065: Bluetooth-Add-support-for-BCM20702A0-0a5c-21e3.patch # compat-wireless patches Patch50000: compat-wireless-config-fixups.patch -Patch50001: compat-wireless-integrated-build.patch +Patch50001: compat-wireless-pr_fmt-warning-avoidance.patch +Patch50002: compat-wireless-integrated-build.patch %endif @@ -1501,9 +1502,6 @@ 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 @@ -1520,12 +1518,16 @@ rm -rf compat-wireless-%{cwversion} cd compat-wireless-%{cwversion} ApplyPatch compat-wireless-config-fixups.patch +ApplyPatch compat-wireless-pr_fmt-warning-avoidance.patch ApplyPatch compat-wireless-integrated-build.patch cd .. %endif +# get rid of unwanted files resulting from patch fuzz +find . \( -name "*.orig" -o -name "*~" \) -exec rm -f {} \; >/dev/null + ### ### build ### @@ -2287,6 +2289,11 @@ fi # ||----w | # || || %changelog +* Thu Jan 05 2012 John W. Linville <linville@redhat.com> +- Patch compat-wireless build to avoid "pr_fmt redefined" warnings +- Disable CONFIG_BRCMFMAC builds (needs unknown symbol __bad_udelay) +- Include compat-wireless in removal of files resulting from patch fuzz + * Thu Jan 05 2012 Josh Boyer <jwboyer@redhat.com> - Move the depmod file removal below the compat-wireless build to make sure we clean them all out |