rts5227-dkms: cleanup

3 files changed, 41 insertions, 98 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1aaf0f4c6fb7..a994e55fa354 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,20 @@
 pkgbase = rts5227-dkms
 	pkgdesc = Driver to support Realtek RTS5227/5229 SD Card Reader
 	pkgver = 1.07
-	pkgrel = 4
+	pkgrel = 5
 	url = http://www.realtek.com.tw/Downloads/downloadsView.aspx?Langid=1&PNid=15&PFid=25&Level=4&Conn=3&DownTypeID=3&GetDown=false
 	arch = i686
 	arch = x86_64
+	license = GPL2
 	depends = dkms
-	source = http://12244.wpc.azureedge.net/8012244/drivers/rtdrivers/pc/crc/0001-Realtek_RTS5229_Linux_Driver_v1.07.zip
-	source = git+https://github.com/astyonax/patched-RTS5227-5229.git
+	source = rts5229::git+https://github.com/astyonax/patched-RTS5227-5229.git
 	source = dkms.conf
 	source = blacklist-rts5227-dkms.conf
 	source = rts5227-dkms-suspend.sh
-	source = Makefile.patch
-	md5sums = 0ecf8bea0ea3842391c68da72fe4c425
 	md5sums = SKIP
 	md5sums = 63ab60ad3295c0aed7219dbddfd50af3
 	md5sums = 6640eecc5bcc3584397a7d1a33eb028f
-	md5sums = 76d0dea4f19bd3f79b282d9ec2141400
-	md5sums = 45871f654b6a237a0ae4646ec8e94769
-	md5sums = SKIP
+	md5sums = e59828310982d2943318900d7017b99f
 
 pkgname = rts5227-dkms
 
diff --git a/Makefile.patch b/Makefile.patch
deleted file mode 100644
index 333d8b9cbeae..000000000000
--- a/Makefile.patch
+++ /dev/null
@@ -1,41 +0,0 @@
---- pkg/rts5227-dkms/usr/src/rts5227-1.07/Makefile	2017-06-22 14:42:38.212148541 +0200
-+++ Makefile.new	2017-06-22 14:57:15.115095874 +0200
-@@ -1,6 +1,6 @@
- # Driver for Realtek PCI-Express card reader
- #
--# Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.  
-+# Copyright(c) 2009 Realtek Semiconductor Corp. All rights reserved.
- #
- # This program is free software; you can redistribute it and/or modify it
- # under the terms of the GNU General Public License as published by the
-@@ -22,9 +22,11 @@
- # Makefile for the PCI-Express Card Reader drivers.
- #
- 
-+KVERSION := $(shell uname -r)
-+
- TARGET_MODULE := rts5227
- 
--EXTRA_CFLAGS := -Idrivers/scsi 
-+EXTRA_CFLAGS := -Idrivers/scsi
- 
- obj-m += $(TARGET_MODULE).o
- 
-@@ -33,14 +35,12 @@
- 
- default:
- 	cp -f ./define.release ./define.h
--	make -C /lib/modules/$(shell uname -r)/build/ SUBDIRS=$(PWD) modules
-+	make -C /lib/modules/$(KVERSION)/build/ SUBDIRS=$(PWD) modules
- debug:
- 	cp -f ./define.debug ./define.h
--	make -C /lib/modules/$(shell uname -r)/build/ SUBDIRS=$(PWD) modules
-+	make -C /lib/modules/$(KVERSION)/build/ SUBDIRS=$(PWD) modules
- install:
--	cp $(TARGET_MODULE).ko /lib/modules/$(shell uname -r)/kernel/drivers/scsi -f
-+	cp $(TARGET_MODULE).ko /lib/modules/$(KVERSION)/kernel/drivers/scsi -f
- clean:
- 	rm -f *.o *.ko
- 	rm -f $(TARGET_MODULE).mod.c
--
--
diff --git a/PKGBUILD b/PKGBUILD
index 8f031c124385..2c52b6cd787c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,66 +1,54 @@
-# Maintainer: mober <maxATmoberDOTat>
+# Maintainer: robertfoster
+# Contributor: mober <maxATmoberDOTat>
 # Thanks to:
 # * astyonax@github
 #   https://github.com/astyonax/patched-RTS5227-5229
-# * M0Rf30@github
-#  https://gist.github.com/M0Rf30/216dac68d544d60f94df862b074781fa
 
 _pkgbase=rts5227
-pkgname=rts5227-dkms
+pkgname=${_pkgbase}-dkms
 pkgver=1.07
