diff options
-rw-r--r-- | .SRCINFO | 8 | ||||
-rw-r--r-- | 0002-kernel-5.0.0-do_gettimeofday.patch | 25 | ||||
-rw-r--r-- | PKGBUILD | 12 |
3 files changed, 39 insertions, 6 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Tue Jun 19 18:48:32 UTC 2018 +# Mon Apr 1 01:08:46 UTC 2019 pkgbase = digi-dgnc - pkgdesc = tty driver for Digi Neo and legacy ClassicBoard PCI PCIe serial port + pkgdesc = tty driver for Digi Neo and legacy ClassicBoard PCI PCIe RS-232 serial port pkgver = 1.3.29 - pkgrel = 1 + pkgrel = 2 url = https://www.digi.com/ install = digi-dgnc-install.sh arch = i686 @@ -16,9 +16,11 @@ pkgbase = digi-dgnc source = dgnc-1.3.29-40002369_H.src.rpm::http://ftp1.digi.com/support/driver/40002369_H.src.rpm source = 0000-Kernel-4-14-DRIVER-ATTR.patch source = 0001-Kernel-4-15-timers.patch + source = 0002-kernel-5.0.0-do_gettimeofday.patch sha256sums = e121a31569e3e1f156caeed70742971ec32fef598429ef647bde98f56aa048f5 sha256sums = 625bb794d31690b45ad7469f811e7422dac938cf8e9b777aba4d97b60b3c6eae sha256sums = 88d5a8589dca55ca98089dfa4570aa1fbde1095957d0788ad710a27b348c2f4f + sha256sums = 737df02a12fc76841325d1059d90451467637eab2df016efc20d84976eb5de7d pkgname = digi-dgnc diff --git a/0002-kernel-5.0.0-do_gettimeofday.patch b/0002-kernel-5.0.0-do_gettimeofday.patch new file mode 100644 index 000000000000..cec814b5047c --- /dev/null +++ b/0002-kernel-5.0.0-do_gettimeofday.patch @@ -0,0 +1,25 @@ +--- driver/2.6.27/dgnc_tty.c.orig 2017-10-21 10:39:21.000000000 -0400 ++++ driver/2.6.27/dgnc_tty.c 2019-03-31 21:05:47.560452555 -0400 +@@ -519,10 +519,22 @@ void dgnc_tty_uninit(struct board_t *brd + } + + + #define TMPBUFLEN (1024) + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,0,0) ++/* Temporary until reimplemented with 64 bit functions */ ++static inline void do_gettimeofday(struct timeval *tv) ++{ ++ struct timespec64 now; ++ ++ ktime_get_real_ts64(&now); ++ tv->tv_sec = now.tv_sec; ++ tv->tv_usec = now.tv_nsec/1000; ++} ++#endif ++ + /* + * dgnc_sniff - Dump data out to the "sniff" buffer if the + * proc sniff file is opened... + */ + void dgnc_sniff_nowait_nolock(struct channel_t *ch, uchar *text, uchar *buf, int len) @@ -17,8 +17,8 @@ pkgname='digi-dgnc' #_pkgver='1.3-28'; _dl='40002369_G.tgz' _pkgver='1.3-29'; _dl='40002369_H.src.rpm' pkgver="${_pkgver//-/.}" -pkgrel=1 -pkgdesc='tty driver for Digi Neo and legacy ClassicBoard PCI PCIe serial port' +pkgrel='2' +pkgdesc='tty driver for Digi Neo and legacy ClassicBoard PCI PCIe RS-232 serial port' arch=('i686' 'x86_64') url='https://www.digi.com/' license=('GPL') @@ -29,10 +29,12 @@ source=( "${pkgname##*-}-${pkgver}-${_dl}::http://ftp1.digi.com/support/driver/${_dl}" '0000-Kernel-4-14-DRIVER-ATTR.patch' # https://patchwork.kernel.org/patch/9851919/ Available since 3.11-rc2 '0001-Kernel-4-15-timers.patch' + '0002-kernel-5.0.0-do_gettimeofday.patch' ) sha256sums=('e121a31569e3e1f156caeed70742971ec32fef598429ef647bde98f56aa048f5' '625bb794d31690b45ad7469f811e7422dac938cf8e9b777aba4d97b60b3c6eae' - '88d5a8589dca55ca98089dfa4570aa1fbde1095957d0788ad710a27b348c2f4f') + '88d5a8589dca55ca98089dfa4570aa1fbde1095957d0788ad710a27b348c2f4f' + '737df02a12fc76841325d1059d90451467637eab2df016efc20d84976eb5de7d') if [ "${_opt_DKMS}" -ne 0 ]; then depends+=('linux' 'dkms' 'linux-headers') @@ -80,6 +82,10 @@ prepare() { patch -Nup1 -i "${srcdir}/0001-Kernel-4-15-timers.patch" test ! -d "${srcdir}/${_srcdir}.orig-0001" || echo "${}" + #cp -p driver/2.6.27/dgnc_tty.c{,.orig}; false + #diff -pNau5 driver/2.6.27/dgnc_tty.c{.orig,} > '0002-kernel-5.0.0-do_gettimeofday.patch' + patch -Nbup0 -i "${srcdir}/0002-kernel-5.0.0-do_gettimeofday.patch" + # Version check local _ver _ver="$(grep -e 'TRUE_VERSION=' ./Makefile.inc | cut -d'"' -f2)" |