From 1c29e8ad1c8d7d995b7674e800f65f5cf031252c Mon Sep 17 00:00:00 2001
From: honjow <honjow311@gamil.com>
Date: Sun, 1 Oct 2023 19:01:13 +0800
Subject: [PATCH] r8168-dkms r8152-dkms

---
 manifest                                   |  2 +
 pkgs/r8152-dkms/PKGBUILD                   | 42 --------------------
 pkgs/r8152-dkms/compatibility.patch        | 26 -------------
 pkgs/r8152-dkms/dkms.conf                  |  8 ----
 pkgs/r8168-dkms/6.4.10-compatibility.patch | 18 ---------
 pkgs/r8168-dkms/PKGBUILD                   | 45 ----------------------
 pkgs/r8168-dkms/dkms.conf                  |  8 ----
 pkgs/r8168-dkms/r8168-dkms.install         | 15 --------
 8 files changed, 2 insertions(+), 162 deletions(-)
 delete mode 100644 pkgs/r8152-dkms/PKGBUILD
 delete mode 100644 pkgs/r8152-dkms/compatibility.patch
 delete mode 100644 pkgs/r8152-dkms/dkms.conf
 delete mode 100644 pkgs/r8168-dkms/6.4.10-compatibility.patch
 delete mode 100644 pkgs/r8168-dkms/PKGBUILD
 delete mode 100644 pkgs/r8168-dkms/dkms.conf
 delete mode 100644 pkgs/r8168-dkms/r8168-dkms.install

diff --git a/manifest b/manifest
index 56c7077ce..81c280025 100644
--- a/manifest
+++ b/manifest
@@ -222,6 +222,8 @@ export AUR_PACKAGES="\
 	rtw89-dkms-git \
 	ryzenadj-git \
 	rz608-fix-git \
+	r8168-dkms \
+	r8152-dkms \
 	steam-removable-media-git \
 	sk-chos-tool \
 	sk-boot-to-windows \
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 <william + aur at gathoye dot be>
-# Maintainer: Hyacinthe Cartiaux <hyacinthe.cartiaux@free.fr>
-# Contributor: Giorgio Gilestro <giorgio at gilest dot ro>
-# Contributor: Richard Mathot <rim at odoo dot com>
-_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 <peci1@seznam.cz>
-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 <linux/ip.h>
- #include <linux/ipv6.h>
- #include <net/ip6_checksum.h>
-+// Linux 6.4.10 added net/gso.h
-+#if defined __has_include
-+#if __has_include (<net/gso.h>)
-+#include <net/gso.h>
-+#endif
-+#endif
- #include <linux/usb/cdc.h>
- #include <linux/suspend.h>
- #include <linux/atomic.h>
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"
diff --git a/pkgs/r8168-dkms/6.4.10-compatibility.patch b/pkgs/r8168-dkms/6.4.10-compatibility.patch
deleted file mode 100644
index 1814f0fed..000000000
--- a/pkgs/r8168-dkms/6.4.10-compatibility.patch
+++ /dev/null
@@ -1,18 +0,0 @@
----
- src/r8168_n.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/src/r8168_n.c b/src/r8168_n.c
-index 7e9e2ea..3855910 100755
---- a/src/r8168_n.c
-+++ b/src/r8168_n.c
-@@ -81,6 +81,10 @@
- #include <linux/mdio.h>
- #endif
- 
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(6,4,10)
-+#include <net/gso.h>
-+#endif
-+
- #include <asm/io.h>
- #include <asm/irq.h>
\ No newline at end of file
diff --git a/pkgs/r8168-dkms/PKGBUILD b/pkgs/r8168-dkms/PKGBUILD
deleted file mode 100644
index 34246030e..000000000
--- a/pkgs/r8168-dkms/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# Maintainer: Patrick Northon <northon_patrick3@yahoo.ca>
-# Contributor: René Wagner <rwa at clttr dot info>
-# Contributor: Juan Simón <play4pro at protonmail dot com>
-# Contributor: alium
-# Contributor: angelsl
-# Contributor: hayao <hayao@fascode.net>
-
-_pkgbase=r8168
-pkgname=${_pkgbase}-dkms
-pkgver=8.051.02
-pkgrel=2
-pkgdesc="A kernel module for Realtek 8168 network cards (DKMS version)"
-url="https://github.com/mtorromeo/r8168"
-license=("GPL")
-arch=('i686' 'x86_64')
-depends=('glibc' 'dkms')
-makedepends=('git')
-conflicts=("${_pkgbase}")
-provides=("${_pkgbase}")
-source=("r8168-dkms::git+https://github.com/mtorromeo/r8168.git"
-        "${pkgname}-6.1.patch::https://github.com/mtorromeo/r8168/pull/47.patch"
-        "dkms.conf"
-        "6.4.10-compatibility.patch")
-sha256sums=('SKIP'
-            'b7ef09e7496715b7576b7a3bff5a96e0e07c0bb02cd5bb5805415be20b883f60'
-            'd37b8acbd4fe06f81538581712a04751a96fc37bad3a4bd3ae8329f8744c49b3'
-            '422a7345af3c3d422f27d98cf01e42aab465270e5df8ffe43d2a496888fabe5b')
-install=r8168-dkms.install
-
-prepare() {
-	cd "${pkgname}"
-	patch -p1 -i "$srcdir/${pkgname}-6.1.patch"
-	patch -p1 -i "$srcdir/6.4.10-compatibility.patch"
-}
-
-package() {
-	install -Dm644 dkms.conf "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/dkms.conf"
-
-	sed -e "s/@PKGNAME@/${_pkgbase}/g" \
-	    -e "s/@PKGVER@/${pkgver}/g" \
-	    -i "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/dkms.conf"
-
-	cd "${pkgname}"
-	cp -dr --no-preserve='ownership' src "${pkgdir}/usr/src/${_pkgbase}-${pkgver}/src"
-}
diff --git a/pkgs/r8168-dkms/dkms.conf b/pkgs/r8168-dkms/dkms.conf
deleted file mode 100644
index 6cf43667f..000000000
--- a/pkgs/r8168-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_R8168_NAPI=y -DCONFIG_R8168_VLAN=y -DCONFIG_ASPM=y -DENABLE_S5WOL=y -DENABLE_EEE=y' modules"
-CLEAN="rm src/@PKGNAME@.ko src/*.o || true"
-BUILT_MODULE_NAME[0]="@PKGNAME@"
-BUILT_MODULE_LOCATION[0]="src/"
-DEST_MODULE_LOCATION[0]="/kernel/drivers/net/ethernet/realtek"
-AUTOINSTALL="yes"
diff --git a/pkgs/r8168-dkms/r8168-dkms.install b/pkgs/r8168-dkms/r8168-dkms.install
deleted file mode 100644
index e8a5013ba..000000000
--- a/pkgs/r8168-dkms/r8168-dkms.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  dkms add r8168/${1%-*}
-}
-
-pre_upgrade() {
-  pre_remove "$2"
-}
-
-post_upgrade() {
-  post_install "$1"
-}
-
-pre_remove() {
-  [ -n "${1%-*}" ] && dkms remove r8168/${1%-*} --all &>/dev/null || true
-}