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 about 4 years ago
- In state accepted
-
Package maintainer:
bitstreamout
r8168.changes
Changed
x
1
2
-------------------------------------------------------------------
3
+Thu Jan 21 15:49:06 UTC 2021 - Werner Fink <werner@suse.de>
4
+
5
+- Now we change to github for basic download
6
+- Configure exisxtence of linux/pci-aspm.h on the fly
7
+
8
+-------------------------------------------------------------------
9
Tue Jun 2 07:17:12 UTC 2020 - Luigi Baldoni <aloisio@gmx.com>
10
11
- Update to version 8.048.03
12
r8168.spec
Changed
48
1
2
#
3
# spec file for package r8168
4
#
5
-# Copyright (c) 2020 Packman Team <packman@links2linux.de>
6
+# Copyright (c) 2019 Packman Team <packman@links2linux.de>
7
# Copyright (c) 2017 SUSE LINUX Products GmbH, Nuernberg, Germany.
8
#
9
# All modifications and additions to the file contributed by third parties
10
11
Summary: Device driver for RealTek Gigabit Ethernet controllers
12
License: GPL-2.0-or-later
13
Group: System/Kernel
14
-# Compare with https://github.com/mtorromeo/r8168 and
15
-# http://www.realtek.com.tw/Downloads/downloadsView.aspx?Langid=1&PNid=13&PFid=5&Level=5&Conn=4&DownTypeID=3&GetDown=false#2
16
-URL: https://www.realtek.com/en/component/zoo/category/network-interface-controllers-10-100-1000m-gigabit-ethernet-pci-express-software
17
-Source0: %{name}-%{version}.tar.bz2
18
+URL: https://github.com/mtorromeo/r8168
19
+Source0: https://github.com/mtorromeo/r8168/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
20
Source1: preamble
21
Source2: Module.supported
22
Patch0: r8168-kernel_version.patch
23
24
cp %{S:2} .
25
26
%build
27
+#
28
+# SUSE kernel does include some patches/commits which do not increase
29
+# the kernel's version, there we test here if the linux/pci-acpi.h exits
30
+#
31
+if test -e /usr/src/linux/include/linux/pci-aspm.h
32
+then
33
+ sed -ri '/#define HAS_PCI_ASPM_H/{ s/@ASPM@/1/ }' src/r8168_n.c
34
+else
35
+ sed -ri '/#define HAS_PCI_ASPM_H/{ s/@ASPM@/0/ }' src/r8168_n.c
36
+fi
37
ln -sf $(type -p kmod) modinfo
38
mkdir obj
39
for flavor in %{flavors_to_build}
40
do
41
rm -rf obj/$flavor
42
cp -rp src obj/$flavor
43
- make -C %{kernel_source $flavor} M=$PWD/obj/$flavor modules
44
+ make V=1 -C %{kernel_source $flavor} M=$PWD/obj/$flavor modules
45
./modinfo -F alias $(find $PWD/obj/$flavor/ -name '%{name}.ko')
46
done
47
48
r8168-kernel_version.patch
Changed
69
1
2
---
3
src/r8168.h | 4 ++++
4
- src/r8168_n.c | 2 +-
5
- 2 files changed, 5 insertions(+), 1 deletion(-)
6
+ src/r8168_n.c | 15 ++++++++++++++-
7
+ 2 files changed, 18 insertions(+), 1 deletion(-)
8
9
--- src/r8168.h
10
-+++ src/r8168.h 2020-02-10 11:32:37.788832833 +0000
11
++++ src/r8168.h 2021-01-25 09:25:12.615124741 +0000
12
@@ -116,6 +116,10 @@ do { \
13
} while (0)
14
#endif //LINUX_VERSION_CODE < KERNEL_VERSION(2,6,15)
15
16
#if defined(skb_vlan_tag_present) && !defined(vlan_tx_tag_present)
17
#define vlan_tx_tag_present skb_vlan_tag_present
18
--- src/r8168_n.c
19
-+++ src/r8168_n.c 2020-02-10 11:32:37.788832833 +0000
20
-@@ -28535,7 +28535,7 @@ process_pkt:
21
++++ src/r8168_n.c 2021-01-25 11:42:13.268115241 +0000
22
+@@ -60,11 +60,16 @@
23
+ #include <linux/rtnetlink.h>
24
+ #include <linux/completion.h>
25
+
26
++#ifndef HAS_PCI_ASPM_H
27
++#define HAS_PCI_ASPM_H @ASPM@
28
++#endif
29
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,26)
30
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(5,4,0)
31
++#if HAS_PCI_ASPM_H
32
+ #include <linux/pci-aspm.h>
33
+ #endif
34
+ #endif
35
++#endif
36
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(2,4,37)
37
+ #include <linux/prefetch.h>
38
+ #endif
39
+@@ -459,8 +464,12 @@ static void rtl8168_set_rx_mode(struct n
40
+ #if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)
41
+ static void rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue);
42
+ #else
43
++#if !HAS_PCI_ASPM_H
44
++static void rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue);
45
++#else
46
+ static void rtl8168_tx_timeout(struct net_device *dev);
47
+ #endif
48
++#endif
49
+ static struct net_device_stats *rtl8168_get_stats(struct net_device *dev);
50
+ static int rtl8168_rx_interrupt(struct net_device *, struct rtl8168_private *, napi_budget);
51
+ static int rtl8168_change_mtu(struct net_device *dev, int new_mtu);
52
+@@ -27948,8 +27957,12 @@ static void
53
+ rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue)
54
+ #else
55
+ static void
56
++#if !HAS_PCI_ASPM_H
57
++rtl8168_tx_timeout(struct net_device *dev, unsigned int txqueue)
58
++#else
59
+ rtl8168_tx_timeout(struct net_device *dev)
60
+ #endif
61
++#endif
62
+ {
63
+ struct rtl8168_private *tp = netdev_priv(dev);
64
+ unsigned long flags;
65
+@@ -28655,7 +28668,7 @@ process_pkt:
66
67
if (rtl8168_rx_vlan_skb(tp, desc, skb) < 0)
68
rtl8168_rx_skb(tp, skb);
69
r8168-8.048.03.tar.gz
Renamed
Refresh
r8168
x86_64
x86_64
x86_64
x86_64
x86_64
x86_64
i586
x86_64
Refresh
============================ rpmlint session starts ============================ rpmlint: 2.6.1 configuration: /opt/testing/lib64/python3.13/rpmlint/configdefaults.toml /opt/testing/share/rpmlint/cron-whitelist.toml /opt/testing/share/rpmlint/dbus-services.toml /opt/testing/share/rpmlint/device-files-whitelist.toml /opt/testing/share/rpmlint/licenses.toml /opt/testing/share/rpmlint/opensuse.toml /opt/testing/share/rpmlint/pam-modules.toml /opt/testing/share/rpmlint/permissions-whitelist.toml /opt/testing/share/rpmlint/pie-executables.toml /opt/testing/share/rpmlint/polkit-rules-whitelist.toml /opt/testing/share/rpmlint/scoring.toml /opt/testing/share/rpmlint/security.toml /opt/testing/share/rpmlint/sudoers-whitelist.toml /opt/testing/share/rpmlint/sysctl-whitelist.toml /opt/testing/share/rpmlint/systemd-tmpfiles.toml /opt/testing/share/rpmlint/users-groups.toml /opt/testing/share/rpmlint/world-writable-whitelist.toml /opt/testing/share/rpmlint/zypper-plugins.toml checks: 41, packages: 3 r8168-kmp-default.x86_64: E: suse-zypp-packageand packageand(kernel-default:r8168) The 'packageand(package1:package2)' syntax is obsolete, please use boolean dependencies like: 'Supplements: (package1 and package2)' r8168.spec: W: no-%check-section The spec file does not contain an %check section. Please check if the package has a testsuite and what it takes to enable the testsuite as part of the package build. If it is not possible to run it in the build environment (OBS/koji) or no testsuite exists, then please ignore this warning. You should not insert an empty %check section. Check time report (>1% & >0.1s): Check Duration (in s) Fraction (in %) Checked files ExtractRpm 0.3 86.9 TOTAL 0.4 100.0 3 packages and 0 specfiles checked; 1 errors, 1 warnings, 15 filtered, 1 badness; has taken 0.4 s
Login required, please
login
or
signup
in order to comment
Request History
bitstreamout created request about 4 years ago
- Now we change to github for basic download
- Configure existence of linux/pci-aspm.h on the fly
bitstreamout accepted request about 4 years ago
Does this work?