-pkgrel=4
+pkgrel=5
 pkgdesc="Driver to support Realtek RTS5227/5229 SD Card Reader"
 arch=('i686' 'x86_64')
 url="http://www.realtek.com.tw/Downloads/downloadsView.aspx?Langid=1&PNid=15&PFid=25&Level=4&Conn=3&DownTypeID=3&GetDown=false"
-license=('')
+license=('GPL2')
 depends=('dkms')
-source=("http://12244.wpc.azureedge.net/8012244/drivers/rtdrivers/pc/crc/0001-Realtek_RTS5229_Linux_Driver_v${pkgver}.zip"
-"git+https://github.com/astyonax/patched-RTS5227-5229.git"
-'dkms.conf'
-'blacklist-rts5227-dkms.conf'
-'rts5227-dkms-suspend.sh'
-'Makefile.patch')
-md5sums=('0ecf8bea0ea3842391c68da72fe4c425'
-         'SKIP'
-         '63ab60ad3295c0aed7219dbddfd50af3'
-         '6640eecc5bcc3584397a7d1a33eb028f'
-         '76d0dea4f19bd3f79b282d9ec2141400'
-         '45871f654b6a237a0ae4646ec8e94769'
-         'SKIP')
-
-build(){
-  cd "Realtek_RTS5229_Linux_Driver_v${pkgver}"
-  tar xjf "rts5229.tar.bz2"
-  cd "rts5229"
-  patch -i "../../patched-RTS5227-5229/patch_linux_4.14.0.diff"
-  patch -i "../../Makefile.patch"
-}
+source=("rts5229::git+https://github.com/astyonax/patched-RTS5227-5229.git"
+	'dkms.conf'
+	'blacklist-rts5227-dkms.conf'
+	'rts5227-dkms-suspend.sh'
+)
 
 package(){
-  sourceDir="${srcdir}/Realtek_RTS5229_Linux_Driver_v${pkgver}/rts5229"
-  installDir="${pkgdir}/usr/src/${_pkgbase}-${pkgver}"
+	sourceDir="${srcdir}/rts5229/rts5229"
+	installDir="${pkgdir}/usr/src/${_pkgbase}-${pkgver}"
 
-  # Copy dkms .conf
-  install -Dm644 dkms.conf "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/dkms.conf"
-  # Set name and version
-  sed -e "s/@_PKGBASE@/${_pkgbase}/" \
-      -e "s/@PKGVER@/${pkgver}/" \
-      -i "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/dkms.conf"
+	# Copy dkms .conf
+	install -Dm644 dkms.conf "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/dkms.conf"
+	# Set name and version
+	sed -e "s/@_PKGBASE@/${_pkgbase}/" \
+		-e "s/@PKGVER@/${pkgver}/" \
+		-i "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/dkms.conf"
 
-  # Blacklist rtsx_pci
-  install -Dm644 "blacklist-${pkgname}.conf" "${pkgdir}/etc/modprobe.d/blacklist-${pkgname}.conf"
+	# Blacklist rtsx_pci
+	install -Dm644 "blacklist-${pkgname}.conf" "${pkgdir}/etc/modprobe.d/blacklist-${pkgname}.conf"
 
-  # Fix suspend
-  install -Dm755 "${pkgname}-suspend.sh" "${pkgdir}/usr/lib/systemd/system-sleep/${pkgname}-suspend.sh"
+	# Fix suspend
+	install -Dm755 "${pkgname}-suspend.sh" "${pkgdir}/usr/lib/systemd/system-sleep/${pkgname}-suspend.sh"
 
-  # Copy sources (including Makefile)
-  cd "${sourceDir}"
-  for d in `find . -type d`
-  do
-    install -dm755  "${installDir}/$d"
-  done
-  for f in `find . -type f ! -name 'README.md' ! -name '.gitignore'`
-  do
-    install -m644 "${sourceDir}/$f" "${installDir}/$f"
-  done
+	# Copy sources (including Makefile)
+	cd "${sourceDir}"
+	for d in `find . -type d`
+	do
+		install -dm755  "${installDir}/$d"
+	done
+	for f in `find . -type f ! -name 'README.md' ! -name '.gitignore'`
+	do
+		install -m644 "${sourceDir}/$f" "${installDir}/$f"
+	done
 }
+
+md5sums=('SKIP'
+	'63ab60ad3295c0aed7219dbddfd50af3'
+	'6640eecc5bcc3584397a7d1a33eb028f'
+'e59828310982d2943318900d7017b99f')