diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | 0001-Kernel-4-15-timers.patch | 22 | ||||
| -rw-r--r-- | PKGBUILD | 20 |
3 files changed, 24 insertions, 24 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Thu May 24 04:13:04 UTC 2018 +# Tue Jun 5 04:14:15 UTC 2018 pkgbase = dgrp pkgdesc = tty driver for Digi RealPort ConnectPort EtherLite Flex One CM PortServer TS IBM RAN serial console terminal servers pkgver = 1.9.38 - pkgrel = 2 + pkgrel = 3 url = https://www.digi.com/ install = dgrp-install.sh arch = i686 @@ -92,7 +92,7 @@ pkgbase = dgrp sha256sums = 5cac7ce2e6f043127f314b93694af021ae7820ffb5bf3de343da7a240d05e9c8 sha256sums = 8654496d83c083e457e8bb9bae2b1e71804d156a38c284d89872d0125eba947d sha256sums = 61500188b388fd1eb52ec970150cf098d855b8ba09a8efb8192803eebefaba03 - sha256sums = 06b0eb6f6f7108d869e869edb5f09669bc90575efcd2f151311f024a834c4001 + sha256sums = 46a87449cd316a621271def4147ba781424dd524ae2332cd55dd07f2ac9ab456 pkgname = dgrp diff --git a/0001-Kernel-4-15-timers.patch b/0001-Kernel-4-15-timers.patch index cd46476bb286..c1227b2ecce7 100644 --- a/0001-Kernel-4-15-timers.patch +++ b/0001-Kernel-4-15-timers.patch @@ -1,6 +1,6 @@ diff -pNaru5 dgrp-1.9.orig/driver/2.6.27/dgrp_net_ops.c dgrp-1.9/driver/2.6.27/dgrp_net_ops.c ---- dgrp-1.9.orig/driver/2.6.27/dgrp_net_ops.c 2018-04-13 21:29:37.489330195 -0400 -+++ dgrp-1.9/driver/2.6.27/dgrp_net_ops.c 2018-04-13 21:26:42.150695586 -0400 +--- dgrp-1.9.orig/driver/2.6.27/dgrp_net_ops.c 2018-06-03 20:45:01.337174862 -0400 ++++ dgrp-1.9/driver/2.6.27/dgrp_net_ops.c 2018-06-03 20:45:01.417174550 -0400 @@ -87,11 +87,15 @@ static long node_active_count; /* one * the poller */ @@ -68,8 +68,8 @@ diff -pNaru5 dgrp-1.9.orig/driver/2.6.27/dgrp_net_ops.c dgrp-1.9/driver/2.6.27/d /* diff -pNaru5 dgrp-1.9.orig/driver/2.6.27/dgrp_tty.c dgrp-1.9/driver/2.6.27/dgrp_tty.c ---- dgrp-1.9.orig/driver/2.6.27/dgrp_tty.c 2018-04-13 21:29:37.492330190 -0400 -+++ dgrp-1.9/driver/2.6.27/dgrp_tty.c 2018-04-13 20:36:29.458050323 -0400 +--- dgrp-1.9.orig/driver/2.6.27/dgrp_tty.c 2018-06-03 20:45:01.340508182 -0400 ++++ dgrp-1.9/driver/2.6.27/dgrp_tty.c 2018-06-03 20:46:37.953467319 -0400 @@ -783,13 +783,25 @@ if (ttylock) tty_lock(ch->port.tty); /* @@ -96,7 +96,7 @@ diff -pNaru5 dgrp-1.9.orig/driver/2.6.27/dgrp_tty.c dgrp-1.9/driver/2.6.27/dgrp_ } -@@ -797,11 +809,16 @@ static void wake_up_drp_sleep_timer(unsi +@@ -797,11 +809,15 @@ static void wake_up_drp_sleep_timer(unsi * Set up our own sleep that can't be cancelled * until our timeout occurs. */ @@ -106,14 +106,13 @@ diff -pNaru5 dgrp-1.9.orig/driver/2.6.27/dgrp_tty.c dgrp-1.9/driver/2.6.27/dgrp_ struct timer_list drp_wakeup_timer; +#else + struct ch_timer_list drp_wakeup_timer_ch; -+#define drp_wakeup_timer (drp_wakeup_timer_ch.tl) +#endif DECLARE_WAITQUEUE(wait, current); /* * First make sure we're ready to receive the wakeup. */ -@@ -812,23 +829,30 @@ static void drp_my_sleep(struct ch_struc +@@ -812,23 +828,29 @@ static void drp_my_sleep(struct ch_struc /* * Since we are uninterruptible, set a timer to * unset the uninterruptable state in 1 second. @@ -123,14 +122,13 @@ diff -pNaru5 dgrp-1.9.orig/driver/2.6.27/dgrp_tty.c dgrp-1.9/driver/2.6.27/dgrp_ init_timer(&drp_wakeup_timer); drp_wakeup_timer.function = wake_up_drp_sleep_timer; drp_wakeup_timer.data = (unsigned long) ch; - drp_wakeup_timer.expires = jiffies + (1 * HZ); - add_timer(&drp_wakeup_timer); +#else -+ timer_setup(&drp_wakeup_timer_ch.tl,wake_up_drp_sleep_timer,0); ++#define drp_wakeup_timer (drp_wakeup_timer_ch.tl) ++ timer_setup(&drp_wakeup_timer,wake_up_drp_sleep_timer,0); + drp_wakeup_timer_ch.ch=ch; +#endif -+ drp_wakeup_timer.expires = jiffies + (1 * HZ); -+ add_timer(&drp_wakeup_timer); + drp_wakeup_timer.expires = jiffies + (1 * HZ); + add_timer(&drp_wakeup_timer); schedule(); @@ -107,7 +107,7 @@ source 'PKGBUILD.local' set -u pkgname='dgrp' pkgver='1.9.38' -pkgrel='2' +pkgrel='3' pkgdesc="tty driver for Digi ${_opt_RealPort} ConnectPort EtherLite Flex One CM PortServer TS IBM RAN serial console terminal servers" #_pkgdescshort="Digi ${_opt_RealPort} driver for Ethernet serial servers" # For when we used to generate the autorebuild from here arch=('i686' 'x86_64') @@ -166,6 +166,7 @@ _mibsdnw=( _mibsrc='http://ftp1.digi.com/support/utilities/' _filever="${pkgver//\./-}" _filever="${_filever/-/.}" +_srcdir="dgrp-${_filever%%-*}" source=( #"${pkgname}-${pkgver}-81000137_X.tgz::http://ftp1.digi.com/support/driver/81000137_X.tgz" #"${pkgname}-${pkgver}-beta.tgz::ftp://ftp1.digi.com/support/driver/RealPort%20Linux%20Beta%20Driver/dgrp-${_filever}_y1p.tgz.rpm" @@ -214,7 +215,7 @@ sha256sums=('e474518da5b3feddd1f4dd0083ac8125e34ba07da9884cbd3ebd1955006891d7' '5cac7ce2e6f043127f314b93694af021ae7820ffb5bf3de343da7a240d05e9c8' '8654496d83c083e457e8bb9bae2b1e71804d156a38c284d89872d0125eba947d' '61500188b388fd1eb52ec970150cf098d855b8ba09a8efb8192803eebefaba03' - '06b0eb6f6f7108d869e869edb5f09669bc90575efcd2f151311f024a834c4001') + '46a87449cd316a621271def4147ba781424dd524ae2332cd55dd07f2ac9ab456') if [ "${_opt_DKMS}" -ne 0 ]; then depends+=('linux' 'dkms' 'linux-headers') @@ -281,7 +282,7 @@ _fn_mibcheck() { prepare() { set -u - cd dgrp-*/ + cd "${_srcdir}" rm -f daemon/openssl-*.tar.gz # I don't want their version to build if OpenSSL version detection fails in the future @@ -350,18 +351,19 @@ prepare() { -e '/^dgrp_init_module/,/^$/ s@version: %s@& Arch Linux@g' \ -i driver/[0-9]*/dgrp_driver.c - #diff -pNaru5 dgrp-1.9{.orig,} > '../0000-Kernel-4-13-CLASS_ATTR_STRING.patch' - patch -Nbup1 < "${srcdir}/0000-Kernel-4-13-CLASS_ATTR_STRING.patch" + #diff -pNaru5 dgrp-1.9{.orig,} > '0000-Kernel-4-13-CLASS_ATTR_STRING.patch' + patch -Nup1 < "${srcdir}/0000-Kernel-4-13-CLASS_ATTR_STRING.patch" - #diff -pNaru5 dgrp-1.9{.orig,} > '../0001-Kernel-4-15-timers.patch' - patch -Nbup1 < "${srcdir}/0001-Kernel-4-15-timers.patch" + #cp -pr "${srcdir}/${_srcdir}"{,.orig} + #diff -pNaru5 dgrp-1.9{.orig,} > '0001-Kernel-4-15-timers.patch' + patch -Nup1 < "${srcdir}/0001-Kernel-4-15-timers.patch" set +u } build() { set -u - cd dgrp-*/ + cd "${_srcdir}" if [ ! -s 'Makefile' ]; then # this generates a harmless error as it tries to make a folder in /usr/lib/modules... @@ -392,7 +394,7 @@ package() { eval 'dep''ends+=("linux=${_kernelversionsmall}")' fi - cd dgrp-*/ + cd "${_srcdir}" #. 'config/file_locations.Arch' make -s -j1 RPM_BUILD_ROOT="${pkgdir}" install |