Date: Monday, January 28, 2013 @ 14:41:47 Author: tpowa Revision: 83220
archrelease: copy trunk to community-testing-i686, community-testing-x86_64 Added: open-vm-tools-modules/repos/community-testing-i686/ open-vm-tools-modules/repos/community-testing-i686/PKGBUILD (from rev 83219, open-vm-tools-modules/trunk/PKGBUILD) open-vm-tools-modules/repos/community-testing-i686/linux-3.6-build-fix.patch (from rev 83219, open-vm-tools-modules/trunk/linux-3.6-build-fix.patch) open-vm-tools-modules/repos/community-testing-i686/modprobe.conf (from rev 83219, open-vm-tools-modules/trunk/modprobe.conf) open-vm-tools-modules/repos/community-testing-i686/open-vm-tools-modules.install (from rev 83219, open-vm-tools-modules/trunk/open-vm-tools-modules.install) open-vm-tools-modules/repos/community-testing-x86_64/ open-vm-tools-modules/repos/community-testing-x86_64/PKGBUILD (from rev 83219, open-vm-tools-modules/trunk/PKGBUILD) open-vm-tools-modules/repos/community-testing-x86_64/linux-3.6-build-fix.patch (from rev 83219, open-vm-tools-modules/trunk/linux-3.6-build-fix.patch) open-vm-tools-modules/repos/community-testing-x86_64/modprobe.conf (from rev 83219, open-vm-tools-modules/trunk/modprobe.conf) open-vm-tools-modules/repos/community-testing-x86_64/open-vm-tools-modules.install (from rev 83219, open-vm-tools-modules/trunk/open-vm-tools-modules.install) --------------------------------------------------------+ community-testing-i686/PKGBUILD | 58 +++++++++++++ community-testing-i686/linux-3.6-build-fix.patch | 63 +++++++++++++++ community-testing-i686/modprobe.conf | 1 community-testing-i686/open-vm-tools-modules.install | 23 +++++ community-testing-x86_64/PKGBUILD | 58 +++++++++++++ community-testing-x86_64/linux-3.6-build-fix.patch | 63 +++++++++++++++ community-testing-x86_64/modprobe.conf | 1 community-testing-x86_64/open-vm-tools-modules.install | 23 +++++ 8 files changed, 290 insertions(+) Copied: open-vm-tools-modules/repos/community-testing-i686/PKGBUILD (from rev 83219, open-vm-tools-modules/trunk/PKGBUILD) =================================================================== --- community-testing-i686/PKGBUILD (rev 0) +++ community-testing-i686/PKGBUILD 2013-01-28 13:41:47 UTC (rev 83220) @@ -0,0 +1,58 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Krzysztof Raczkowski <racz...@gmail.com> + +pkgname=open-vm-tools-modules +epoch=1 +pkgver=9.2.2 +_pkgsubver=893683 +pkgrel=3 +pkgdesc="kernel modules for the open source implementation of VMware Tools" +arch=('i686' 'x86_64') +url="http://open-vm-tools.sourceforge.net/" +license=('GPL') +makedepends=('libdnet' 'icu' 'uriparser' 'linux-headers') +depends=("linux") +install=$pkgname.install +options=('!strip' '!makeflags') +source=("http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz" + "modprobe.conf" + "linux-3.6-build-fix.patch") +md5sums=('7af505681d736d4c9ee6493b1166689f' + 'bc5518489077e91655489bd04b868584' + 'd9ffaf628837ea6a216b96dac69705e6') + +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 "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}" + + sed -i 's|proc-3.2.8|procps|g' configure +# patch -p1 <$srcdir/linux-3.6-build-fix.patch + + [ $NOEXTRACT -eq 1 ] || ./configure \ + --prefix=/usr \ + --without-x \ + --with-linuxdir=/usr/lib/modules/$KERNEL_RELEASE + + make -C modules 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 "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}" + mkdir -p $pkgdir/usr/lib/modules/extramodules-3.${_kernver}-ARCH/ + + find -type f -name '*.ko' \ + -exec install -t "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH" {} + + + gzip "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH"/*.ko + + install -D -m 644 ${srcdir}/modprobe.conf ${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf + sed -i "s|extramodules-.*-ARCH|extramodules-3.${_kernver}-ARCH|" $startdir/$pkgname.install +} Copied: open-vm-tools-modules/repos/community-testing-i686/linux-3.6-build-fix.patch (from rev 83219, open-vm-tools-modules/trunk/linux-3.6-build-fix.patch) =================================================================== --- community-testing-i686/linux-3.6-build-fix.patch (rev 0) +++ community-testing-i686/linux-3.6-build-fix.patch 2013-01-28 13:41:47 UTC (rev 83220) @@ -0,0 +1,63 @@ +diff -wbBur open-vm-tools-2012.05.21-724730.org/modules/linux/vmhgfs/inode.c open-vm-tools-2012.05.21-724730/modules/linux/vmhgfs/inode.c +--- open-vm-tools-2012.05.21-724730.org/modules/linux/vmhgfs/inode.c 2012-05-23 00:12:52.000000000 +0400 ++++ open-vm-tools-2012.05.21-724730/modules/linux/vmhgfs/inode.c 2012-10-02 15:39:47.000000000 +0400 +@@ -1801,7 +1802,7 @@ + #else + if (mask & MAY_ACCESS) { /* For sys_access. */ + #endif +- struct list_head *pos; ++ struct hlist_node *pos; + int dcount = 0; + struct dentry *dentry = NULL; + +@@ -1817,7 +1818,7 @@ + #endif + + /* Find a dentry with valid d_count. Refer bug 587789. */ +- list_for_each(pos, &inode->i_dentry) { ++ list_for_each(pos, inode->i_dentry.first) { + dentry = list_entry(pos, struct dentry, d_alias); + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38) + dcount = atomic_read(&dentry->d_count); +diff -wbBur open-vm-tools-2012.05.21-724730.org/modules/linux/vmhgfs/page.c open-vm-tools-2012.05.21-724730/modules/linux/vmhgfs/page.c +--- open-vm-tools-2012.05.21-724730.org/modules/linux/vmhgfs/page.c 2012-05-23 00:12:52.000000000 +0400 ++++ open-vm-tools-2012.05.21-724730/modules/linux/vmhgfs/page.c 2012-10-02 15:41:38.000000000 +0400 +@@ -893,7 +893,7 @@ + */ + if ((offset >= currentFileSize) || + ((pageFrom == 0) && (offset + pageTo) >= currentFileSize)) { +- void *kaddr = kmap_atomic(page, KM_USER0); ++ void *kaddr = kmap_atomic(page); + + if (pageFrom) { + memset(kaddr, 0, pageFrom); +@@ -901,7 +901,7 @@ + if (pageTo < PAGE_CACHE_SIZE) { + memset(kaddr + pageTo, 0, PAGE_CACHE_SIZE - pageTo); + } +- kunmap_atomic(kaddr, KM_USER0); ++ kunmap_atomic(kaddr); + flush_dcache_page(page); + } + } +diff -wbBur open-vm-tools-2012.05.21-724730.org/modules/linux/vmsync/sync.c open-vm-tools-2012.05.21-724730/modules/linux/vmsync/sync.c +--- open-vm-tools-2012.05.21-724730.org/modules/linux/vmsync/sync.c 2012-05-23 00:12:52.000000000 +0400 ++++ open-vm-tools-2012.05.21-724730/modules/linux/vmsync/sync.c 2012-10-02 15:23:56.000000000 +0400 +@@ -162,7 +162,7 @@ + cancel_delayed_work(&state->thawTask); + list_for_each_safe(cur, tmp, &state->devices) { + dev = list_entry(cur, VmSyncBlockDevice, list); +- if (dev->sb != NULL && dev->sb->s_frozen != SB_UNFROZEN) { ++ if (dev->sb != NULL && dev->sb->s_writers.frozen != SB_UNFROZEN) { + thaw_bdev(dev->bdev, dev->sb); + atomic_dec(&gFreezeCount); + } +@@ -237,7 +237,7 @@ + * the superblock is already frozen. + */ + if (inode->i_sb->s_bdev == NULL || +- inode->i_sb->s_frozen != SB_UNFROZEN) { ++ inode->i_sb->s_writers.frozen != SB_UNFROZEN) { + result = (inode->i_sb->s_bdev == NULL) ? -EINVAL : -EALREADY; + compat_path_release(&nd); + goto exit; Copied: open-vm-tools-modules/repos/community-testing-i686/modprobe.conf (from rev 83219, open-vm-tools-modules/trunk/modprobe.conf) =================================================================== --- community-testing-i686/modprobe.conf (rev 0) +++ community-testing-i686/modprobe.conf 2013-01-28 13:41:47 UTC (rev 83220) @@ -0,0 +1 @@ +softdep pcnet32 pre: vmxnet Copied: open-vm-tools-modules/repos/community-testing-i686/open-vm-tools-modules.install (from rev 83219, open-vm-tools-modules/trunk/open-vm-tools-modules.install) =================================================================== --- community-testing-i686/open-vm-tools-modules.install (rev 0) +++ community-testing-i686/open-vm-tools-modules.install 2013-01-28 13:41:47 UTC (rev 83220) @@ -0,0 +1,23 @@ +post_install() { + EXTRAMODULES='extramodules-3.7-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo ">>> Enabling vmxnet driver in /usr/lib/modprobe.d/open-vm-tools-modules.conf" + echo ">>> (this will disable pcnet32 driver)" + echo ">>>" + echo ">>> If vmxnet driver doesn't handle your NIC, you have to manually" + echo ">>> disable loading of pcnet32 driver" + echo ">>>" +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.7-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + EXTRAMODULES='extramodules-3.7-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo ">>>" + echo ">>> Remember to un-blacklist pcnet32 driver" + echo ">>>" +} Copied: open-vm-tools-modules/repos/community-testing-x86_64/PKGBUILD (from rev 83219, open-vm-tools-modules/trunk/PKGBUILD) =================================================================== --- community-testing-x86_64/PKGBUILD (rev 0) +++ community-testing-x86_64/PKGBUILD 2013-01-28 13:41:47 UTC (rev 83220) @@ -0,0 +1,58 @@ +# $Id$ +# Maintainer: Sergej Pupykin <pupykin.s+a...@gmail.com> +# Contributor: Krzysztof Raczkowski <racz...@gmail.com> + +pkgname=open-vm-tools-modules +epoch=1 +pkgver=9.2.2 +_pkgsubver=893683 +pkgrel=3 +pkgdesc="kernel modules for the open source implementation of VMware Tools" +arch=('i686' 'x86_64') +url="http://open-vm-tools.sourceforge.net/" +license=('GPL') +makedepends=('libdnet' 'icu' 'uriparser' 'linux-headers') +depends=("linux") +install=$pkgname.install +options=('!strip' '!makeflags') +source=("http://downloads.sourceforge.net/open-vm-tools/open-vm-tools-$pkgver-${_pkgsubver}.tar.gz" + "modprobe.conf" + "linux-3.6-build-fix.patch") +md5sums=('7af505681d736d4c9ee6493b1166689f' + 'bc5518489077e91655489bd04b868584' + 'd9ffaf628837ea6a216b96dac69705e6') + +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 "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}" + + sed -i 's|proc-3.2.8|procps|g' configure +# patch -p1 <$srcdir/linux-3.6-build-fix.patch + + [ $NOEXTRACT -eq 1 ] || ./configure \ + --prefix=/usr \ + --without-x \ + --with-linuxdir=/usr/lib/modules/$KERNEL_RELEASE + + make -C modules 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 "$srcdir/open-vm-tools-${pkgver}-${_pkgsubver}" + mkdir -p $pkgdir/usr/lib/modules/extramodules-3.${_kernver}-ARCH/ + + find -type f -name '*.ko' \ + -exec install -t "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH" {} + + + gzip "$pkgdir/usr/lib/modules/extramodules-3.$_kernver-ARCH"/*.ko + + install -D -m 644 ${srcdir}/modprobe.conf ${pkgdir}/usr/lib/modprobe.d/${pkgname}.conf + sed -i "s|extramodules-.*-ARCH|extramodules-3.${_kernver}-ARCH|" $startdir/$pkgname.install +} Copied: open-vm-tools-modules/repos/community-testing-x86_64/linux-3.6-build-fix.patch (from rev 83219, open-vm-tools-modules/trunk/linux-3.6-build-fix.patch) =================================================================== --- community-testing-x86_64/linux-3.6-build-fix.patch (rev 0) +++ community-testing-x86_64/linux-3.6-build-fix.patch 2013-01-28 13:41:47 UTC (rev 83220) @@ -0,0 +1,63 @@ +diff -wbBur open-vm-tools-2012.05.21-724730.org/modules/linux/vmhgfs/inode.c open-vm-tools-2012.05.21-724730/modules/linux/vmhgfs/inode.c +--- open-vm-tools-2012.05.21-724730.org/modules/linux/vmhgfs/inode.c 2012-05-23 00:12:52.000000000 +0400 ++++ open-vm-tools-2012.05.21-724730/modules/linux/vmhgfs/inode.c 2012-10-02 15:39:47.000000000 +0400 +@@ -1801,7 +1802,7 @@ + #else + if (mask & MAY_ACCESS) { /* For sys_access. */ + #endif +- struct list_head *pos; ++ struct hlist_node *pos; + int dcount = 0; + struct dentry *dentry = NULL; + +@@ -1817,7 +1818,7 @@ + #endif + + /* Find a dentry with valid d_count. Refer bug 587789. */ +- list_for_each(pos, &inode->i_dentry) { ++ list_for_each(pos, inode->i_dentry.first) { + dentry = list_entry(pos, struct dentry, d_alias); + #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 38) + dcount = atomic_read(&dentry->d_count); +diff -wbBur open-vm-tools-2012.05.21-724730.org/modules/linux/vmhgfs/page.c open-vm-tools-2012.05.21-724730/modules/linux/vmhgfs/page.c +--- open-vm-tools-2012.05.21-724730.org/modules/linux/vmhgfs/page.c 2012-05-23 00:12:52.000000000 +0400 ++++ open-vm-tools-2012.05.21-724730/modules/linux/vmhgfs/page.c 2012-10-02 15:41:38.000000000 +0400 +@@ -893,7 +893,7 @@ + */ + if ((offset >= currentFileSize) || + ((pageFrom == 0) && (offset + pageTo) >= currentFileSize)) { +- void *kaddr = kmap_atomic(page, KM_USER0); ++ void *kaddr = kmap_atomic(page); + + if (pageFrom) { + memset(kaddr, 0, pageFrom); +@@ -901,7 +901,7 @@ + if (pageTo < PAGE_CACHE_SIZE) { + memset(kaddr + pageTo, 0, PAGE_CACHE_SIZE - pageTo); + } +- kunmap_atomic(kaddr, KM_USER0); ++ kunmap_atomic(kaddr); + flush_dcache_page(page); + } + } +diff -wbBur open-vm-tools-2012.05.21-724730.org/modules/linux/vmsync/sync.c open-vm-tools-2012.05.21-724730/modules/linux/vmsync/sync.c +--- open-vm-tools-2012.05.21-724730.org/modules/linux/vmsync/sync.c 2012-05-23 00:12:52.000000000 +0400 ++++ open-vm-tools-2012.05.21-724730/modules/linux/vmsync/sync.c 2012-10-02 15:23:56.000000000 +0400 +@@ -162,7 +162,7 @@ + cancel_delayed_work(&state->thawTask); + list_for_each_safe(cur, tmp, &state->devices) { + dev = list_entry(cur, VmSyncBlockDevice, list); +- if (dev->sb != NULL && dev->sb->s_frozen != SB_UNFROZEN) { ++ if (dev->sb != NULL && dev->sb->s_writers.frozen != SB_UNFROZEN) { + thaw_bdev(dev->bdev, dev->sb); + atomic_dec(&gFreezeCount); + } +@@ -237,7 +237,7 @@ + * the superblock is already frozen. + */ + if (inode->i_sb->s_bdev == NULL || +- inode->i_sb->s_frozen != SB_UNFROZEN) { ++ inode->i_sb->s_writers.frozen != SB_UNFROZEN) { + result = (inode->i_sb->s_bdev == NULL) ? -EINVAL : -EALREADY; + compat_path_release(&nd); + goto exit; Copied: open-vm-tools-modules/repos/community-testing-x86_64/modprobe.conf (from rev 83219, open-vm-tools-modules/trunk/modprobe.conf) =================================================================== --- community-testing-x86_64/modprobe.conf (rev 0) +++ community-testing-x86_64/modprobe.conf 2013-01-28 13:41:47 UTC (rev 83220) @@ -0,0 +1 @@ +softdep pcnet32 pre: vmxnet Copied: open-vm-tools-modules/repos/community-testing-x86_64/open-vm-tools-modules.install (from rev 83219, open-vm-tools-modules/trunk/open-vm-tools-modules.install) =================================================================== --- community-testing-x86_64/open-vm-tools-modules.install (rev 0) +++ community-testing-x86_64/open-vm-tools-modules.install 2013-01-28 13:41:47 UTC (rev 83220) @@ -0,0 +1,23 @@ +post_install() { + EXTRAMODULES='extramodules-3.7-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo ">>> Enabling vmxnet driver in /usr/lib/modprobe.d/open-vm-tools-modules.conf" + echo ">>> (this will disable pcnet32 driver)" + echo ">>>" + echo ">>> If vmxnet driver doesn't handle your NIC, you have to manually" + echo ">>> disable loading of pcnet32 driver" + echo ">>>" +} + +post_upgrade() { + EXTRAMODULES='extramodules-3.7-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) +} + +post_remove() { + EXTRAMODULES='extramodules-3.7-ARCH' + depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) + echo ">>>" + echo ">>> Remember to un-blacklist pcnet32 driver" + echo ">>>" +}