[arch-commits] Commit in r8168/repos (8 files)
Massimiliano Torromeo
mtorromeo at archlinux.org
Mon Apr 13 09:17:40 UTC 2015
Date: Monday, April 13, 2015 @ 11:17:39
Author: mtorromeo
Revision: 131288
archrelease: copy trunk to community-testing-i686, community-testing-x86_64
Added:
r8168/repos/community-testing-i686/
r8168/repos/community-testing-i686/PKGBUILD
(from rev 131287, r8168/trunk/PKGBUILD)
r8168/repos/community-testing-i686/linux40.patch
(from rev 131287, r8168/trunk/linux40.patch)
r8168/repos/community-testing-i686/r8168.install
(from rev 131287, r8168/trunk/r8168.install)
r8168/repos/community-testing-x86_64/
r8168/repos/community-testing-x86_64/PKGBUILD
(from rev 131287, r8168/trunk/PKGBUILD)
r8168/repos/community-testing-x86_64/linux40.patch
(from rev 131287, r8168/trunk/linux40.patch)
r8168/repos/community-testing-x86_64/r8168.install
(from rev 131287, r8168/trunk/r8168.install)
----------------------------------------+
community-testing-i686/PKGBUILD | 51 +++++++++++++++++++++++++++++++
community-testing-i686/linux40.patch | 14 ++++++++
community-testing-i686/r8168.install | 17 ++++++++++
community-testing-x86_64/PKGBUILD | 51 +++++++++++++++++++++++++++++++
community-testing-x86_64/linux40.patch | 14 ++++++++
community-testing-x86_64/r8168.install | 17 ++++++++++
6 files changed, 164 insertions(+)
Copied: r8168/repos/community-testing-i686/PKGBUILD (from rev 131287, r8168/trunk/PKGBUILD)
===================================================================
--- community-testing-i686/PKGBUILD (rev 0)
+++ community-testing-i686/PKGBUILD 2015-04-13 09:17:39 UTC (rev 131288)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Contributor: Bob Fanger < bfanger(at)gmail >
+# Contributor: Filip <fila pruda com>, Det < nimetonmaili(at)gmail >
+
+pkgname=r8168
+pkgver=8.039.00
+pkgrel=15
+pkgdesc="A kernel module for Realtek 8168 network cards"
+url="http://www.realtek.com.tw"
+license=("GPL")
+arch=('i686' 'x86_64')
+depends=('glibc' 'linux')
+makedepends=('linux-headers')
+install=$pkgname.install
+source=(https://r8168dl.appspot.com/files/$pkgname-$pkgver.tar.bz2
+ linux40.patch)
+sha256sums=('767d922270274e781d8d42493a0021db1cafcb0388ac62564d0c0c3d82703edd'
+ 'e6087439b30c8f6c26113c182dd1f95044d918241b1c281b6e84b9a334e68910')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch -p1 -i "$srcdir"/linux40.patch
+}
+
+build() {
+ _kernver=$(pacman -Q linux | sed -r 's#.* ([0-9]+\.[0-9]+).*#\1#')
+ KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-$_kernver-ARCH/version)
+
+ cd "$pkgname-$pkgver"
+
+ # avoid using the Makefile directly -- it doesn't understand
+ # any kernel but the current.
+ make -C /usr/lib/modules/$KERNEL_VERSION/build \
+ SUBDIRS="$srcdir/$pkgname-$pkgver/src" \
+ EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \
+ modules
+}
+
+package() {
+ _kernver=$(pacman -Q linux | sed -r 's#.* ([0-9]+\.[0-9]+).*#\1#')
+ depends=("linux>=$_kernver" "linux<${_kernver/.*}.$(expr ${_kernver/*.} + 1)")
+ KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-$_kernver-ARCH/version)
+ msg "Kernel = $KERNEL_VERSION"
+
+ cd "$pkgname-$pkgver"
+ install -Dm644 src/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-$_kernver-ARCH/$pkgname.ko"
+ find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
+
+ sed -i "s|extramodules-.*-ARCH|extramodules-$_kernver-ARCH|" "$startdir/$pkgname.install"
+}
Copied: r8168/repos/community-testing-i686/linux40.patch (from rev 131287, r8168/trunk/linux40.patch)
===================================================================
--- community-testing-i686/linux40.patch (rev 0)
+++ community-testing-i686/linux40.patch 2015-04-13 09:17:39 UTC (rev 131288)
@@ -0,0 +1,14 @@
+diff --git a/src/r8168_n.c b/src/r8168_n.c
+index 9d6f231..c4200d0 100755
+--- a/src/r8168_n.c
++++ b/src/r8168_n.c
+@@ -3291,6 +3291,9 @@ rtl8168_tx_vlan_tag(struct rtl8168_private *tp,
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
+ tag = (tp->vlgrp && vlan_tx_tag_present(skb)) ?
+ TxVlanTag | swab16(vlan_tx_tag_get(skb)) : 0x00;
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
++ tag = (skb_vlan_tag_present(skb)) ?
++ TxVlanTag | swab16(skb_vlan_tag_get(skb)) : 0x00;
+ #else
+ tag = (vlan_tx_tag_present(skb)) ?
+ TxVlanTag | swab16(vlan_tx_tag_get(skb)) : 0x00;
Copied: r8168/repos/community-testing-i686/r8168.install (from rev 131287, r8168/trunk/r8168.install)
===================================================================
--- community-testing-i686/r8168.install (rev 0)
+++ community-testing-i686/r8168.install 2015-04-13 09:17:39 UTC (rev 131288)
@@ -0,0 +1,17 @@
+rebuild_module_dependencies() {
+ EXTRAMODULES='extramodules-4.0-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_install() {
+ rebuild_module_dependencies
+ echo '>>> The module r8168 conflicts with r8169. You can blacklist it with:'
+ echo '>>> `echo "blacklist r8169" > /etc/modprobe.d/r8169_blacklist.conf`'
+}
+post_upgrade() {
+ rebuild_module_dependencies
+}
+
+post_remove() {
+ rebuild_module_dependencies
+}
Copied: r8168/repos/community-testing-x86_64/PKGBUILD (from rev 131287, r8168/trunk/PKGBUILD)
===================================================================
--- community-testing-x86_64/PKGBUILD (rev 0)
+++ community-testing-x86_64/PKGBUILD 2015-04-13 09:17:39 UTC (rev 131288)
@@ -0,0 +1,51 @@
+# $Id$
+# Maintainer: Massimiliano Torromeo <massimiliano.torromeo at gmail.com>
+# Contributor: Bob Fanger < bfanger(at)gmail >
+# Contributor: Filip <fila pruda com>, Det < nimetonmaili(at)gmail >
+
+pkgname=r8168
+pkgver=8.039.00
+pkgrel=15
+pkgdesc="A kernel module for Realtek 8168 network cards"
+url="http://www.realtek.com.tw"
+license=("GPL")
+arch=('i686' 'x86_64')
+depends=('glibc' 'linux')
+makedepends=('linux-headers')
+install=$pkgname.install
+source=(https://r8168dl.appspot.com/files/$pkgname-$pkgver.tar.bz2
+ linux40.patch)
+sha256sums=('767d922270274e781d8d42493a0021db1cafcb0388ac62564d0c0c3d82703edd'
+ 'e6087439b30c8f6c26113c182dd1f95044d918241b1c281b6e84b9a334e68910')
+
+prepare() {
+ cd "$pkgname-$pkgver"
+ patch -p1 -i "$srcdir"/linux40.patch
+}
+
+build() {
+ _kernver=$(pacman -Q linux | sed -r 's#.* ([0-9]+\.[0-9]+).*#\1#')
+ KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-$_kernver-ARCH/version)
+
+ cd "$pkgname-$pkgver"
+
+ # avoid using the Makefile directly -- it doesn't understand
+ # any kernel but the current.
+ make -C /usr/lib/modules/$KERNEL_VERSION/build \
+ SUBDIRS="$srcdir/$pkgname-$pkgver/src" \
+ EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \
+ modules
+}
+
+package() {
+ _kernver=$(pacman -Q linux | sed -r 's#.* ([0-9]+\.[0-9]+).*#\1#')
+ depends=("linux>=$_kernver" "linux<${_kernver/.*}.$(expr ${_kernver/*.} + 1)")
+ KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-$_kernver-ARCH/version)
+ msg "Kernel = $KERNEL_VERSION"
+
+ cd "$pkgname-$pkgver"
+ install -Dm644 src/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-$_kernver-ARCH/$pkgname.ko"
+ find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
+
+ sed -i "s|extramodules-.*-ARCH|extramodules-$_kernver-ARCH|" "$startdir/$pkgname.install"
+}
Copied: r8168/repos/community-testing-x86_64/linux40.patch (from rev 131287, r8168/trunk/linux40.patch)
===================================================================
--- community-testing-x86_64/linux40.patch (rev 0)
+++ community-testing-x86_64/linux40.patch 2015-04-13 09:17:39 UTC (rev 131288)
@@ -0,0 +1,14 @@
+diff --git a/src/r8168_n.c b/src/r8168_n.c
+index 9d6f231..c4200d0 100755
+--- a/src/r8168_n.c
++++ b/src/r8168_n.c
+@@ -3291,6 +3291,9 @@ rtl8168_tx_vlan_tag(struct rtl8168_private *tp,
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0)
+ tag = (tp->vlgrp && vlan_tx_tag_present(skb)) ?
+ TxVlanTag | swab16(vlan_tx_tag_get(skb)) : 0x00;
++#elif LINUX_VERSION_CODE >= KERNEL_VERSION(4,0,0)
++ tag = (skb_vlan_tag_present(skb)) ?
++ TxVlanTag | swab16(skb_vlan_tag_get(skb)) : 0x00;
+ #else
+ tag = (vlan_tx_tag_present(skb)) ?
+ TxVlanTag | swab16(vlan_tx_tag_get(skb)) : 0x00;
Copied: r8168/repos/community-testing-x86_64/r8168.install (from rev 131287, r8168/trunk/r8168.install)
===================================================================
--- community-testing-x86_64/r8168.install (rev 0)
+++ community-testing-x86_64/r8168.install 2015-04-13 09:17:39 UTC (rev 131288)
@@ -0,0 +1,17 @@
+rebuild_module_dependencies() {
+ EXTRAMODULES='extramodules-4.0-ARCH'
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_install() {
+ rebuild_module_dependencies
+ echo '>>> The module r8168 conflicts with r8169. You can blacklist it with:'
+ echo '>>> `echo "blacklist r8169" > /etc/modprobe.d/r8169_blacklist.conf`'
+}
+post_upgrade() {
+ rebuild_module_dependencies
+}
+
+post_remove() {
+ rebuild_module_dependencies
+}
More information about the arch-commits
mailing list