Reworked wireless driver ebuild, new kernel source

7 files changed, 72 insertions, 28 deletions

diff --git a/net-wireless/tiwlan-wl1271/ChangeLog b/net-wireless/tiwlan-wl1271/ChangeLog
new file mode 100644
index 0000000..625d23e
--- /dev/null
+++ b/net-wireless/tiwlan-wl1271/ChangeLog
@@ -0,0 +1,8 @@
+# ChangeLog for net-wireless/tiwlan-wl1271
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+  24 Dec 2010; Raúl Porcel <armin76@gentoo.org>
+  tiwlan-wl1271-0.24.9.ebuild:
+  Enhanced ebuild
+
diff --git a/net-wireless/tiwlan-wl1271/Manifest b/net-wireless/tiwlan-wl1271/Manifest
index 00d8f3f..1f156f6 100644
--- a/net-wireless/tiwlan-wl1271/Manifest
+++ b/net-wireless/tiwlan-wl1271/Manifest
@@ -1,4 +1,5 @@
 DIST tiwlan-wl1271_0.24.9-0ubuntu6.diff.gz 5228 RMD160 3dc0bb430d8e9b4cc12bbef050880b36c3af48af SHA1 72d21447f83b9113aa059c66db351a132c86dcb6 SHA256 bd9c72409a2cd79ff14c05f4e1d258840af68ef359edb8cbb3baf2f8c8d1c12c
 DIST tiwlan-wl1271_0.24.9.orig.tar.gz 1251415 RMD160 f10c004a0770de6efd61eb5b6a7d4f20147b15ea SHA1 6fbfd5b8bb382ed68e66116e061e41a41bec5d98 SHA256 60a64c8c3daee9dc897a8918e2f082bcfcb4a3dbd66c013978e331e1c8e6127b
-EBUILD tiwlan-wl1271-0.24.9.ebuild 1176 RMD160 0e63bda94020f38b98755d8012da9b7f504d13b9 SHA1 82fa44ad4b32eba52020b9e6c3e1ba97243bb25a SHA256 e7e3031b2f373ba41a6fcd4448e35cddfc50efe7905fb6c3be633ce5dfae35eb
+EBUILD tiwlan-wl1271-0.24.9.ebuild 1520 RMD160 1a480eb6cb864e704b0eacf932aca587b1c692fa SHA1 52bc6789e61fa3693e4c00012675ded6a51b34fc SHA256 30371da654faa299ae034fbdc14d6da7df6531b12db1eaa97981062b57f186df
+MISC ChangeLog 226 RMD160 865cb82d56f68a03ebadb5952c5c81e31eb42987 SHA1 2db2fe47296b2ef3c65853077ea7b63308384a6c SHA256 60eb2847621f2908efd00cdedcfea3bf52e84d26143facafa0136841d79c7f53
 MISC metadata.xml 222 RMD160 3f50aa50f95905f1387e67bc72c80b4c1b63aab4 SHA1 b5ad6eab5a55d57fd25fa68a46d1359cc25759aa SHA256 b8f80af5f2e9d409535bd1e3981b685a013f820ec82b504d82d5c9c077cd9fa6
diff --git a/net-wireless/tiwlan-wl1271/tiwlan-wl1271-0.24.9.ebuild b/net-wireless/tiwlan-wl1271/tiwlan-wl1271-0.24.9.ebuild
index 8251104..2e90a53 100644
--- a/net-wireless/tiwlan-wl1271/tiwlan-wl1271-0.24.9.ebuild
+++ b/net-wireless/tiwlan-wl1271/tiwlan-wl1271-0.24.9.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2007 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: /var/cvsroot/gentoo-x86/net-wireless/zd1211-firmware/zd1211-firmware-1.4.ebuild,v 1.2 2007/11/03 12:03:19 dsd Exp $
 
 EAPI="2"
 
-inherit eutils
+inherit eutils linux-mod
 
 MY_P="${PN}_${PV}"
 
@@ -25,17 +25,30 @@ RDEPEND="net-wireless/tiwlan-wl1271-firmware"
 DEPEND="${RDEPEND}"
 
 
