From cc504d6531deb0a371e19f3ab37f5b0c5a6e6002 Mon Sep 17 00:00:00 2001 From: Bouke Sybren Haarsma Date: Wed, 8 Nov 2023 23:19:36 +0100 Subject: [PATCH] use r8152 package from aur --- manifest | 1 + pkgs/r8152-dkms/PKGBUILD | 42 ----------------------------- pkgs/r8152-dkms/compatibility.patch | 26 ------------------ pkgs/r8152-dkms/dkms.conf | 8 ------ 4 files changed, 1 insertion(+), 76 deletions(-) delete mode 100644 pkgs/r8152-dkms/PKGBUILD delete mode 100644 pkgs/r8152-dkms/compatibility.patch delete mode 100644 pkgs/r8152-dkms/dkms.conf diff --git a/manifest b/manifest index c76dd7ab1..d06ce1ce8 100644 --- a/manifest +++ b/manifest @@ -204,6 +204,7 @@ export AUR_PACKAGES="\ pikaur \ powerstation-bin \ python-vdf \ + r8152-dkms \ r8168-dkms \ retroarch-autoconfig-udev-git \ rtl8812au-dkms-git \ diff --git a/pkgs/r8152-dkms/PKGBUILD b/pkgs/r8152-dkms/PKGBUILD deleted file mode 100644 index 6a6498b0b..000000000 --- a/pkgs/r8152-dkms/PKGBUILD +++ /dev/null @@ -1,42 +0,0 @@ -# Maintainer: William Gathoye -# Maintainer: Hyacinthe Cartiaux -# Contributor: Giorgio Gilestro -# Contributor: Richard Mathot -_pkgbase=r8152 -pkgname=${_pkgbase}-dkms -pkgver=2.16.3.20221209 -pkgrel=1 -pkgdesc="A kernel module for Realtek RTL8152/RTL8153/RTL8154/RTL8156 Based USB Ethernet Adapters" -url="http://www.realtek.com" -license=("GPL") -arch=('i686' 'x86_64') -depends=('glibc' 'dkms') -conflicts=("${_pkgbase}") -optdepends=('linux-headers: Build the module for Arch kernel' - 'linux-lts-headers: Build the module for LTS Arch kernel') -source=( - "https://github.com/wget/realtek-r8152-linux/archive/v${pkgver}.tar.gz" - 'dkms.conf' - 'compatibility.patch' -) -sha512sums=('74815f0d0d76745af60c2cf7db05a6ca37fe56dc4f47c63ae272af3459419bce22ae28e1dbb3f4ca95ec8bfd3674c32da39ab50a7f0e2cd5b20b507a03a0336f' - '04d93f2297be0ffbd9ad8611ee619406af26f8fc987686e7150a68d4e8d9d94d104b76583a3190699587fd568c995e31c96332afa77b880a972eb24861ba5dea' - '71b8ff111cfa3f0ea4ab274aeaed6347bf58fb62af031457e87f11ba49f05ddbfe901e3703cd49074a00a58e47dc395825592d97a02de197dbaddf4fabe326f7' - ) - -prepare() { - pushd "realtek-${_pkgbase}-linux-${pkgver}" - patch -p1 -i "$srcdir/compatibility.patch" - popd -} - -package() { - install -Dm644 dkms.conf "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/dkms.conf" - - sed -e "s/@PKGNAME@/${_pkgbase}/g" \ - -e "s/@PKGVER@/${_pkgbase}/g" \ - -i "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/dkms.conf" - - cp -dr --no-preserve='ownership' "realtek-${_pkgbase}-linux-${pkgver}" "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/src" - install -D -m644 "realtek-${_pkgbase}-linux-${pkgver}/50-usb-realtek-net.rules" "${pkgdir}/usr/lib/udev/rules.d/50-usb-realtek-net.rules" -} diff --git a/pkgs/r8152-dkms/compatibility.patch b/pkgs/r8152-dkms/compatibility.patch deleted file mode 100644 index 4579f986c..000000000 --- a/pkgs/r8152-dkms/compatibility.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5ee1af899075e1b1f25fa12227609c57c170fbbc Mon Sep 17 00:00:00 2001 -From: Martin Pecka -Date: Mon, 14 Aug 2023 13:54:15 +0200 -Subject: [PATCH] Fixed compatibility with Linux 6.4.10+ (#33) - ---- - r8152.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/r8152.c b/r8152.c -index c3ba2ca..47aad6d 100644 ---- a/r8152.c -+++ b/r8152.c -@@ -25,6 +25,12 @@ - #include - #include - #include -+// Linux 6.4.10 added net/gso.h -+#if defined __has_include -+#if __has_include () -+#include -+#endif -+#endif - #include - #include - #include diff --git a/pkgs/r8152-dkms/dkms.conf b/pkgs/r8152-dkms/dkms.conf deleted file mode 100644 index fd5ca33d8..000000000 --- a/pkgs/r8152-dkms/dkms.conf +++ /dev/null @@ -1,8 +0,0 @@ -PACKAGE_NAME="@PKGNAME@" -PACKAGE_VERSION="@PKGVER@" -MAKE[0]="make -C $kernel_source_dir M=$dkms_tree/$module/$module_version/build/src EXTRA_CFLAGS='-DCONFIG_R8152_NAPI -DCONFIG_R8152_VLAN' modules" -CLEAN="rm src/@PKGNAME@.ko src/*.o || true" -BUILT_MODULE_NAME[0]="@PKGNAME@" -BUILT_MODULE_LOCATION[0]="src/" -DEST_MODULE_LOCATION[0]="/updates" -AUTOINSTALL="yes"