From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 24BB4138334 for ; Fri, 27 Dec 2019 15:24:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 79C7AE0954; Fri, 27 Dec 2019 15:24:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 61B91E0954 for ; Fri, 27 Dec 2019 15:24:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 76CB734DB4F for ; Fri, 27 Dec 2019 15:24:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 06A8C34 for ; Fri, 27 Dec 2019 15:24:14 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1577460123.e7e2b380d2ca4eaa70a011507e90bc7dc4729d58.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-misc/r8168/, net-misc/r8168/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-misc/r8168/files/linux-5.4.patch net-misc/r8168/r8168-8.047.05.ebuild X-VCS-Directories: net-misc/r8168/ net-misc/r8168/files/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: e7e2b380d2ca4eaa70a011507e90bc7dc4729d58 X-VCS-Branch: master Date: Fri, 27 Dec 2019 15:24:14 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: f808faaa-91cd-4c74-b343-2b54089c5027 X-Archives-Hash: a8320df78823b421450211ba20b939cb commit: e7e2b380d2ca4eaa70a011507e90bc7dc4729d58 Author: James Le Cuirot gentoo org> AuthorDate: Fri Dec 27 15:22:03 2019 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Fri Dec 27 15:22:03 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e7e2b380 net-misc/r8168: Fix building 8.047.05 on Linux 5.4 Closes: https://bugs.gentoo.org/701200 Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: James Le Cuirot gentoo.org> net-misc/r8168/files/linux-5.4.patch | 12 ++++++++++++ net-misc/r8168/r8168-8.047.05.ebuild | 4 ++++ 2 files changed, 16 insertions(+) diff --git a/net-misc/r8168/files/linux-5.4.patch b/net-misc/r8168/files/linux-5.4.patch new file mode 100644 index 00000000000..197983597be --- /dev/null +++ b/net-misc/r8168/files/linux-5.4.patch @@ -0,0 +1,12 @@ +diff -Naur r8168-8.047.05.orig/src/r8168_n.c r8168-8.047.05/src/r8168_n.c +--- r8168-8.047.05.orig/src/r8168_n.c 2019-07-23 10:22:09.000000000 +0800 ++++ r8168-8.047.05/src/r8168_n.c 2019-12-23 00:55:34.121947346 +0800 +@@ -56,7 +56,7 @@ + #include + #include + +-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26) && LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0) + #include + #endif + #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,37) diff --git a/net-misc/r8168/r8168-8.047.05.ebuild b/net-misc/r8168/r8168-8.047.05.ebuild index 5d05429e616..152d2ec6ffc 100644 --- a/net-misc/r8168/r8168-8.047.05.ebuild +++ b/net-misc/r8168/r8168-8.047.05.ebuild @@ -19,6 +19,10 @@ BUILD_TARGETS="modules" CONFIG_CHECK="!R8169" ERROR_R8169="${P} requires Realtek 8169 PCI Gigabit Ethernet adapter (CONFIG_R8169) to be DISABLED" +PATCHES=( + "${FILESDIR}"/linux-5.4.patch +) + pkg_nofetch() { einfo "Please download ${SRC_URI} from:" einfo " ${HOMEPAGE}"