Request 5297 (accepted)

Overview

Request 5297 (accepted)

- Now we change to github for basic download
- Configure existence of linux/pci-aspm.h on the fly

Created by bitstreamout almost 4 years ago
In state accepted
Package maintainer: bitstreamout

Submit r8168

Submit package home:bitstreamout:Essentials / r8168 to package Essentials / r8168

r8168.changes Changed

r8168.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package r8168
 #
-# Copyright (c) 2020 Packman Team <packman@links2linux.de>
+# Copyright (c) 2019 Packman Team <packman@links2linux.de>
 # Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
@@ -23,10 +23,8 @@
 Summary:        Device driver for RealTek Gigabit Ethernet controllers
 License:        GPL-2.0-or-later
 Group:          System/Kernel
-# Compare with https://github.com/mtorromeo/r8168 and
-# http://www.realtek.com.tw/Downloads/downloadsView.aspx?Langid=1&PNid=13&PFid=5&Level=5&Conn=4&DownTypeID=3&GetDown=false#2
-URL:            https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software
-Source0:        %{name}-%{version}.tar.bz2
+URL:            https://github.com/mtorromeo/r8168
+Source0:        https://github.com/mtorromeo/r8168/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Source1:        preamble
 Source2:        Module.supported
 Patch0:         r8168-kernel_version.patch
@@ -63,13 +61,23 @@
 cp %{S:2} .
 
 %build
+#
+# SUSE kernel does include some patches/commits which do not increase
+# the kernel's version, there we test here if the linux/pci-acpi.h exits
+#
+if test -e /usr/src/linux/include/linux/pci-aspm.h
+then
+    sed -ri '/#define HAS_PCI_ASPM_H/{ s/@ASPM@/1/ }' src/r8168_n.c
+else
+    sed -ri '/#define HAS_PCI_ASPM_H/{ s/@ASPM@/0/ }' src/r8168_n.c
+fi
 ln -sf $(type -p kmod) modinfo
 mkdir obj
 for flavor in %{flavors_to_build}
 do
     rm   -rf obj/$flavor
     cp   -rp src obj/$flavor
-    make -C %{kernel_source $flavor} M=$PWD/obj/$flavor modules
+    make V=1 -C %{kernel_source $flavor} M=$PWD/obj/$flavor modules
     ./modinfo -F alias $(find $PWD/obj/$flavor/ -name '%{name}.ko')
 done

r8168-kernel_version.patch Changed

@@ -1,10 +1,10 @@
 ---
  src/r8168.h   |    4 ++++
- src/r8168_n.c |    2 +-
- 2 files changed, 5 insertions(+), 1 deletion(-)
+ src/r8168_n.c |   15 ++++++++++++++-
+ 2 files changed, 18 insertions(+), 1 deletion(-)
 
 --- src/r8168.h
-+++ src/r8168.h	2020-02-10 11:32:37.788832833 +0000
++++ src/r8168.h	2021-01-25 09:25:12.615124741 +0000
 @@ -116,6 +116,10 @@ do { \
  } while (0)
  #endif //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
@@ -17,8 +17,51 @@
  #if defined(skb_vlan_tag_present) && !defined(vlan_tx_tag_present)
  #define vlan_tx_tag_present skb_vlan_tag_present
 --- src/r8168_n.c
-+++ src/r8168_n.c	2020-02-10 11:32:37.788832833 +0000
-@@ -28535,7 +28535,7 @@ process_pkt:
++++ src/r8168_n.c	2021-01-25 11:42:13.268115241 +0000
+@@ -60,11 +60,16 @@
+ #include <linux/rtnetlink.h>
+ #include <linux/completion.h>
+ 
++#ifndef HAS_PCI_ASPM_H
++#define HAS_PCI_ASPM_H @ASPM@
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0)
++#if HAS_PCI_ASPM_H
+ #include <linux/pci-aspm.h>
+ #endif
+ #endif
++#endif
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,37)
+ #include <linux/prefetch.h>
+ #endif
+@@ -459,8 +464,12 @@ static void rtl8168_set_rx_mode(struct n
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)
+ static void rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue);
+ #else
++#if !HAS_PCI_ASPM_H
++static void rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue);
++#else
+ static void rtl8168_tx_timeout(struct net_device *dev);
+ #endif
++#endif
+ static struct net_device_stats *rtl8168_get_stats(struct net_device *dev);
+ static int rtl8168_rx_interrupt(struct net_device *, struct rtl8168_private *, napi_budget);
+ static int rtl8168_change_mtu(struct net_device *dev, int new_mtu);
+@@ -27948,8 +27957,12 @@ static void
+ rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue)
+ #else
+ static void
++#if !HAS_PCI_ASPM_H
++rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue)
++#else
+ rtl8168_tx_timeout(struct net_device *dev)
+ #endif
++#endif
+ {
+         struct rtl8168_private *tp = netdev_priv(dev);
+         unsigned long flags;
+@@ -28655,7 +28668,7 @@ process_pkt:
  
                          if (rtl8168_rx_vlan_skb(tp, desc, skb) < 0)
                                  rtl8168_rx_skb(tp, skb);

r8168-8.048.03.tar.gz Renamed

Build Results
RPM Lint

Refresh

Comments for request 5297 0

Request History

bitstreamout created request almost 4 years ago

- Now we change to github for basic download
- Configure existence of linux/pci-aspm.h on the fly

bitstreamout accepted request almost 4 years ago

Does this work?