diff options
author | Chris Severance | 2023-12-19 01:47:05 -0500 |
---|---|---|
committer | Chris Severance | 2023-12-19 01:47:05 -0500 |
commit | 688d1556071bac6f864e0f1b1763abb30f46f864 (patch) | |
tree | 71f38e8c85a214909d8d91b465b1de1323661453 | |
parent | 6f943f82e658c3b36f3ffd348e74b27821eb5dcc (diff) | |
download | aur-688d1556071bac6f864e0f1b1763abb30f46f864.tar.gz |
autu: Update to 1.3.29-8
-rw-r--r-- | .SRCINFO | 15 | ||||
-rw-r--r-- | 0005-kernel-5.13-dropped-tty_check_change.patch | 2 | ||||
-rw-r--r-- | 0012-kernel-6.4-class_create-1arg.patch | 19 | ||||
-rw-r--r-- | 0013-kernel-6.4-DEFINE_SEMAPHORE-2arg.patch | 19 | ||||
-rw-r--r-- | 0014-kernel-6.6-struct-tty_operations-write-size_t.patch | 37 | ||||
-rw-r--r-- | PKGBUILD | 53 |
6 files changed, 129 insertions, 16 deletions
@@ -1,7 +1,7 @@ pkgbase = digi-dgnc pkgdesc = tty driver for Digi Neo and legacy ClassicBoard PCI PCIe RS-232 serial port pkgver = 1.3.29 - pkgrel = 7 + pkgrel = 8 url = https://www.digi.com/ install = digi-dgnc-install.sh arch = i686 @@ -25,31 +25,40 @@ pkgbase = digi-dgnc source = 0009-kernel-5.17-change-PDE_DATA.patch source = 0010-kernel-6.1-INIT_C_CC-termios_internal.patch source = 0011-kernel-6.0-set_termios-const-ktermios.patch + source = 0012-kernel-6.4-class_create-1arg.patch + source = 0013-kernel-6.4-DEFINE_SEMAPHORE-2arg.patch + source = 0014-kernel-6.6-struct-tty_operations-write-size_t.patch md5sums = 6171349852f6d02228d6e30c79b7a434 md5sums = a171e9ea1a4ff8340c3c58b303632edf md5sums = 6c16c3c24c79fb558bcf27f780829c75 md5sums = 8e46a778c648ab4f0ca63a337d36df60 md5sums = 394d24a150676d8123300d6715b81fb8 md5sums = 44b0a7b0ab4dbe661b822fcba9423121 - md5sums = 10ba960da22684d2da89872df1d822cc + md5sums = 98f1684623d45f66e42f78e5ab8fd8c2 md5sums = 89de6a694ecf827a3358bcd8aea03a6a md5sums = 58d75d8f86830d09ba8754d4e03a6a9d md5sums = 7ceda3eaa776322b2042de8d159535ea md5sums = 9371ea6968666c58413a463fcf341d1f md5sums = 53bcd11e5e4acbd0466b3ffdda3b263b md5sums = 6475487a9415d3dc7ece9dd888cec92c + md5sums = 7824cfd37ca3c7dd27e911c679f8256c + md5sums = bbae50830fad8e9e2b674078c2770aee + md5sums = b1584c28e0e1d6741ff4e7cca25761d8 sha256sums = e121a31569e3e1f156caeed70742971ec32fef598429ef647bde98f56aa048f5 sha256sums = 625bb794d31690b45ad7469f811e7422dac938cf8e9b777aba4d97b60b3c6eae sha256sums = 88d5a8589dca55ca98089dfa4570aa1fbde1095957d0788ad710a27b348c2f4f sha256sums = 737df02a12fc76841325d1059d90451467637eab2df016efc20d84976eb5de7d sha256sums = 3496e90914e1fa2f209dd85c336e7b1c0b784dbbf67cc45e0f0f55f0b1ef5a0e sha256sums = f215451df4a01f0875a53425b6d8452c344f19b61b59b821f8c949b1b276c022 - sha256sums = 13257318895327e7438f7f357c5dc7d67310ec0468802df083815414d4743805 + sha256sums = f5eebe58f625b493cf8cb4c7fb8630fd4d0f9fa278ce4400b011fd702bd2db90 sha256sums = dcedb22e0f3fb0c8197630b38217f86c5468d065ab2d67708c16c17351d6944e sha256sums = 0693e13442749c40a338320cca72dd8aad23678ea7cae035e6bab01a40640c44 sha256sums = 718e5104ff4caf153757dd2f8c143402d2c175fd838cfc5db3f47618efd40230 sha256sums = b5000b9bb68ae8ddc173b666ead6d60fa329aa4d5d96636af4717a131827748c sha256sums = c0786d12440da829f0a57ca9e7f2c3114edbd88213bb66687ac84730ee7c8ed1 sha256sums = ab4921079d2a4ee3316bbea3bcb3ff7844d8ced73b6b4327d3c580088bc511b1 + sha256sums = 021745fab94745eaea1abc503a1f7ec94dfa6132f841d5ce2bb969dcb049eda6 + sha256sums = 40ee1fb8e261008d810c7251de5612029fa9c8b83a58bdd3279dd64467cb1bed + sha256sums = 414f1115e195616945ac8d597bfd59a9ae3b8ec392c8f06f15213efa662e6433 pkgname = digi-dgnc diff --git a/0005-kernel-5.13-dropped-tty_check_change.patch b/0005-kernel-5.13-dropped-tty_check_change.patch index 8c12d7c09d3a..53bc3291a932 100644 --- a/0005-kernel-5.13-dropped-tty_check_change.patch +++ b/0005-kernel-5.13-dropped-tty_check_change.patch @@ -7,7 +7,7 @@ diff -pNaru5 driver/2.6.27.orig/dgnc_tty.c driver/2.6.27/dgnc_tty.c DPR_IOCTL(("dgnc_tty_flush_buffer finish\n")); } -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,13,0) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,10,180) +int tty_check_change(struct tty_struct *tty); +#endif diff --git a/0012-kernel-6.4-class_create-1arg.patch b/0012-kernel-6.4-class_create-1arg.patch new file mode 100644 index 000000000000..ccd329aaf84e --- /dev/null +++ b/0012-kernel-6.4-class_create-1arg.patch @@ -0,0 +1,19 @@ +diff -pNaru5 a/driver/2.6.27/dgnc_driver.c b/driver/2.6.27/dgnc_driver.c +--- a/driver/2.6.27/dgnc_driver.c 2023-12-19 01:34:02.724532936 -0500 ++++ b/driver/2.6.27/dgnc_driver.c 2023-12-19 01:35:48.258543884 -0500 +@@ -308,11 +308,15 @@ static int dgnc_start(void) + rc = -ENXIO; + return(rc); + } + dgnc_Major = rc; + ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0) + dgnc_class = class_create(THIS_MODULE, "dgnc_mgmt"); ++#else ++ dgnc_class = class_create("dgnc_mgmt"); ++#endif + device_create(dgnc_class, NULL, MKDEV(dgnc_Major, 0), + NULL, "dgnc_mgmt"); + device_create(dgnc_class, NULL, MKDEV(dgnc_Major, 1), + NULL, "dgnc_mgmt1"); + device_create(dgnc_class, NULL, MKDEV(dgnc_Major, 2), diff --git a/0013-kernel-6.4-DEFINE_SEMAPHORE-2arg.patch b/0013-kernel-6.4-DEFINE_SEMAPHORE-2arg.patch new file mode 100644 index 000000000000..b13c197dd961 --- /dev/null +++ b/0013-kernel-6.4-DEFINE_SEMAPHORE-2arg.patch @@ -0,0 +1,19 @@ +diff -pNaru5 a/driver/2.6.27/dgnc_tty.c b/driver/2.6.27/dgnc_tty.c +--- a/driver/2.6.27/dgnc_tty.c 2023-12-19 01:37:32.514419708 -0500 ++++ b/driver/2.6.27/dgnc_tty.c 2023-12-19 01:38:44.487209394 -0500 +@@ -75,11 +75,15 @@ + /* + * internal variables + */ + static struct board_t *dgnc_BoardsByMajor[256]; + static uchar *dgnc_TmpWriteBuf = NULL; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0) + static DEFINE_SEMAPHORE(dgnc_TmpWriteSem); ++#else ++static DEFINE_SEMAPHORE(dgnc_TmpWriteSem,1); ++#endif + + /* + * Default transparent print information. + */ + static struct digi_t dgnc_digi_init = { diff --git a/0014-kernel-6.6-struct-tty_operations-write-size_t.patch b/0014-kernel-6.6-struct-tty_operations-write-size_t.patch new file mode 100644 index 000000000000..35f64657d785 --- /dev/null +++ b/0014-kernel-6.6-struct-tty_operations-write-size_t.patch @@ -0,0 +1,37 @@ +diff -pNaru5 a/driver/2.6.27/dgnc_tty.c b/driver/2.6.27/dgnc_tty.c +--- a/driver/2.6.27/dgnc_tty.c 2023-12-19 01:40:37.816271903 -0500 ++++ b/driver/2.6.27/dgnc_tty.c 2023-12-19 01:43:19.098247079 -0500 +@@ -155,11 +155,15 @@ static int dgnc_tty_tiocmset(struct tty_ + static int dgnc_tty_tiocmget(struct tty_struct *tty); + static int dgnc_tty_tiocmset(struct tty_struct *tty, unsigned int set, unsigned int clear); + #endif + static int dgnc_tty_send_break(struct tty_struct *tty, int msec); + static void dgnc_tty_wait_until_sent(struct tty_struct *tty, int timeout); ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,6,0) + static int dgnc_tty_write(struct tty_struct *tty, const unsigned char *buf, int count); ++#else ++static ssize_t dgnc_tty_write(struct tty_struct *tty, const unsigned char *buf, size_t count); ++#endif + #if LINUX_VERSION_CODE < KERNEL_VERSION(6,0,0) + static void dgnc_tty_set_termios(struct tty_struct *tty, struct ktermios *old_termios); + #else + static void dgnc_tty_set_termios(struct tty_struct *tty, const struct ktermios *old_termios); + #endif +@@ -2251,12 +2255,17 @@ static int dgnc_tty_put_char(struct tty_ + * dgnc_tty_write() + * + * Take data from the user or kernel and send it out to the FEP. + * In here exists all the Transparent Print magic as well. + */ ++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,6,0) + static int dgnc_tty_write(struct tty_struct *tty, + const unsigned char *buf, int count) ++#else ++static ssize_t dgnc_tty_write(struct tty_struct *tty, ++ const unsigned char *buf, size_t count) ++#endif + { + struct channel_t *ch = NULL; + struct un_t *un = NULL; + int bufcount = 0, n = 0; + int orig_count = 0; @@ -16,6 +16,8 @@ _opt_DKMS=1 # This can be toggled between installs _opt_defaultmode="0660" # default: 0600 _opt_defaultgroup="uucp" # default: root +#export KERNELRELEASE="$(basename $(dirname /usr/lib/modules/5.10.*/modules.alias))" + # ls -l /dev | grep ',' | sort -n -k 5.1 | less set -u @@ -23,7 +25,7 @@ pkgname='digi-dgnc' #_pkgver='1.3-28'; _dl='40002369_G.tgz' _pkgver='1.3-29'; _dl='40002369_H.src.rpm' pkgver="${_pkgver//-/.}" -pkgrel='7' +pkgrel='8' pkgdesc='tty driver for Digi Neo and legacy ClassicBoard PCI PCIe RS-232 serial port' arch=('i686' 'x86_64') url='https://www.digi.com/' @@ -46,6 +48,9 @@ source=( '0009-kernel-5.17-change-PDE_DATA.patch' '0010-kernel-6.1-INIT_C_CC-termios_internal.patch' '0011-kernel-6.0-set_termios-const-ktermios.patch' + '0012-kernel-6.4-class_create-1arg.patch' + '0013-kernel-6.4-DEFINE_SEMAPHORE-2arg.patch' + '0014-kernel-6.6-struct-tty_operations-write-size_t.patch' ) md5sums=('6171349852f6d02228d6e30c79b7a434' 'a171e9ea1a4ff8340c3c58b303632edf' @@ -53,26 +58,32 @@ md5sums=('6171349852f6d02228d6e30c79b7a434' '8e46a778c648ab4f0ca63a337d36df60' '394d24a150676d8123300d6715b81fb8' '44b0a7b0ab4dbe661b822fcba9423121' - '10ba960da22684d2da89872df1d822cc' + '98f1684623d45f66e42f78e5ab8fd8c2' '89de6a694ecf827a3358bcd8aea03a6a' '58d75d8f86830d09ba8754d4e03a6a9d' '7ceda3eaa776322b2042de8d159535ea' '9371ea6968666c58413a463fcf341d1f' '53bcd11e5e4acbd0466b3ffdda3b263b' - '6475487a9415d3dc7ece9dd888cec92c') + '6475487a9415d3dc7ece9dd888cec92c' + '7824cfd37ca3c7dd27e911c679f8256c' + 'bbae50830fad8e9e2b674078c2770aee' + 'b1584c28e0e1d6741ff4e7cca25761d8') sha256sums=('e121a31569e3e1f156caeed70742971ec32fef598429ef647bde98f56aa048f5' '625bb794d31690b45ad7469f811e7422dac938cf8e9b777aba4d97b60b3c6eae' '88d5a8589dca55ca98089dfa4570aa1fbde1095957d0788ad710a27b348c2f4f' '737df02a12fc76841325d1059d90451467637eab2df016efc20d84976eb5de7d' '3496e90914e1fa2f209dd85c336e7b1c0b784dbbf67cc45e0f0f55f0b1ef5a0e' 'f215451df4a01f0875a53425b6d8452c344f19b61b59b821f8c949b1b276c022' - '13257318895327e7438f7f357c5dc7d67310ec0468802df083815414d4743805' + 'f5eebe58f625b493cf8cb4c7fb8630fd4d0f9fa278ce4400b011fd702bd2db90' 'dcedb22e0f3fb0c8197630b38217f86c5468d065ab2d67708c16c17351d6944e' '0693e13442749c40a338320cca72dd8aad23678ea7cae035e6bab01a40640c44' '718e5104ff4caf153757dd2f8c143402d2c175fd838cfc5db3f47618efd40230' 'b5000b9bb68ae8ddc173b666ead6d60fa329aa4d5d96636af4717a131827748c' 'c0786d12440da829f0a57ca9e7f2c3114edbd88213bb66687ac84730ee7c8ed1' - 'ab4921079d2a4ee3316bbea3bcb3ff7844d8ced73b6b4327d3c580088bc511b1') + 'ab4921079d2a4ee3316bbea3bcb3ff7844d8ced73b6b4327d3c580088bc511b1' + '021745fab94745eaea1abc503a1f7ec94dfa6132f841d5ce2bb969dcb049eda6' + '40ee1fb8e261008d810c7251de5612029fa9c8b83a58bdd3279dd64467cb1bed' + '414f1115e195616945ac8d597bfd59a9ae3b8ec392c8f06f15213efa662e6433') if [ "${_opt_DKMS}" -ne 0 ]; then depends+=('linux' 'dkms' 'linux-headers') @@ -151,18 +162,33 @@ prepare() { # diff -pNaru5 'a' 'b' > '0008-kernel-6.1-remove-TTY_MAGIC.patch' patch -Nup1 -i "${srcdir}/0008-kernel-6.1-remove-TTY_MAGIC.patch" + # https://www.spinics.net/lists/linux-fsdevel/msg207433.html # cd ..; cp -pr "${_srcdir}" 'a'; ln -s "${_srcdir}" 'b'; false # diff -pNaru5 'a' 'b' > '0009-kernel-5.17-change-PDE_DATA.patch' patch -Nup1 -i "${srcdir}/0009-kernel-5.17-change-PDE_DATA.patch" + # https://www.uwsg.indiana.edu/hypermail/linux/kernel/1809.1/00449.html #cd ..; cp -pr "${_srcdir}" 'a'; ln -s "${_srcdir}" 'b'; false # diff -pNaru5 'a' 'b' > '0010-kernel-6.1-INIT_C_CC-termios_internal.patch' patch -Nup1 -i "${srcdir}/0010-kernel-6.1-INIT_C_CC-termios_internal.patch" + # https://lore.kernel.org/linux-arm-kernel/20220816115739.10928-9-ilpo.jarvinen@linux.intel.com/T/ # cd ..; cp -pr "${_srcdir}" 'a'; ln -s "${_srcdir}" 'b'; false # diff -pNaru5 'a' 'b' > '0011-kernel-6.0-set_termios-const-ktermios.patch' patch -Nup1 -i "${srcdir}/0011-kernel-6.0-set_termios-const-ktermios.patch" + #cd ..; cp -pr "${_srcdir}" 'a'; ln -s "${_srcdir}" 'b'; false + # diff -pNaru5 'a' 'b' > '0012-kernel-6.4-class_create-1arg.patch' + patch -Nup1 -i "${srcdir}/0012-kernel-6.4-class_create-1arg.patch" + + #cd ..; cp -pr "${_srcdir}" 'a'; ln -s "${_srcdir}" 'b'; false + # diff -pNaru5 'a' 'b' > '0013-kernel-6.4-DEFINE_SEMAPHORE-2arg.patch' + patch -Nup1 -i "${srcdir}/0013-kernel-6.4-DEFINE_SEMAPHORE-2arg.patch" + + #cd ..; cp -pr "${_srcdir}" 'a'; ln -s "${_srcdir}" 'b'; false + # diff -pNaru5 'a' 'b' > '0014-kernel-6.6-struct-tty_operations-write-size_t.patch' + patch -Nup1 -i "${srcdir}/0014-kernel-6.6-struct-tty_operations-write-size_t.patch" + # Version check local _ver _ver="$(grep -e 'TRUE_VERSION=' ./Makefile.inc | cut -d'"' -f2)" @@ -203,13 +229,22 @@ prepare() { test ! -s 'scripts/postinstall.Arch' || echo "${}" # new folder in gcc 8 + #cp -p 'driver/2.6.27/Makefile26'{,.Arch} sed -e 's/^clean:$/&\n\trm -f .cache.mk/g' \ -e '# Use built in clean' \ -e 's:clean:clean_local:g' \ -e 's~^clean_local:~clean:\n\tmake -C @KERNEL_HEADERS@ SUBDIRS=$$PWD clean\n\n&~g' \ -e '# Kernel 5.4 compatible' \ -e 's: SUBDIRS=\([^ ]\+\) : M=\1&:g ' \ - -i driver/*/Makefile* + -e 's:@MODDIR@:/usr/lib/modules/$(KERNELRELEASE):g' \ + -e 's:@KERNEL_HEADERS@:/usr/lib/modules/$(KERNELRELEASE)/build:g' \ + -e '# Not a good way to sub variables' \ + -e '/^MODDIR =/ s:\$(shell echo \(.*\))$:\1:g' \ + -e '# Anything using these must fail' \ + -e '/MOD = \// s:^:#:g' \ + -e '1i KERNELRELEASE?=$(shell uname -r)' \ + -i 'driver/2.6.27/Makefile26' + test ! -s 'driver/2.6.27/Makefile26.Arch' # Branding in dmesg sed -e '/^static int dgnc_start/,/^}$/ s@^\(\s\+\)APR(("For@'"\1APR((DRVSTR\": Arch Linux https://aur.archlinux.org/packages/${pkgname}/\"));\n&@g" \ @@ -352,12 +387,6 @@ EOF rm "${_dkms}/driver/build/"/Makefile?* install -Dpm644 'dpa/dpacompat.h' -t "${_dkms}/dpa" install -pm644 'Makefile.inc' -t "${_dkms}/" - sed -e 's:/usr/lib/modules/[^/]\+/:/usr/lib/modules/$(KERNELRELEASE)/:g' \ - -e '# Not a good way to sub variables' \ - -e '/^MODDIR =/ s:\$(shell echo \(.*\))$:\1:g' \ - -e '# Anything using these must fail' \ - -e '/MOD = \// s:^:#:g' \ - -i "${_dkms}/driver/build/Makefile" make -C "${_dkms}/driver/build/" clean KERNELRELEASE="$(uname -r)" MYPWD="${_dkms}/driver/build/" fi set +u |