summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-05-22 02:55:18 +0000
committerZac Medico <zmedico@gentoo.org>2012-05-22 02:55:18 +0000
commitaac1f2a054c3e99642371eff2bdd4b17237e7db0 (patch)
treee5046dbc686216250e8e15bedbdb6dfe64f41afe /net-wireless
parentPatch by Simon Glass to exit with non-zero value when things fail. (diff)
downloadgentoo-2-aac1f2a054c3e99642371eff2bdd4b17237e7db0.tar.gz
gentoo-2-aac1f2a054c3e99642371eff2bdd4b17237e7db0.tar.bz2
gentoo-2-aac1f2a054c3e99642371eff2bdd4b17237e7db0.zip
Patch to compile with linux-3.4.
(Portage version: 2.2.0_alpha107/cvs/Linux i686)
Diffstat (limited to 'net-wireless')
-rw-r--r--net-wireless/broadcom-sta/ChangeLog6
-rw-r--r--net-wireless/broadcom-sta/broadcom-sta-5.100.82.112-r2.ebuild4
2 files changed, 8 insertions, 2 deletions
diff --git a/net-wireless/broadcom-sta/ChangeLog b/net-wireless/broadcom-sta/ChangeLog
index 898a1ea27923..c5a12825cb55 100644
--- a/net-wireless/broadcom-sta/ChangeLog
+++ b/net-wireless/broadcom-sta/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-wireless/broadcom-sta
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.44 2012/04/22 16:42:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/ChangeLog,v 1.45 2012/05/22 02:55:18 zmedico Exp $
+
+ 22 May 2012; Zac Medico <zmedico@gentoo.org>
+ broadcom-sta-5.100.82.112-r2.ebuild:
+ Patch to compile with linux-3.4.
22 Apr 2012; Agostino Sarubbo <ago@gentoo.org>
broadcom-sta-5.100.82.112-r2.ebuild:
diff --git a/net-wireless/broadcom-sta/broadcom-sta-5.100.82.112-r2.ebuild b/net-wireless/broadcom-sta/broadcom-sta-5.100.82.112-r2.ebuild
index 5343b17a4e0f..add7f1fce890 100644
--- a/net-wireless/broadcom-sta/broadcom-sta-5.100.82.112-r2.ebuild
+++ b/net-wireless/broadcom-sta/broadcom-sta-5.100.82.112-r2.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-5.100.82.112-r2.ebuild,v 1.3 2012/04/22 16:42:18 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/broadcom-sta/broadcom-sta-5.100.82.112-r2.ebuild,v 1.4 2012/05/22 02:55:18 zmedico Exp $
EAPI="4"
inherit eutils linux-mod
@@ -52,4 +52,6 @@ src_prepare() {
"${FILESDIR}/${PN}-5.100.82.111-linux-3.0.patch" \
"${FILESDIR}/${PN}-5.100.82.112-linux-2.6.39.patch" \
"${FILESDIR}/${PN}-5.100.82.112-linux-3.2.patch"
+ sed -e "s:^#include <asm/system.h>$:#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)\\n\\0\\n#endif:" \
+ -i src/wl/sys/wl_linux.c || die "sed failed to patch for linux-3.4"
}