incomplete version (Git has issues)

4 files changed, 22 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index beb814ef6ed0..d94f87232ef1 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mcp2210-git
 	pkgdesc = A kernel module for Microchip MCP2210 USB-to-SPI bridge
-	pkgver = v0.1.r28.gea416ae
+	pkgver = v0.1.r128.g09e7ba5
 	pkgrel = 2
 	url = https://github.com/agalakhov/mcp2210-linux
 	arch = i686
@@ -8,24 +8,26 @@ pkgbase = mcp2210-git
 	arch = armv7h
 	license = GPL
 	makedepends = linux-headers
-	makedepends = dkms
 	depends = linux
-	source = git://github.com/agalakhov/mcp2210-linux.git
+	source = git://github.com/daniel-santos/mcp2210-linux.git
 	source = dkms.conf
 	sha256sums = SKIP
 	sha256sums = 8f56d80fceeac1ed7fe786e16718c054212fd939dcac54b7976984127305ae53
 
 pkgname = mcp2210-git
-	install = mcp2210-git.install
 	depends = linux>=
 	depends = linux<.1
+	provides = mcp2210
 	conflicts = mcp2210
+	conflicts = mcp2210-dkms
+	conflicts = mcp2210-dkms-git
 
 pkgname = mcp2210-dkms-git
-	install = mcp2210-dkms-git.install
 	depends = dkms
+	provides = mcp2210
 	conflicts = mcp2210
 	conflicts = mcp2210-git
+	conflicts = mcp2210-git
 
 pkgname = mcp2210-utils-git
 	conflicts = mcp2210-utils
diff --git a/PKGBUILD b/PKGBUILD
index ea2a225e0b5e..1c9edc065bfd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgbase=mcp2210-git
 pkgname=(mcp2210-git mcp2210-dkms-git mcp2210-utils-git)
-pkgver=v0.1.r28.gea416ae
+pkgver=v0.1.r128.g09e7ba5
 pkgver() {
 	cd "mcp2210-linux"
 	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
@@ -13,40 +13,39 @@ url="https://github.com/agalakhov/mcp2210-linux"
 license=("GPL")
 arch=('i686' 'x86_64' 'armv7h')
 depends=('linux')
-makedepends=('linux-headers' 'dkms')
-source=( git://github.com/agalakhov/mcp2210-linux.git
+makedepends=('linux-headers')
+source=( git://github.com/daniel-santos/mcp2210-linux.git
          dkms.conf
        )
 sha256sums=('SKIP'
             '8f56d80fceeac1ed7fe786e16718c054212fd939dcac54b7976984127305ae53')
 
 build() {
-	_kernver=$(pacman -Q linux | sed -r 's#.* ([0-9]+\.[0-9]+).*#\1#')
-	KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-$_kernver-ARCH/version)
-
 	cd "mcp2210-linux"
-	make KERNELDIR="/lib/modules/$KERNEL_VERSION/build" modules user
+	make KERNELDIR="/usr/src/linux" modules user
 }
 
 package_mcp2210-git() {
-	install=mcp2210-git.install
-	conflicts=('mcp2210')
-	_kernver=$(pacman -Q linux | sed -r 's#.* ([0-9]+\.[0-9]+).*#\1#')
+    _kernver=$(</usr/src/linux/version)
+    _extradir="/usr/lib/modules/$_kernver/extramodules"
+
 	depends=("linux>=$_kernver" "linux<${_kernver/.*}.$(expr ${_kernver/*.} + 1)")
-	KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-$_kernver-ARCH/version)
-	msg "Kernel = $KERNEL_VERSION"
+    provides=('mcp2210')
+	conflicts=('mcp2210' 'mcp2210-dkms' 'mcp2210-dkms-git')
 
 	cd "mcp2210-linux"
-	install -Dm644 mcp2210.ko "$pkgdir/usr/lib/modules/extramodules-$_kernver-ARCH/mcp2210.ko"
-	find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
+	install -Dm644 mcp2210.ko "$_extradir/"
+    find "${pkgdir}" -name '*.ko' -exec strip --strip-debug {} +
+	find "$pkgdir" -name '*.ko' -exec xz {} +
 
 	sed -i "s|extramodules-.*-ARCH|extramodules-$_kernver-ARCH|" "$startdir/$pkgname.install"
 }
 
 package_mcp2210-dkms-git() {
-	install=mcp2210-dkms-git.install
-	conflicts=('mcp2210' 'mcp2210-git')
 	depends=('dkms')
+    provides=('mcp2210')
+	conflicts=('mcp2210' 'mcp2210-git' 'mcp2210-git')
+
 	install -Dm644 dkms.conf "${pkgdir}"/usr/src/${pkgbase}-${pkgver}/dkms.conf
 
 	# Set name and version
diff --git a/mcp2210-dkms-git.install b/mcp2210-dkms-git.install
deleted file mode 100644
index 7e5d21164f7f..000000000000
--- a/mcp2210-dkms-git.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-    dkms install mcp2210-git/${1%%-*}
-}
-
-pre_upgrade() {
-    pre_remove ${2%%-*}
-}
-
-post_upgrade() {
-    post_install ${1%%-*}
-}
-
-pre_remove() {
-    dkms remove mcp2210-git/${1%%-*} --all
-}
diff --git a/mcp2210-git.install b/mcp2210-git.install
deleted file mode 100644
index a936d9bec955..000000000000
--- a/mcp2210-git.install
+++ /dev/null
@@ -1,14 +0,0 @@
-rebuild_module_dependencies() {
-	EXTRAMODULES='extramodules-4.2-ARCH'
-	depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_install() {
-	rebuild_module_dependencies
-}
-post_upgrade() {
-	rebuild_module_dependencies
-}
-post_remove() {
-	rebuild_module_dependencies
-}