+pkg_setup() {
+    linux-mod_pkg_setup
+
+}
+
 src_prepare() {
 	cd ${WORKDIR}
 
 	epatch ${MY_P}*.diff
 	cd "${S}"
 	epatch "${S}"/debian/patches/*.patch
+
+	cd wlan
+	cp wlan/Makefile .
 }
 
 src_compile() {
-#	cd "${S}"
-	make -j1
+	cd wlan
+        # compile modules
+        emake -j1 KERNEL_HEADERS=${KV_DIR} || die
+
+        # compile utils
+        cd CUDK
+        emake -j1 || die
 }
 
 src_install() {
@@ -50,5 +63,8 @@ src_install() {
 	insinto /lib/firmware/tiwlan-wl1271
 	doins tiwlan.ini tiwlan_dual.ini
 
-	
+	cd "${S}"/wlan
+        insinto /lib/modules/${KV_FULL}/kernel/drivers/net/wireless/tiwlan-wl1271
+        doins sdio.ko tiwlan_drv.ko
+
 }
diff --git a/sys-kernel/omap4-sources/ChangeLog b/sys-kernel/omap4-sources/ChangeLog
index afb5626..13923fe 100644
--- a/sys-kernel/omap4-sources/ChangeLog
+++ b/sys-kernel/omap4-sources/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*omap4-sources-2.6.35.903.19 (24 Dec 2010)
+
+  24 Dec 2010; Raúl Porcel <armin76@gentoo.org>
+  -omap4-sources-2.6.35.24.11_p3.ebuild,
+  +omap4-sources-2.6.35.903.19.ebuild:
+  Use ubuntu kernel
+
 *omap4-sources-2.6.35.24.11_p3 (20 Nov 2010)
 
   20 Nov 2010; Raúl Porcel <armin76@gentoo.org>
diff --git a/sys-kernel/omap4-sources/Manifest b/sys-kernel/omap4-sources/Manifest
index 46727a6..07888a2 100644
--- a/sys-kernel/omap4-sources/Manifest
+++ b/sys-kernel/omap4-sources/Manifest
@@ -1 +1,3 @@
-EBUILD omap4-sources-2.6.35.24.11_p3.ebuild 541 RMD160 c6a686812af9192effa26f34d6b03316f429b444 SHA1 c6bc3dc769f6f5acf0638a60f21be3c7da8a81bd SHA256 d86884a7828a8eaaa5db9c80fd70493178bbc322a8994add2d888cc2a97f2cd5
+DIST linux-ti-omap4_2.6.35-903.19.tar.gz 92465320 RMD160 189f5b4240f99703895433b0532574127cc733b2 SHA1 1ec35b0727e549e8bfdf122d6aa467ce5fd42359 SHA256 cf5e15e19a79fb6bb5b8c7158cf2c7e7193ac72454bb754978eab5a0b5566d5d
+EBUILD omap4-sources-2.6.35.903.19.ebuild 577 RMD160 566cff8739ff6aed42e28763718d7878907caf08 SHA1 95e87ceb2a386367851050430f17979f870f0bcc SHA256 972fb1905efd769b4b98f069f75d2ab12d86e28d2921578ddc522c6ff33d75d6
+MISC ChangeLog 478 RMD160 0a38bdfdd82a7dd03dacc42387637fc93947ddc1 SHA1 8b54b242ac3d745d8883b795e8911b6b9384c55b SHA256 8a9c9b82f8c6546e2db49c76ee06ceca50eb001a4eb2b6ba2746f19367dd8134
diff --git a/sys-kernel/omap4-sources/omap4-sources-2.6.35.24.11_p3.ebuild b/sys-kernel/omap4-sources/omap4-sources-2.6.35.24.11_p3.ebuild
deleted file mode 100644
index 9a7c6d8..0000000
--- a/sys-kernel/omap4-sources/omap4-sources-2.6.35.24.11_p3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI="2"
-ETYPE="sources"
-
-inherit kernel-2 git versionator
-detect_version
-
-MY_PV="ti-$(get_version_component_range 1-3)-omap4-L$(get_version_component_range 4-5)-$(get_version_component_range 6)"
-
-EGIT_REPO_URI="git://dev.omapzoom.org/pub/scm/integration/kernel-omap4.git"
-
-EGIT_COMMIT="${MY_PV}"
-
-
-DESCRIPTION="OMAP4 sources"
-HOMEPAGE="http://dev.omapzoom.org/?p=integration/kernel-omap4.git;a=summary"
-
-KEYWORDS="arm"
diff --git a/sys-kernel/omap4-sources/omap4-sources-2.6.35.903.19.ebuild b/sys-kernel/omap4-sources/omap4-sources-2.6.35.903.19.ebuild
new file mode 100644
index 0000000..a45e754
--- /dev/null
+++ b/sys-kernel/omap4-sources/omap4-sources-2.6.35.903.19.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+
+ETYPE="sources"
+
+inherit kernel-2 versionator
+detect_version
+
+MY_PV="$(get_version_component_range 1-3)-$(get_version_component_range 4-5)"
+
+
+DESCRIPTION="OMAP4 sources"
+HOMEPAGE=""
+SRC_URI="http://ports.ubuntu.com/ubuntu-ports/pool/main/l/linux-ti-omap4/linux-ti-omap4_${MY_PV}.tar.gz"
+
+KEYWORDS="arm"
+
+S="${WORKDIR}"
+
+src_unpack() {
+	unpack ${A}
+	mv ubuntu-maverick linux-${PV}-omap4
+
+}
+
+src_install() {
+	insinto /usr/src/
+	doins -r linux-${PV}-omap4
+}