linux: bump to 3.1.5-3 - see changelog

compat-wireless: bump to 3.2-rc6-3 - backport of wireless drivers

compat-wireless/PKGBUILD

@@ -0,0 +1,72 @@
+#
+# Core Packages for Chakra, part of chakra-project.org
+#
+# maintainer (i686): Phil Miller <philm[at]chakra-project[dog]org>
+# maintainer (x86_64): Manuel Tortosa <manutortosa[at]chakra-project[dot]org>
+
+pkgname=compat-wireless
+pkgver=3.2_rc6_3
+_upver="${pkgver//_/-}"
+pkgrel=1
+pkgdesc='Snapshots of the wireless-testing tree ported to older kernels'
+url='http://wireless.kernel.org/'
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('linux>=3.1.5-3')
+makedepends=('linux-api-headers' 'linux-headers')
+source=("http://www.orbit-lab.org/kernel/compat-wireless-3.0-stable/v3.2/compat-wireless-${_upver}.tar.bz2"
+        'eeprom_93xx46.h::http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=blob_plain;f=include/linux/eeprom_93xx46.h;h=06791811'
+        'eeprom_93xx46.c::http://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=blob_plain;f=drivers/misc/eeprom/eeprom_93xx46.c;h=0c7ebb1e'
+        http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/compat-wireless-change-CONFIG_IWLAGN-CONFIG_IWLWIFI.patch
+        http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/compat-wireless-config-fixups.patch
+        http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/bcma-brcmsmac-compat.patch
+        http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/iwlwifi-tx_sync-only-on-PAN-context.patch
+        http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/iwlwifi-allow-to-switch-to-HT40-if-not-associated.patch
+)
+sha1sums=('7f00885ff224f4b7ddaaeee74043c508c4e9be50'
+          '7631b5a883c605b5c352fa69e004872796f6e11b'
+          'a50247dacd10b4e744014b35b5930e0db5aa7b21'
+          '44be50c11dac1f0019110731c2768466e26d5bc4'
+          '7cb4b0de6cea1a3acb3ae81fbdea6dcfc9d8c99e'
+          '7114abd956e5f45aa9bb46458563f81d20b0b35b'
+          'c63f5c7c858cf4a267b1b45cb690a7114b71f2f7'
+          '222a892ed269060feeef353ee1b034c9b1469eb4')
+
+install=install
+
+build() {
+	cd "${srcdir}/compat-wireless-${_upver}"
+
+	echo '#define br_port_exists(dev) (dev->priv_flags & IFF_BRIDGE_PORT)' >> net/wireless/core.h # rfkill.h does not use compat-3.1.h
+	mv ../eeprom_93xx46.c drivers/misc/eeprom/eeprom_93xx46.c # missing file from compat-wireless tarball
+	mv ../eeprom_93xx46.h include/linux/eeprom_93xx46.h # missing file from compat-wireless tarball
+
+	# apply patches
+	patch -Np1 -i ${srcdir}/compat-wireless-change-CONFIG_IWLAGN-CONFIG_IWLWIFI.patch
+	patch -Np1 -i ${srcdir}/compat-wireless-config-fixups.patch
+	patch -Np1 -i ${srcdir}/bcma-brcmsmac-compat.patch
+	patch -Np1 -i ${srcdir}/iwlwifi-tx_sync-only-on-PAN-context.patch
+	patch -Np1 -i ${srcdir}/iwlwifi-allow-to-switch-to-HT40-if-not-associated.patch
+	
+	# Uncomment the line below if you encounter problems with rt2870.
+	#sed -i 's/^\# CONFIG_RT2800USB_RT30XX/CONFIG_RT2800USB_RT30XX/' config.mk
+
+	make
+}
+
+package() {
+	cd "${srcdir}/compat-wireless-${_upver}"
+
+	make INSTALL_MOD_PATH="${pkgdir}" install-modules
+	find "${pkgdir}" -name '*.ko' -exec gzip -9 {} \;
+
+	install -d "${pkgdir}"/usr/sbin
+	install scripts/{athenable,athload,b43enable,b43load,iwl-enable,iwl-load,madwifi-unload} "${pkgdir}"/usr/sbin/
+
+	install -d "${pkgdir}"/usr/lib/compat-wireless
+	install scripts/{check_depmod,modlib.sh} "${pkgdir}"/usr/lib/compat-wireless/
+
+	install -d "${pkgdir}"/lib/udev/rules.d
+	install udev/50-compat_firmware.rules "${pkgdir}"/lib/udev/rules.d/
+	install udev/compat_firmware.sh	"${pkgdir}"/lib/udev/
+}

compat-wireless/install

@@ -0,0 +1,16 @@
+post_install() {
+	post_upgrade
+	echo 'Read the doc: http://wireless.kernel.org/en/users/Download'
+}
+
+post_upgrade() {
+	usr/lib/compat-wireless/check_depmod
+	depmod
+	echo
+	usr/sbin/athenable ath5k
+	usr/sbin/iwl-enable iwlagn
+}
+
+post_remove() {
+	depmod -a
+}

