linux-sgx-driver-dkms-git: update

4 files changed, 19 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6ad2f1355865..38a47769efc3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = linux-sgx-driver-dkms-git
 	pkgdesc = Intel® SGX Linux module - dkms
-	pkgver = 2.11.r6.g0373e2e
+	pkgver = 2.14.r1.54c9c4c
 	pkgrel = 1
 	url = https://01.org/intel-softwareguard-extensions
 	arch = i686
@@ -12,10 +12,7 @@ pkgbase = linux-sgx-driver-dkms-git
 	optdepends = linux-zen-headers: Build the module for Zen Arch kernel
 	source = linux-sgx-driver::git+https://github.com/intel/linux-sgx-driver.git
 	source = dkms.conf
-	source = MAKEFILE.patch
 	sha256sums = SKIP
-	sha256sums = dc565dc756f96796e8297f0346a99b9d1bfa8b5782f3ff73e9a6cd7f9d45aa7c
-	sha256sums = 5194da660c5677da238a641e66d2695b6675e59c0c09f855b661d2cb5105d27d
+	sha256sums = 317e476c57e891eecd6c6b57eceb3ed7ab7ffbf3ba0a40362e08b5d35f23fe6f
 
 pkgname = linux-sgx-driver-dkms-git
-
diff --git a/MAKEFILE.patch b/MAKEFILE.patch
deleted file mode 100644
index 025a081586e7..000000000000
--- a/MAKEFILE.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --unified --recursive --text linux-sgx-driver.orig/Makefile linux-sgx-driver/Makefile
---- linux-sgx-driver.orig/Makefile	2020-12-30 23:35:25.706859158 -0800
-+++ linux-sgx-driver/Makefile	2020-12-30 23:47:34.306602884 -0800
-@@ -9,7 +9,7 @@
- 		sgx_encl2.o
- 	obj-m += isgx.o
- else
--KDIR := /lib/modules/$(shell uname -r)/build
-+KDIR := /lib/modules/${kernelver}/build
- PWD  := $(shell pwd)
- 
- default:
diff --git a/PKGBUILD b/PKGBUILD
index 24fbbdbbb941..92766d88847f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,9 +2,9 @@
 # Contributor: jon wiersma < arch aur at jonw dot org>
 # Contributor: abozanich
 
-pkg=linux-sgx-driver
-pkgname=$pkg-dkms-git
-pkgver=2.11.r6.g0373e2e
+_name=linux-sgx-driver
+pkgname="${_name}-dkms-git"
+pkgver=2.14.r1.54c9c4c
 pkgrel=1
 pkgdesc="Intel® SGX Linux module - dkms"
 arch=('i686' 'x86_64')
@@ -14,49 +14,33 @@ depends=('dkms')
 optdepends=('linux-headers: Build the module for Arch kernel'
   'linux-lts-headers: Build the module for LTS Arch kernel'
   'linux-zen-headers: Build the module for Zen Arch kernel')
-source=("$pkg::git+https://github.com/intel/linux-sgx-driver.git"
+source=("${_name}::git+https://github.com/intel/${_name}.git"
   "dkms.conf"
-  "MAKEFILE.patch")
+)
 sha256sums=('SKIP'
-  'dc565dc756f96796e8297f0346a99b9d1bfa8b5782f3ff73e9a6cd7f9d45aa7c'
-  '5194da660c5677da238a641e66d2695b6675e59c0c09f855b661d2cb5105d27d')
+  '317e476c57e891eecd6c6b57eceb3ed7ab7ffbf3ba0a40362e08b5d35f23fe6f')
 
 pkgver() {
-  cd "$pkg"
-  git describe --long --tags | cut -c 12- | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
-}
-
-prepare() {
-  cd "$pkg"
-  patch --forward --strip=1 --input="${srcdir}/MAKEFILE.patch"
+  cd "${_name}"
+  printf "%s" "$(git describe --tags | sed 's/sgx_diver_//g' | sed 's/\([^-]*-\)g/r\1/;s/-/./g')"
 }
 
 package() {
-  installDir="$pkgdir/usr/src/$pkg-$pkgver"
+  installDir="${pkgdir}/usr/src/${_name}-${pkgver}"
 
-  install -dm755 "$installDir"
+  install -dm755 "${installDir}"
 
   # Copy dkms .conf
-  install -Dm644 ../dkms.conf "$installDir/dkms.conf"
+  install -Dm644 ../dkms.conf "${installDir}/dkms.conf"
 
   # Set name and version
-  sed -e "s/@PKG@/${pkg}/" \
+  sed -e "s/@PKG@/${_name}/" \
     -e "s/@PKGVER@/${pkgver}/" \
-    -i "$installDir/dkms.conf"
+    -i "${installDir}/dkms.conf"
 
   # Copy sources
-  cd $srcdir/$pkg
-
-  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 "$f" "${installDir}/$f"
-  done
-
-  sed -e "s/-O0//" \
-    -i "$installDir/Makefile"
+  cp -r "${srcdir}/${_name}"/* "${installDir}"
 
   # Remove .git folder
-  rm -rf "$installDir/.git"
+  rm -rf "${installDir}/.git*"
 }
diff --git a/dkms.conf b/dkms.conf
index ce6d813f0ccc..651ba860500a 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -1,7 +1,7 @@
 PACKAGE_NAME="@PKG@"
 PACKAGE_VERSION="@PKGVER@"
-MAKE="'make'"
-CLEAN="'make' clean"
+MAKE="KDIR=/usr/lib/modules/$kernelver/build make"
+CLEAN="make clean"
 BUILT_MODULE_NAME[0]="isgx"
 DEST_MODULE_LOCATION[0]="/kernel/drivers/intel/sgx"
 AUTOINSTALL="yes"