summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authortaotieren2024-12-10 00:03:51 +0800
committertaotieren2024-12-10 00:03:51 +0800
commit5ae640ada267e2e6969d00fba9badd8ddacc2c77 (patch)
tree4c432fac89a0d70fd9a1835b6cd915b2c2ff9471
parent79b8793aa37aad93c8ee3796a9afb3bd3fe42eaf (diff)
downloadaur-5ae640ada267e2e6969d00fba9badd8ddacc2c77.tar.gz
[lilac] updated to r49.4ea8973-2
-rw-r--r--.SRCINFO7
-rw-r--r--PKGBUILD36
-rw-r--r--fix-linux-6-12-build.patch16
3 files changed, 18 insertions, 41 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 5d9b14b96b87..4c59dcf1030a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,20 +1,17 @@
pkgbase = ch9344ser-git
pkgdesc = This driver supports USB to quad serial ports chip ch9344 and USB to octal serial ports chip ch348.
pkgver = r49.4ea8973
- pkgrel = 1
+ pkgrel = 2
url = https://github.com/WCHSoftGroup/ch9344ser_linux
arch = any
license = GPL-2.0-or-later
makedepends = git
- makedepends = patch
depends = dkms
depends = glibc
options = !strip
options = !debug
source = ch9344ser-git::git+https://github.com/WCHSoftGroup/ch9344ser_linux.git
- source = fix-linux-6-12-build.patch
- sha512sums = SKIP
- sha512sums = 219b2f7aecef04baad802e6561f3f1194679904b506c17d973c4dcd1b02b7f2041b90416a5a00a129ac873db9b9646ed1af2a865d5270d9aa9dc6d039cc11a3f
+ sha256sums = SKIP
pkgname = ch9344ser-dkms-git
pkgdesc = This driver supports USB to quad serial ports chip ch9344 and USB to octal serial ports chip ch348. (dkms).
diff --git a/PKGBUILD b/PKGBUILD
index 31ca1f84ec57..d79389f9a6d9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,19 +3,16 @@
pkgbase=ch9344ser-git
pkgname=(ch9344ser-dkms-git libch9344ser-git)
pkgver=r49.4ea8973
-pkgrel=1
+pkgrel=2
pkgdesc="This driver supports USB to quad serial ports chip ch9344 and USB to octal serial ports chip ch348."
arch=('any')
url="https://github.com/WCHSoftGroup/ch9344ser_linux"
license=('GPL-2.0-or-later')
depends=(dkms
- glibc)
-makedepends=(git
- patch)
-source=("${pkgbase}::git+${url}.git"
- fix-linux-6-12-build.patch)
-sha512sums=('SKIP'
- "219b2f7aecef04baad802e6561f3f1194679904b506c17d973c4dcd1b02b7f2041b90416a5a00a129ac873db9b9646ed1af2a865d5270d9aa9dc6d039cc11a3f")
+ glibc)
+makedepends=('git')
+source=("${pkgbase}::git+${url}.git")
+sha256sums=('SKIP')
options=(!strip !debug)
pkgver() {
@@ -29,7 +26,6 @@ pkgver() {
prepare() {
git -C "${srcdir}/${pkgbase}" clean -dfx
- patch "${srcdir}/${pkgbase}/driver/ch9344.c" "${srcdir}/fix-linux-6-12-build.patch"
}
package_ch9344ser-dkms-git() {
@@ -52,37 +48,37 @@ VERSION ?= \$(shell cat VERSION)
SRC_DIR=\$(shell pwd)
default:
- \$(MAKE) -C \$(KDIR) M=\$(SRC_DIR) modules
+ \$(MAKE) -C \$(KDIR) M=\$(SRC_DIR) modules
clean:
- \$(MAKE) -C \$(KDIR) M=\$(SRC_DIR) clean
+ \$(MAKE) -C \$(KDIR) M=\$(SRC_DIR) clean
install:
- \$(MAKE) -C \$(KDIR) M=\$(SRC_DIR) modules_install
+ \$(MAKE) -C \$(KDIR) M=\$(SRC_DIR) modules_install
load: -/sbin/rmmod ch9344
- /sbin/insmod ch9344.ko
+ /sbin/insmod ch9344.ko
dkms.conf: dkms.conf.in
- sed "s/@@VERSION@@/\$(VERSION)/" $^ > \$@
+ sed "s/@@VERSION@@/\$(VERSION)/" $^ > \$@
dkms-add: dkms.conf
- /usr/sbin/dkms add \$(SRC_DIR)
+ /usr/sbin/dkms add \$(SRC_DIR)
dkms-build: dkms.conf
- /usr/sbin/dkms build ch9344/\$(VERSION)
+ /usr/sbin/dkms build ch9344/\$(VERSION)
dkms-install: dkms.conf
- /usr/sbin/dkms install ch9344/\$(VERSION)
+ /usr/sbin/dkms install ch9344/\$(VERSION)
dkms-remove: dkms.conf
- /usr/sbin/dkms remove ch9344/\$(VERSION) --all
+ /usr/sbin/dkms remove ch9344/\$(VERSION) --all
modprobe-install:
- modprobe ch9344
+ modprobe ch9344
modprobe-remove:
- modprobe -r ch9344
+ modprobe -r ch9344
dev: modprobe-remove dkms-remove dkms-add dkms-builddkms-install modprobe-install
EOF
diff --git a/fix-linux-6-12-build.patch b/fix-linux-6-12-build.patch
deleted file mode 100644
index a9ae61d51aa7..000000000000
--- a/fix-linux-6-12-build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/ch9344.c b/ch9344.c
-index 8130334..b017faa 100644
---- a/ch9344.c
-+++ b/ch9344.c
-@@ -62,7 +62,11 @@
- #include <linux/timer.h>
- #include <linux/kfifo.h>
- #include <asm/byteorder.h>
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(6, 12, 0))
-+#include <linux/unaligned.h>
-+#else
- #include <asm/unaligned.h>
-+#endif
-
- #if (LINUX_VERSION_CODE >= KERNEL_VERSION(4, 11, 0))
- #include <linux/sched/signal.h>