incorporate comments by aravance

4 files changed, 11 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1efcc52373f1..dcefb2c35320 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = r8125-dkms
 	pkgdesc = Kernel module for RTL8125
 	pkgver = 9.004.01
-	pkgrel = 3
+	pkgrel = 4
 	url = https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software
 	arch = x86_64
 	license = GPL2
@@ -12,7 +12,7 @@ pkgbase = r8125-dkms
 	source = https://github.com/ibmibmibm/r8125/archive/master.tar.gz
 	source = dkms.conf
 	sha256sums = c25ec4ea817bd00108b023afbc19383ea177c042e6ee52c8c386c17615bb9b98
-	sha256sums = 425f714f0cc5373a2f1808c1cf6cbfd605a1774ce9a789620fe86a026e319fee
+	sha256sums = 8a10787ee95ef4279408dc9711c23863926a8e6b9081161b47f56b78b0c54a9f
 
 pkgname = r8125-dkms
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..f34a96c51ab9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+pkg
+src
diff --git a/PKGBUILD b/PKGBUILD
index 480808c19d32..d7de73c9fd0c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,10 +1,11 @@
 # Maintainer: Bernd Amend <bernd.amend(at)gmail(dot)com>
+# Contributor: Alex Avance
 # Contributor: Shen-Ta Hsieh <ibmibmibm(at)gmail(dot)com>
 
 _pkgname=r8125
 pkgname=${_pkgname}-dkms
 pkgver=9.004.01
-pkgrel=3
+pkgrel=4
 url="https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software"
 pkgdesc="Kernel module for RTL8125"
 license=('GPL2')
@@ -15,15 +16,14 @@ optdepends=('linux-headers: Build the module for Arch kernel'
             'linux-lts-headers: Build the module for LTS Arch kernel')
 source=("https://github.com/ibmibmibm/r8125/archive/master.tar.gz" 'dkms.conf')
 sha256sums=('c25ec4ea817bd00108b023afbc19383ea177c042e6ee52c8c386c17615bb9b98'
-            '425f714f0cc5373a2f1808c1cf6cbfd605a1774ce9a789620fe86a026e319fee')
+            '8a10787ee95ef4279408dc9711c23863926a8e6b9081161b47f56b78b0c54a9f')
 
 package() {
   dir_name="${_pkgname}-${pkgver}"
-  install -Dm644 dkms.conf "${pkgdir}/usr/src/${dir_name}/dkms.conf"
+  install -d "${pkgdir}"/usr/src/${dir_name}/
+  install -Dm644 dkms.conf "${_pkgname}-master"/src/* "${pkgdir}/usr/src/${dir_name}/"
 
   sed -e "s/@_PKGNAME@/${_pkgname}/g" \
       -e "s/@PKGVER@/${pkgver}/g" \
       -i "${pkgdir}/usr/src/${dir_name}/dkms.conf"
-
-  cp -r "${_pkgname}-master"/* "${pkgdir}/usr/src/${dir_name}/"
 }
diff --git a/dkms.conf b/dkms.conf
index e463a898a467..74b22d83bb6f 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,8 +1,7 @@
 PACKAGE_NAME="@_PKGNAME@"
 PACKAGE_VERSION="@PKGVER@"
-MAKE[0]="make -C $kernel_source_dir M=$source_tree/@_PKGNAME@-@PKGVER@/src modules"
-CLEAN="make -C $kernel_source_dir V=1 M=$source_tree/@_PKGNAME@-@PKGVER@/src clean"
+MAKE[0]="make -C $kernel_source_dir M=$dkms_tree/$PACKAGE_NAME/$PACKAGE_VERSION/build modules"
+CLEAN="make -C $kernel_source_dir M=$dkms_tree/$PACKAGE_NAME/$PACKAGE_VERSION/build clean"
 BUILT_MODULE_NAME[0]="@_PKGNAME@"
-BUILT_MODULE_LOCATION[0]="src"
 DEST_MODULE_LOCATION[0]="/extramodules"
 AUTOINSTALL="yes"