linux-3-CHAKRA/PATCHCFG

@@ -2,7 +2,7 @@
 source ../_buildscripts/`pwd | cut -d/ -f3`-${_arch}-makepkg.conf
 # Pre-Patch settings
 _patch="3.1.5"
-_prepatch="3.1.6-pre2"
+_prepatch="3.1.6-pre3"
 _queue="3.1"
 # Aufs
 _aufs="3.1-20111114"
@@ -131,6 +131,8 @@ PATCHES=(
          ###rhbz 748691
          http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/be2net-non-member-vlan-pkts-not-received-in-promisco.patch%1
          http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/benet-remove-bogus-unlikely-on-vlan-check.patch%1
+         ###rhbz 736815
+         http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/x86-code-dump-fix-truncation.patch%1
          ###rhbz 749166
          http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/oom-fix-integer-overflow-of-points.patch%1
          ###rhbz 728607
@@ -145,10 +147,6 @@ PATCHES=(
          http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/nfsv4-include-bitmap-in-nfsv4_get_acl_data.patch%1
          ###rhbz752176
          http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/sysfs-msi-irq-per-device.patch%1
-         ###backport brcm80211 from 3.2-rc1
-         http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/brcm80211.patch%1
-         #### Remove overlap between bcma/b43 and brcmsmac and reenable bcm4331
-         http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/bcma-brcmsmac-compat.patch%1
          ### rhbz 754907
          http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/cciss-fix-irqf-shared.patch%1
          http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/hpsa-add-irqf-shared.patch%1
@@ -160,11 +158,21 @@ PATCHES=(
          http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/alps.patch%1
          ### patch to do a better job of dealing with busted EDID headers (rhbz#751589)
          http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/drm-edid-try-harder-to-fix-up-broken-headers.patch%1
-         ### patch to fix Intel wifi regression in 3.1.5 (rhbz 767173)
-         http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/iwlwifi-allow-to-switch-to-HT40-if-not-associated.patch%1
          ### patch from Jeff Layton to fix suspend with NFS (rhbz #717735)
          http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/nfs-client-freezer.patch%1
+         ###rhbz 741117
+         http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/b44-Use-dev_kfree_skb_irq-in-b44_tx.patch%1
+         ###rhbz 746097
+         http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/tpm_tis-delay-after-aborting-cmd.patch%1
+         http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/route-cache-garbage-collector.patch%1
 
+         ###backport brcm80211 from 3.2-rc1
+         http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/brcm80211.patch%1
+         ### Remove overlap between bcma/b43 and brcmsmac and reenable bcm4331
+         http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/bcma-brcmsmac-compat.patch%1
+         ### Apply some iwlwifi regression fixes
+         http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/iwlwifi-tx_sync-only-on-PAN-context.patch%1
+         http://chakra.sourceforge.net/sources/linux/patches/3.1/features/fedora/iwlwifi-allow-to-switch-to-HT40-if-not-associated.patch%1
 
          # add quirk for other webcams
          http://chakra.sourceforge.net/sources/linux/patches/3.1/bugfix/usb-add-quirk-for-other-webcams.patch%1
@@ -202,7 +210,7 @@ PATCHES=(
 
         )
 # Name of the resulting patch (will be bzipped afterwards)
-PATCHNAME="patch-3.1.5-2-CHAKRA"
+PATCHNAME="patch-3.1.5-3-CHAKRA"
 
 # Run this before applying patches
 pre_apply() {

linux/PKGBUILD

@@ -10,10 +10,10 @@ pkgname=('linux' 'linux-headers' 'linux-docs') # Build stock -CHAKRA kernel
 _kernelname=${pkgname#linux}
 _basekernel=3.1
 pkgver=${_basekernel}.5
-pkgrel=2
+pkgrel=3
 _aufs="3.1-20111114"
 makedepends=('xmlto' 'docbook-xsl')
-_patchname="patch-${pkgver}-2-CHAKRA"
+_patchname="patch-${pkgver}-3-CHAKRA"
 arch=(i686 x86_64)
 license=('GPL2')
 url="http://www.kernel.org"
@@ -25,7 +25,7 @@ source=(ftp://ftp.kernel.org/pub/linux/kernel/v3.0/linux-$_basekernel.tar.bz2
         # standard config files for mkinitcpio ramdisk
         linux.preset)
 md5sums=('8d43453f8159b2332ad410b19d86a931'
-         'd574e0786c10337df1a4e70fdfa1bec2'
+         '5432aa516cb4333f6da18353de623e9a'
          'd00c07285a3ae842bf630f07c66aaf1b'
          '10528368b58ebaa90eb9cfb67eb48352'
          'b019872ce926de3ec82985fc399832c6')