[arch-commits] Commit in r8168/repos (8 files)
mtorromeo at nymeria.archlinux.org
mtorromeo at nymeria.archlinux.org
Mon Jan 21 16:21:39 UTC 2013
Date: Monday, January 21, 2013 @ 17:21:39
Author: mtorromeo
Revision: 82607
Conflict resolved
Added:
r8168/repos/community-i686/PKGBUILD
(from rev 82606, r8168/trunk/PKGBUILD)
r8168/repos/community-i686/r8168.install
(from rev 82606, r8168/trunk/r8168.install)
r8168/repos/community-x86_64/PKGBUILD
(from rev 82606, r8168/trunk/PKGBUILD)
r8168/repos/community-x86_64/r8168.install
(from rev 82606, r8168/trunk/r8168.install)
Deleted:
r8168/repos/community-i686/PKGBUILD
r8168/repos/community-i686/r8168.install
r8168/repos/community-x86_64/PKGBUILD
r8168/repos/community-x86_64/r8168.install
--------------------------------+
community-i686/PKGBUILD | 90 +++++++++++++++++++--------------------
community-i686/r8168.install | 34 +++++++-------
community-x86_64/PKGBUILD | 90 +++++++++++++++++++--------------------
community-x86_64/r8168.install | 34 +++++++-------
4 files changed, 124 insertions(+), 124 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2013-01-21 15:34:34 UTC (rev 82606)
+++ community-i686/PKGBUILD 2013-01-21 16:21:39 UTC (rev 82607)
@@ -1,45 +0,0 @@
-# $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.034.00
-pkgrel=2
-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')
-source=(http://r8168.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
-install=$pkgname.install
-
-build() {
- _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -)
- KERNEL_RELEASE=$(cat /usr/lib/modules/extramodules-3.$_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_RELEASE/build \
- SUBDIRS="$srcdir/$pkgname-$pkgver/src" \
- EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \
- modules
-}
-
-package() {
- _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -)
- depends=("linux>=3.${_kernver}" "linux<3.$(expr ${_kernver} + 1)")
- KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version)
- msg "Kernel = $KERNEL_VERSION"
-
- cd "$pkgname-$pkgver"
- install -Dm644 src/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH/$pkgname.ko"
- find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-
- sed -i "s|extramodules-.*-ARCH|extramodules-3.$_kernver-ARCH|" "$startdir/$pkgname.install"
-}
-
-sha256sums=('97f3f342f9f24a3c3346641babde82f52f87b6ef5976c8f4481515f247116206')
Copied: r8168/repos/community-i686/PKGBUILD (from rev 82606, r8168/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2013-01-21 16:21:39 UTC (rev 82607)
@@ -0,0 +1,45 @@
+# $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.035.00
+pkgrel=2
+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')
+source=(http://r8168.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
+install=$pkgname.install
+
+build() {
+ _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -)
+ KERNEL_RELEASE=$(cat /usr/lib/modules/extramodules-3.$_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_RELEASE/build \
+ SUBDIRS="$srcdir/$pkgname-$pkgver/src" \
+ EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \
+ modules
+}
+
+package() {
+ _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -)
+ depends=("linux>=3.${_kernver}" "linux<3.$(expr ${_kernver} + 1)")
+ KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version)
+ msg "Kernel = $KERNEL_VERSION"
+
+ cd "$pkgname-$pkgver"
+ install -Dm644 src/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH/$pkgname.ko"
+ find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
+
+ sed -i "s|extramodules-.*-ARCH|extramodules-3.$_kernver-ARCH|" "$startdir/$pkgname.install"
+}
+
+sha256sums=('b904d31fc9bd6c97cc34479a0eba0e3a9bba5351a43b56dd5fff6b7dc1a5df73')
Deleted: community-i686/r8168.install
===================================================================
--- community-i686/r8168.install 2013-01-21 15:34:34 UTC (rev 82606)
+++ community-i686/r8168.install 2013-01-21 16:21:39 UTC (rev 82607)
@@ -1,17 +0,0 @@
-rebuild_module_dependencies() {
- EXTRAMODULES='extramodules-3.7-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-i686/r8168.install (from rev 82606, r8168/trunk/r8168.install)
===================================================================
--- community-i686/r8168.install (rev 0)
+++ community-i686/r8168.install 2013-01-21 16:21:39 UTC (rev 82607)
@@ -0,0 +1,17 @@
+rebuild_module_dependencies() {
+ EXTRAMODULES='extramodules-3.7-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
+}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2013-01-21 15:34:34 UTC (rev 82606)
+++ community-x86_64/PKGBUILD 2013-01-21 16:21:39 UTC (rev 82607)
@@ -1,45 +0,0 @@
-# $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.034.00
-pkgrel=2
-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')
-source=(http://r8168.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
-install=$pkgname.install
-
-build() {
- _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -)
- KERNEL_RELEASE=$(cat /usr/lib/modules/extramodules-3.$_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_RELEASE/build \
- SUBDIRS="$srcdir/$pkgname-$pkgver/src" \
- EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \
- modules
-}
-
-package() {
- _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -)
- depends=("linux>=3.${_kernver}" "linux<3.$(expr ${_kernver} + 1)")
- KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version)
- msg "Kernel = $KERNEL_VERSION"
-
- cd "$pkgname-$pkgver"
- install -Dm644 src/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH/$pkgname.ko"
- find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-
- sed -i "s|extramodules-.*-ARCH|extramodules-3.$_kernver-ARCH|" "$startdir/$pkgname.install"
-}
-
-sha256sums=('97f3f342f9f24a3c3346641babde82f52f87b6ef5976c8f4481515f247116206')
Copied: r8168/repos/community-x86_64/PKGBUILD (from rev 82606, r8168/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2013-01-21 16:21:39 UTC (rev 82607)
@@ -0,0 +1,45 @@
+# $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.035.00
+pkgrel=2
+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')
+source=(http://r8168.googlecode.com/files/$pkgname-$pkgver.tar.bz2)
+install=$pkgname.install
+
+build() {
+ _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -)
+ KERNEL_RELEASE=$(cat /usr/lib/modules/extramodules-3.$_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_RELEASE/build \
+ SUBDIRS="$srcdir/$pkgname-$pkgver/src" \
+ EXTRA_CFLAGS="-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN" \
+ modules
+}
+
+package() {
+ _kernver=$(pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -)
+ depends=("linux>=3.${_kernver}" "linux<3.$(expr ${_kernver} + 1)")
+ KERNEL_VERSION=$(cat /usr/lib/modules/extramodules-3.$_kernver-ARCH/version)
+ msg "Kernel = $KERNEL_VERSION"
+
+ cd "$pkgname-$pkgver"
+ install -Dm644 src/$pkgname.ko "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH/$pkgname.ko"
+ find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
+
+ sed -i "s|extramodules-.*-ARCH|extramodules-3.$_kernver-ARCH|" "$startdir/$pkgname.install"
+}
+
+sha256sums=('b904d31fc9bd6c97cc34479a0eba0e3a9bba5351a43b56dd5fff6b7dc1a5df73')
Deleted: community-x86_64/r8168.install
===================================================================
--- community-x86_64/r8168.install 2013-01-21 15:34:34 UTC (rev 82606)
+++ community-x86_64/r8168.install 2013-01-21 16:21:39 UTC (rev 82607)
@@ -1,17 +0,0 @@
-rebuild_module_dependencies() {
- EXTRAMODULES='extramodules-3.7-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-x86_64/r8168.install (from rev 82606, r8168/trunk/r8168.install)
===================================================================
--- community-x86_64/r8168.install (rev 0)
+++ community-x86_64/r8168.install 2013-01-21 16:21:39 UTC (rev 82607)
@@ -0,0 +1,17 @@
+rebuild_module_dependencies() {
+ EXTRAMODULES='extramodules-3.7-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