diff options
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | 0002-adv_mmap-vm_fault_t-5-1.patch | 20 | ||||
| -rw-r--r-- | PKGBUILD | 10 |
3 files changed, 32 insertions, 4 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Mon Mar 11 00:18:54 UTC 2019 +# Wed Jun 5 03:29:37 UTC 2019 pkgbase = advantech-vcom pkgdesc = tty driver for Advantech Adam EKI serial console terminal servers pkgver = 2.2.1 - pkgrel = 2 + pkgrel = 3 url = http://www.advantech.com/intelligent-connectivity/ install = advantech-vcom-install.sh arch = i686 @@ -21,9 +21,11 @@ pkgbase = advantech-vcom source = http://advdownload.advantech.com/productfile/Downloadfile5/1-1NOKMCV/vcom_linux_2.2.1.tar.bz2 source = 0000-advman.systemd.patch source = 0001-adv_main-access_ok_kernel-5-0.patch + source = 0002-adv_mmap-vm_fault_t-5-1.patch sha256sums = e5e313a1542e227a654fd1a497f8846ccb90df5490a888929826cb82becb5b0f sha256sums = 02f504a23fbef07f666aaa595faba0513d9ffec5e99ebca7b7fe2299a0179e32 sha256sums = 9335cfe8addfdf80224d21529fe0a70a6b750fa0823cfe806f5c94ae50a06cad + sha256sums = 77edc7a806085fc738fa4536e91fce98fb8e103f8207ec0d395f340107e83d0c pkgname = advantech-vcom diff --git a/0002-adv_mmap-vm_fault_t-5-1.patch b/0002-adv_mmap-vm_fault_t-5-1.patch new file mode 100644 index 000000000000..56c08d53723d --- /dev/null +++ b/0002-adv_mmap-vm_fault_t-5-1.patch @@ -0,0 +1,20 @@ +--- driver/adv_mmap.c.orig 2019-05-27 15:37:05.655080151 -0400 ++++ driver/adv_mmap.c 2019-05-27 15:37:14.062322054 -0400 +@@ -33,11 +33,16 @@ void adv_vma_close(struct vm_area_struct + { + // printk("%s(%d)\n", __func__, __LINE__); + } + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,10,0) +-int adv_vma_nopage(struct vm_fault *vmf) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0) ++vm_fault_t ++#else ++int ++#endif ++adv_vma_nopage(struct vm_fault *vmf) + { + unsigned long offset; + struct adv_vcom * data; + struct vm_area_struct *vma = vmf->vma; + struct page *page = NULL; @@ -59,7 +59,7 @@ pkgname='advantech-vcom' #pkgver='2.1.0'; _dl='4/1-15OSOW4' #pkgver='2.2.0'; _dl='4/1-1LPJPGD' pkgver='2.2.1'; _dl='5/1-1NOKMCV' # not compatible with Linux 3.16 -pkgrel='2' +pkgrel='3' pkgdesc='tty driver for Advantech Adam EKI serial console terminal servers' _pkgdescshort="Advantech ${pkgname} TTY driver" arch=('i686' 'x86_64') @@ -77,10 +77,12 @@ _srcdir="${_srcdir%\.tar*}" source+=( '0000-advman.systemd.patch' '0001-adv_main-access_ok_kernel-5-0.patch' + '0002-adv_mmap-vm_fault_t-5-1.patch' ) sha256sums=('e5e313a1542e227a654fd1a497f8846ccb90df5490a888929826cb82becb5b0f' '02f504a23fbef07f666aaa595faba0513d9ffec5e99ebca7b7fe2299a0179e32' - '9335cfe8addfdf80224d21529fe0a70a6b750fa0823cfe806f5c94ae50a06cad') + '9335cfe8addfdf80224d21529fe0a70a6b750fa0823cfe806f5c94ae50a06cad' + '77edc7a806085fc738fa4536e91fce98fb8e103f8207ec0d395f340107e83d0c') if [ "${_opt_DKMS}" -ne 0 ]; then depends+=('linux' 'dkms' 'linux-headers') @@ -96,6 +98,10 @@ prepare() { #diff -pNau5 driver/adv_main.c{.orig,} > '../0001-adv_main-access_ok_kernel-5-0.patch' patch -Nbup0 -i "${srcdir}/0001-adv_main-access_ok_kernel-5-0.patch" + #cp -p driver/adv_mmap.c{,.orig}; false + #diff -pNau5 driver/adv_mmap.c{.orig,} > '../0002-adv_mmap-vm_fault_t-5-1.patch' + patch -Nbup0 -i "${srcdir}/0002-adv_mmap-vm_fault_t-5-1.patch" + # Cosmetic correction of CRLF for Linux sed -e 's:\r$::g' -i 'readme.txt' |