try to fix install with custom kernels

5 files changed, 21 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 33faff23f731..39959fa5caf7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,7 @@
 pkgbase = goodix-gpdwin3-dkms
 	pkgdesc = Goodix touchscreen driver hack for GPD WIN3
 	pkgver = 1.1
-	pkgrel = 1
-	install = goodix-gpdwin3-dkms.install
+	pkgrel = 2
 	arch = any
 	license = GPL2
 	depends = dkms
@@ -15,8 +14,8 @@ pkgbase = goodix-gpdwin3-dkms
 	md5sums = 6ef1b9c306d7996e7bfdb9cc50677f81
 	md5sums = 7543431323fd4a1efb2d381b69886ef9
 	md5sums = 616b595d278b52a265156c2fa68a740c
-	md5sums = 5861e444eb6ba83d44a3c746f04e9a04
-	md5sums = 7b0228ff533f0a8e63dc962621e0d97e
+	md5sums = f514c2a1d6de0f50ea5ebc112447ff7d
+	md5sums = 53d0b9c5ba6ba5457fd65ed901323360
 	md5sums = 1505740dffca34d8119f3798a0624ebc
 
 pkgname = goodix-gpdwin3-dkms
diff --git a/Makefile b/Makefile
index 6a7c3edb3828..2f1b13bd37ed 100644
--- a/Makefile
+++ b/Makefile
@@ -1,16 +1,13 @@
 BASE_NAME := goodix
 KERNEL_SOURCE_DIR = /lib/modules/`uname -r`/build
 
-obj-m := goodixgpdw3.o
-goodixgpdw3-objs := $(BASE_NAME).o $(BASE_NAME)_fwupload.o
+obj-m := goodix-gpdwin3.o
+goodix-gpdwin3-objs := $(BASE_NAME).o $(BASE_NAME)_fwupload.o
 
-modules:
-	$(MAKE) -C $(KERNEL_SOURCE_DIR) M=$(PWD) modules
+all: modules
 
-modules_install:
-	$(MAKE) -C $(KERNEL_SOURCE_DIR) M=$(PWD) modules_install
+clean modules modules_install:
+	$(MAKE) -C $(KERNEL_SOURCE_DIR) M=$(PWD) $@
 
 install: modules_install
 
-clean:
-	$(MAKE) -C $(KERNEL_SOURCE_DIR) M=$(PWD) clean
diff --git a/PKGBUILD b/PKGBUILD
index 597f6a105e7b..9fd504198aeb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,12 +3,11 @@
 _pkgbase=goodix-gpdwin3
 pkgname=${_pkgbase}-dkms
 pkgver=1.1
-pkgrel=1
+pkgrel=2
 pkgdesc="Goodix touchscreen driver hack for GPD WIN3"
 arch=('any')
 license=('GPL2')
 depends=('dkms')
-install=${pkgname}.install
 source=(
   "goodix.c"
   "goodix.h"
@@ -20,14 +19,20 @@ source=(
 md5sums=('6ef1b9c306d7996e7bfdb9cc50677f81'
 	 '7543431323fd4a1efb2d381b69886ef9'
 	 '616b595d278b52a265156c2fa68a740c'
-         '5861e444eb6ba83d44a3c746f04e9a04'
-         '7b0228ff533f0a8e63dc962621e0d97e'
+         'f514c2a1d6de0f50ea5ebc112447ff7d'
+         '53d0b9c5ba6ba5457fd65ed901323360'
          '1505740dffca34d8119f3798a0624ebc')
 
 package() {
   cd "$srcdir"
-  local install_dir="${pkgdir}/usr/src/${_pkgbase}-${pkgver}"
+  local install_dir="${pkgdir}"/usr/src/${_pkgbase}-${pkgver}
   install -Dm644 dkms.conf "${install_dir}/dkms.conf"
+
+  # Set name and version
+  sed -e "s/@_PKGBASE@/${_pkgbase}/" \
+      -e "s/@PKGVER@/${pkgver}/" \
+      -i "${install_dir}"/dkms.conf
+
   install -Dm644 goodix.c "${install_dir}/goodix.c"
   install -Dm644 goodix.h "${install_dir}/goodix.h"
   install -Dm644 goodix_fwupload.c "${install_dir}/goodix_fwupload.c"
diff --git a/dkms.conf b/dkms.conf
index 4dc7c40ffd28..7ee02b704330 100644
--- a/dkms.conf
+++ b/dkms.conf
@@ -2,6 +2,6 @@ PACKAGE_NAME="@_PKGBASE@"
 PACKAGE_VERSION="@PKGVER@"
 MAKE[0]="KERNEL_SOURCE_DIR=/usr/lib/modules/$kernelver/build make modules"
 CLEAN="make clean"
-BUILT_MODULE_NAME[0]="goodixgpdw3"
-DEST_MODULE_LOCATION[0]="/extra"
-AUTOINSTALL="yes"
+BUILT_MODULE_NAME[0]="@_PKGBASE@"
+DEST_MODULE_LOCATION[0]="/kernel/drivers/input/touchscreen"
+AUTOINSTALL=yes
diff --git a/goodix-gpdwin3-dkms.install b/goodix-gpdwin3-dkms.install
deleted file mode 100644
index 4c00604ebef2..000000000000
--- a/goodix-gpdwin3-dkms.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-	dkms install goodix-gpdwin3/${1%%-*}
-}
-
-pre_upgrade() {
-	pre_remove ${2%%-*}
-}
-
-post_upgrade() {
-	post_install ${1%%-*}
-}
-
-pre_remove() {
-	dkms remove goodix-gpdwin3/${1%%-*} --all
-}