diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-21 14:44:37 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-21 14:44:37 -0300 |
commit | 9d6dd0a34cb8bd599c4d06c54dbd247ede60267f (patch) | |
tree | cc7662c9e2eda6f7e3b3b0fb3b7c094e4fa54d0b /community/open-vm-tools-modules | |
parent | fe0996f2e8716b772785a0bf93c6a3f2d5dc22ff (diff) | |
parent | 70b4878648fd376433739bd5c835503f6301a5b2 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/avifile/PKGBUILD
community/blackbox/PKGBUILD
community/blobby2/PKGBUILD
community/chmsee/PKGBUILD
community/extrema/PKGBUILD
community/floyd/PKGBUILD
community/gnash/PKGBUILD
community/gq/PKGBUILD
community/gsql/PKGBUILD
community/haddock/PKGBUILD
community/hashcash/PKGBUILD
community/kvpnc/PKGBUILD
community/uptimed/PKGBUILD
community/wol/PKGBUILD
core/jfsutils/PKGBUILD
core/reiserfsprogs/PKGBUILD
extra/gtk2/PKGBUILD
extra/libcroco/PKGBUILD
extra/libffado/PKGBUILD
extra/librsvg/PKGBUILD
extra/lua/PKGBUILD
extra/mesa/PKGBUILD
extra/valgrind/PKGBUILD
extra/xorg-server/PKGBUILD
libre/audacious-plugins-libre/PKGBUILD
libre/texlive-bin-libre/PKGBUILD
multilib/lib32-gtk2/PKGBUILD
multilib/lib32-mesa/PKGBUILD
multilib/wine/PKGBUILD
multilib/wine_gecko/PKGBUILD
Diffstat (limited to 'community/open-vm-tools-modules')
-rw-r--r-- | community/open-vm-tools-modules/PKGBUILD | 12 | ||||
-rw-r--r-- | community/open-vm-tools-modules/modprobe.conf | 2 | ||||
-rw-r--r-- | community/open-vm-tools-modules/open-vm-tools-modules.install | 12 |
3 files changed, 11 insertions, 15 deletions
diff --git a/community/open-vm-tools-modules/PKGBUILD b/community/open-vm-tools-modules/PKGBUILD index b940f264b..b374841e9 100644 --- a/community/open-vm-tools-modules/PKGBUILD +++ b/community/open-vm-tools-modules/PKGBUILD @@ -1,11 +1,11 @@ -# $Id: PKGBUILD 58321 2011-11-11 11:56:51Z spupykin $ +# $Id: PKGBUILD 58558 2011-11-14 12:47:57Z spupykin $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Krzysztof Raczkowski <raczkow@gmail.com> pkgname=open-vm-tools-modules pkgver=2011.10.26 _pkgsubver=514583 -pkgrel=2 +pkgrel=3 pkgdesc="kernel modules for the open source implementation of VMware Tools" arch=('i686' 'x86_64' 'mips64el') url="http://open-vm-tools.sourceforge.net/" @@ -14,8 +14,10 @@ makedepends=('libdnet' 'icu' 'uriparser' 'linux-headers') depends=("linux") install=$pkgname.install options=('!strip') -source=("http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz") -md5sums=('06f299375a91fbcba9d16b5007490023') +source=("http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz" + "modprobe.conf") +md5sums=('06f299375a91fbcba9d16b5007490023' + 'ac9b8e3cb798f5056ca92767ec705117') build() { _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -` @@ -40,4 +42,6 @@ package() { done sed -i -e "s/KERNEL_VERSION='.*'/KERNEL_VERSION='$KERNEL_VERSION'/" $startdir/$pkgname.install gzip $pkgdir/lib/modules/extramodules-3.${_kernver}-ARCH/*.ko + + install -D -m 644 ${srcdir}/modprobe.conf ${pkgdir}/etc/modprobe.d/${pkgname}.conf } diff --git a/community/open-vm-tools-modules/modprobe.conf b/community/open-vm-tools-modules/modprobe.conf new file mode 100644 index 000000000..b72fcc61a --- /dev/null +++ b/community/open-vm-tools-modules/modprobe.conf @@ -0,0 +1,2 @@ +#VMware net driver +install pcnet32 /sbin/modprobe -q --ignore-install vmxnet; /sbin/modprobe -q --ignore-install pcnet32 ; /bin/true; diff --git a/community/open-vm-tools-modules/open-vm-tools-modules.install b/community/open-vm-tools-modules/open-vm-tools-modules.install index cdd13e929..187dfb1bb 100644 --- a/community/open-vm-tools-modules/open-vm-tools-modules.install +++ b/community/open-vm-tools-modules/open-vm-tools-modules.install @@ -3,15 +3,8 @@ KERNEL_VERSION='3.1.0-4-ARCH' post_install() { depmod -a -v $KERNEL_VERSION > /dev/null 2>&1 - VMXNET="install pcnet32 /sbin/modprobe -q --ignore-install vmxnet;" - VMXNET="$VMXNET /sbin/modprobe -q --ignore-install pcnet32 $CMDLINE_OPTS;" - VMXNET="$VMXNET /bin/true;" - - echo ">>> Enabling vmxnet driver in /etc/modprobe.d/modprobe.conf" + echo ">>> Enabling vmxnet driver in /etc/modprobe.d/open-vm-tools-modules.conf" echo ">>> (this will disable pcnet32 driver)" - sed "$ a \\\n#VMware net driver\n$VMXNET" -i /etc/modprobe.d/modprobe.conf - echo - echo ">>>" echo ">>> If vmxnet driver doesn't handle your NIC, you have to manually" echo ">>> disable loading of pcnet32 driver" @@ -25,9 +18,6 @@ post_upgrade() { post_remove() { depmod -a -v $KERNEL_VERSION > /dev/null 2>&1 - echo ">>> Disabling vmxnet driver in /etc/modprobe.d/modprobe.conf" - sed "/VMware net driver/,+1 d" -i /etc/modprobe.d/modprobe.conf - echo ">>>" echo ">>> Remember to un-blacklist pcnet32 driver" echo ">>>" |