[arch-commits] Commit in xe-guest-utilities/trunk (3 files)

[Daniel Wallace]

    Date: Sunday, May 12, 2013 @ 09:09:10
  Author: dwallace
Revision: 90392

upgpkg: xe-guest-utilities 6.1.0-5

upgpkg: xe-guest-utilities-6.1.0-5

Modified:
  xe-guest-utilities/trunk/PKGBUILD
  xe-guest-utilities/trunk/xe-daemon.service
  xe-guest-utilities/trunk/xe-linux-distribution.service

-------------------------------+
 PKGBUILD                      |   17 +++++++----------
 xe-daemon.service             |    4 ++--
 xe-linux-distribution.service |    2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-12 07:05:03 UTC (rev 90391)
+++ PKGBUILD	2013-05-12 07:09:10 UTC (rev 90392)
@@ -6,15 +6,12 @@
 pkgbase=xe-guest-utilities
 pkgname=('xe-guest-utilities' 'xenstore')
 pkgver=6.1.0
-pkgrel=4
+pkgrel=5
 pkgdesc="Citrix XenServer Tools"
 arch=('i686' 'x86_64')
 url="http://citrix.com/English/ps2/products/product.asp?contentID=683148&ntref=hp_nav_US"
 license=('GPL' 'LGPL')
 makedepends=(python2)
-optdepends=('linux: DomU kernel for x86_64'
-	          'linux-xen: DomU kernel for i686'
-            'kernel-lts-xen: DomU kernel for i686')
 source=("ftp://ftp.archlinux.org/other/community/$pkgbase/${pkgbase}_${pkgver}-1033.tar.gz"
       	'ip_address.patch'
         'xe-linux-distribution.service'
@@ -23,8 +20,8 @@
         'tmpfile')
 md5sums=('26fd52ffc5ddeb7d3e510e6f272c2860'
          '9bd39e95384056069f7faa870a28413a'
-         'abf49bd0925142e51ce2875cd5e5ad45'
-         '43264c6954c9c036b260521653ade41f'
+         '95064a7d8a32cd3aaca14e3b48c69599'
+         '173fed74c76817702b062ed653002db0'
          '3252fa21362fd55246f9d8b923070151'
          'cadad1eb5b1fa6d5fe463a1a0fd82fff')
 
@@ -52,7 +49,7 @@
   fi
   for f in include libxc xenstore; do
     [[ ! -d "$srcdir"/uclibc-sources/tools/$f ]] && continue
-    make -C ""$srcdir"/uclibc-sources/tools/$f" DESTDIR="$pkgdir" install
+    make -C ""$srcdir"/uclibc-sources/tools/$f" DESTDIR="$pkgdir" SBINDIR=/usr/bin install
   done
   cd "$srcdir/$pkgbase-$pkgver"
   install -Dm644 "COPYING.LGPL" "$pkgdir/usr/share/licenses/$pkgname/COPYING.LGPL"
@@ -65,9 +62,9 @@
 package_xe-guest-utilities(){
   cd "$srcdir/$pkgname-$pkgver"
   depends=('xenstore' 'bash')
-  install -Dm755 xe-linux-distribution "$pkgdir/usr/sbin/xe-linux-distribution"
-  install -Dm755 xe-update-guest-attrs "$pkgdir/usr/sbin/xe-update-guest-attrs"
-  install -Dm755 xe-daemon "$pkgdir/usr/sbin/xe-daemon"
+  install -Dm755 xe-linux-distribution "$pkgdir/usr/bin/xe-linux-distribution"
+  install -Dm755 xe-update-guest-attrs "$pkgdir/usr/bin/xe-update-guest-attrs"
+  install -Dm755 xe-daemon "$pkgdir/usr/bin/xe-daemon"
   install -Dm644 xen-vcpu-hotplug.rules "$pkgdir/usr/lib/udev/rules.d/10-xen-vcpu-hotplug.rules"
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING"
   install -Dm644 $srcdir/xe-daemon.service "$pkgdir/usr/lib/systemd/system/xe-daemon.service"

Modified: xe-daemon.service
===================================================================
--- xe-daemon.service	2013-05-12 07:05:03 UTC (rev 90391)
+++ xe-daemon.service	2013-05-12 07:09:10 UTC (rev 90392)
@@ -5,8 +5,8 @@
 
 [Service]
 PIDFile=/run/xe-daemon.pid
-ExecStart=/usr/sbin/xe-daemon -p /run/xe-daemon.pid
-ExecStop=/bin/pkill -TERM  -F /run/xe-daemon.pid
+ExecStart=/usr/bin/xe-daemon -p /run/xe-daemon.pid
+ExecStop=/usr/bin/pkill -TERM  -F /run/xe-daemon.pid
 
 [Install]
 WantedBy=multi-user.target

Modified: xe-linux-distribution.service
===================================================================
--- xe-linux-distribution.service	2013-05-12 07:05:03 UTC (rev 90391)
+++ xe-linux-distribution.service	2013-05-12 07:09:10 UTC (rev 90392)
@@ -5,7 +5,7 @@
 [Service]
 Type=simple
 RemainAfterExit=yes
-ExecStart=/usr/sbin/xe-linux-distribution /var/cache/xe-linux-distribution
+ExecStart=/usr/bin/xe-linux-distribution /var/cache/xe-linux-distribution
 
 [Install]
 WantedBy=multi-user.target