aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--main/open-vm-tools-vserver/APKBUILD96
-rw-r--r--main/open-vm-tools-vserver/linux-3.6-build-fix.patch63
-rw-r--r--main/open-vm-tools-vserver/vmware-modules.initd25
3 files changed, 0 insertions, 184 deletions
diff --git a/main/open-vm-tools-vserver/APKBUILD b/main/open-vm-tools-vserver/APKBUILD
deleted file mode 100644
index f7ff31ceab..0000000000
--- a/main/open-vm-tools-vserver/APKBUILD
+++ /dev/null
@@ -1,96 +0,0 @@
-# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
-
-_flavor=vserver
-_realname=open-vm-tools
-_name=$_realname-$_flavor
-_kpkg=linux-$_flavor
-_kver=3.6.11
-_kpkgrel=3
-_myvsver=vs2.3.4.6
-_mypkgrel=0
-
-_realver=9.2.0_p799703
-_ver=${_realver/_p/-}
-
-# source open-vm-tools version
-if [ -f ../main/$_realname/APKBUILD ]; then
- . ../main/$_realname/APKBUILD
- pkgname=$_realname-$_flavor
- [ "${_realver}" != "$pkgver" ] && die "please set _realver to $pkgver"
-fi
-
-# source the kernel version
-if [ -f ../linux-${_flavor}/APKBUILD ]; then
- . ../linux-${_flavor}/APKBUILD
- pkgname=$_realname-$_flavor
- [ "$_kver" != "$pkgver" ] && die "$_name: please set _kver to $pkgver"
- [ "$_kpkgrel" != "$pkgrel" ] && die "$_name: please set _kpkgrel to $pkgrel"
- [ "$_myvsver" != "$_vsver" ] && die "$_name: please set _myvsver to $_vsver"
-fi
-
-_abi_release=${_kver}-$_vsver
-_kernelver="$_kver-r$_kpkgrel"
-
-pkgname="$_realname-$_flavor"
-pkgver=$_kver
-pkgrel=$(($_kpkgrel + $_mypkgrel))
-
-pkgdesc="The Open Virtual Machine Tools are the open source implementation of VMware Tools."
-url="http://open-vm-tools.sourceforge.net/"
-arch="all"
-license="LGPL"
-subpackages=""
-depends="linux-${_flavor}=${_kernelver}"
-depends_dev="bash glib-dev gettext-dev linux-${_flavor}-dev=${_kernelver}"
-makedepends="$depends_dev"
-source="http://downloads.sourceforge.net/project/open-vm-tools/open-vm-tools/stable-${_realver%.*}.x/open-vm-tools-${_ver}.tar.gz
- linux-3.6-build-fix.patch
- vmware-modules.initd
- "
-install_if="linux-${_flavor}=${_kernelver} open-vm-tools"
-
-_builddir="$srcdir/$_realname-$_ver"
-
-prepare() {
- cd "$_builddir"
- for i in $source; do
- case $i in
- *.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
- esac
- done
-}
-
-build() {
- export GCC_SPECS=/usr/share/gcc/hardenednopie.specs
- cd "$_builddir"
- ./configure --without-pam \
- --without-x \
- --without-dnet \
- --without-icu \
- --without-procps \
- --with-kernel-release="${_abi_release}" \
- || return 1
- cd "$_builddir"/modules
- make -j1 modules || return 1
-}
-
-package() {
- cd "$_builddir"
- install -D -m755 "$srcdir"/vmware-modules.initd \
- "$pkgdir"/etc/init.d/vmware-modules-${_flavor} || return 1
- mkdir -p $pkgdir/lib/modules/"${_abi_release}"/misc/
- cd "$_builddir"/modules
- for module in `find -type f -name '*.ko'`; do
- install -D -m644 $module "$pkgdir/lib/modules/"${_abi_release}"/misc/"
- done
-}
-
-md5sums="37341978a00a1568b898a8ce024f9da9 open-vm-tools-9.2.0-799703.tar.gz
-d9ffaf628837ea6a216b96dac69705e6 linux-3.6-build-fix.patch
-afba2c3487d0b12cee80eb2f04b05ba1 vmware-modules.initd"
-sha256sums="06f80b220c52d2438a7ef5628fb05eb7130a2f1e758ee6399d2e96ea54bd8c52 open-vm-tools-9.2.0-799703.tar.gz
-9e5a3d20799e3bebef0d46502509c6204fcd7c3a36ad40eb3c8194a408dfcaed linux-3.6-build-fix.patch
-6ceb5c75b002991c511d9dadb6cf91720771e76b701e5f2d91ac9ede4b168265 vmware-modules.initd"
-sha512sums="34b540ee0fee41ff636113ea7346c907b4fbce5c8c34fcda0f38f711bc2ef1adab8e508c75a413d737b7c882bb401aed1711e04aed01e93eb30875491dbf8680 open-vm-tools-9.2.0-799703.tar.gz
-6e9215e6e11343186473202930e1d4659fd906c5933167fbf9892b496e3c20abe2f4a2ba7165cddd6849a2458866623bf3eb1d2f8790778fd8e9fdf1a34648d5 linux-3.6-build-fix.patch
-639098221975cadaed0ae0f32454a6718ceaa5f43f17d949a84a85dee56fbf5f9e6248899c10a46b12c9c9cf28b837d83a37c25aba62b11cb7849a1cf8d32e1e vmware-modules.initd"
diff --git a/main/open-vm-tools-vserver/linux-3.6-build-fix.patch b/main/open-vm-tools-vserver/linux-3.6-build-fix.patch
deleted file mode 100644
index f012a3ff1c..0000000000
--- a/main/open-vm-tools-vserver/linux-3.6-build-fix.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-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;
diff --git a/main/open-vm-tools-vserver/vmware-modules.initd b/main/open-vm-tools-vserver/vmware-modules.initd
deleted file mode 100644
index 942f4504e6..0000000000
--- a/main/open-vm-tools-vserver/vmware-modules.initd
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-
-MODULES="vmblock vmci vmhgfs vmsync vmxnet vsock vmw_balloon"
-
-depend() {
- before open-vm-tools
-}
-
-
-start() {
- ebegin "Loading VMware kernel modules"
- for mod in $MODULES; do
- modprobe -q $mod
- done
- eend $?
-}
-
-stop() {
- ebegin "Unloading VMware kernel modules"
- for mod in $MODULES; do
- rmmod $mod
- done
- eend $?
-}
-
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-02 11:22:44 +0000