diff options
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | PKGBUILD | 11 | ||||
| -rw-r--r-- | linux-4.20.0-add-guard-fix.patch | 13 |
3 files changed, 25 insertions, 3 deletions
@@ -1,7 +1,7 @@ pkgbase = r8152-dkms pkgdesc = A kernel module for Realtek RTL8152/RTL8153 Based USB Ethernet Adapters pkgver = 2.11 - pkgrel = 1 + pkgrel = 2 url = http://www.realtek.com.tw arch = i686 arch = x86_64 @@ -13,8 +13,10 @@ pkgbase = r8152-dkms conflicts = r8152 source = https://github.com/wget/realtek-r8152-linux/archive/v2.11.tar.gz source = dkms.conf + source = linux-4.20.0-add-guard-fix.patch sha512sums = 26af771df2d6ffddd4101d71ac50dd834a71359fa5553e492e7572cc16c2762c848777a38b4df466d2ce3bab040b147a4f6b92eacdcd6f3783ba65a74ef5867a sha512sums = 2272d18f24a940fb878245849a0950d560b97ece8d492ebfe7ccf53f8ac6093b6b9da2b45c5ea3f99c77b36ffbd75337aa560cfd84428052f5436a9cda7c1605 + sha512sums = 6f123002a3b92f40ab1013e7b983dbc7f459aaa55b9253810ce658740105ee3c19496a40be2fef65afdda416db0a28705c5132aeb9ebc30665e728ca4aca7272 pkgname = r8152-dkms @@ -5,7 +5,7 @@ _pkgbase=r8152 pkgname=${_pkgbase}-dkms pkgver=2.11 -pkgrel=1 +pkgrel=2 pkgdesc="A kernel module for Realtek RTL8152/RTL8153 Based USB Ethernet Adapters" url="http://www.realtek.com.tw" license=("GPL") @@ -17,9 +17,16 @@ optdepends=('linux-headers: Build the module for Arch kernel' source=( "https://github.com/wget/realtek-r8152-linux/archive/v${pkgver}.tar.gz" 'dkms.conf' + 'linux-4.20.0-add-guard-fix.patch' ) sha512sums=('26af771df2d6ffddd4101d71ac50dd834a71359fa5553e492e7572cc16c2762c848777a38b4df466d2ce3bab040b147a4f6b92eacdcd6f3783ba65a74ef5867a' - '2272d18f24a940fb878245849a0950d560b97ece8d492ebfe7ccf53f8ac6093b6b9da2b45c5ea3f99c77b36ffbd75337aa560cfd84428052f5436a9cda7c1605') + '2272d18f24a940fb878245849a0950d560b97ece8d492ebfe7ccf53f8ac6093b6b9da2b45c5ea3f99c77b36ffbd75337aa560cfd84428052f5436a9cda7c1605' + '6f123002a3b92f40ab1013e7b983dbc7f459aaa55b9253810ce658740105ee3c19496a40be2fef65afdda416db0a28705c5132aeb9ebc30665e728ca4aca7272') + +prepare() { + cd realtek-r8152-linux-${pkgver} + patch -N -i "${srcdir}/linux-4.20.0-add-guard-fix.patch" +} package() { install -Dm644 dkms.conf "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/dkms.conf" diff --git a/linux-4.20.0-add-guard-fix.patch b/linux-4.20.0-add-guard-fix.patch new file mode 100644 index 000000000000..48c6e72d1dd4 --- /dev/null +++ b/linux-4.20.0-add-guard-fix.patch @@ -0,0 +1,13 @@ +--- r8152.c 2019-01-07 16:09:18.763539084 +0000 ++++ r8152.c 2019-01-07 16:09:12.533474396 +0000 +@@ -11505,8 +11505,10 @@ + + static const struct ethtool_ops ops = { + .get_drvinfo = rtl8152_get_drvinfo, ++#if LINUX_VERSION_CODE < KERNEL_VERSION(4,20,0) + .get_settings = rtl8152_get_settings, + .set_settings = rtl8152_set_settings, ++#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(4,20,0) */ + .get_link = ethtool_op_get_link, + .nway_reset = rtl8152_nway_reset, + .get_msglevel = rtl8152_get_msglevel, |