From 3bab114ace4a82ae6fd65b0977aea2145e8bb38c Mon Sep 17 00:00:00 2001 From: Natanael Copa Date: Wed, 2 Jun 2010 07:55:24 +0000 Subject: Revert "main/xe-guest-utilities: update to version 5.5.0-466" This reverts commit 9252f1cfd78299b137400ed8169a79f7f833daac. --- main/xe-guest-utilities/APKBUILD | 9 ++---- .../xe-update-guest-attrs_466.patch | 32 ---------------------- 2 files changed, 3 insertions(+), 38 deletions(-) delete mode 100644 main/xe-guest-utilities/xe-update-guest-attrs_466.patch diff --git a/main/xe-guest-utilities/APKBUILD b/main/xe-guest-utilities/APKBUILD index 39b110e8c..02b2115bd 100644 --- a/main/xe-guest-utilities/APKBUILD +++ b/main/xe-guest-utilities/APKBUILD @@ -2,8 +2,7 @@ # Maintainer: Cedric Schieli pkgname=xe-guest-utilities _major=5.5.0 -_minor=466 -_srcminor=458 +_minor=458 pkgver=${_major}.${_minor} pkgrel=0 pkgdesc="XenServer guest tools" @@ -13,13 +12,12 @@ depends= makedepends= install= subpackages= -source="http://updates.vmd.citrix.com/XenServer/${_major}/debian/pool/main/x/${pkgname}/${pkgname}_${_major}-${_srcminor}.tar.gz +source="http://updates.vmd.citrix.com/XenServer/${_major}/debian/pool/main/x/${pkgname}/${pkgname}_${_major}-${_minor}.tar.gz $pkgname.initd no_bash_dependency.patch identify_alpine.patch fix_cflags.patch no_hard_links.patch - xe-update-guest-attrs_466.patch " _builddir="$srcdir"/$pkgname-$_major @@ -59,5 +57,4 @@ d2eefda7fb55926dddbf87f17989b16e xe-guest-utilities.initd 1fe4c6c4621982a87de97d897612eef7 no_bash_dependency.patch aa129940379b312783dc314497f62042 identify_alpine.patch cf32b9c90ce2e846d2221eaca0638929 fix_cflags.patch -96e872ed89792f9d1b5cb51f8fdfd5f6 no_hard_links.patch -3e104e3dfa4bbf618e4b16ce5a8d502d xe-update-guest-attrs_466.patch" +96e872ed89792f9d1b5cb51f8fdfd5f6 no_hard_links.patch" diff --git a/main/xe-guest-utilities/xe-update-guest-attrs_466.patch b/main/xe-guest-utilities/xe-update-guest-attrs_466.patch deleted file mode 100644 index c0ef7929b..000000000 --- a/main/xe-guest-utilities/xe-update-guest-attrs_466.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- 458/usr/sbin/xe-update-guest-attrs -+++ 466/usr/sbin/xe-update-guest-attrs -@@ -82,6 +82,20 @@ - return 1 - } - -+# If we detect a domain change then delete our cache and force a refresh -+domid=$(xenstore-read "domid") -+cache=/var/cache/xenstore/unique-domain-id -+newval=$(xenstore-read "/local/domain/${domid}/unique-domain-id") -+if [ -e $cache ]; then -+ oldval=$(cat "$cache") -+ if [ "$oldval" != "$newval" ]; then -+ # domain changed -+ rm -rf /var/cache/xenstore -+ fi -+fi -+mkdir -p $(dirname "$cache") -+echo -n "$newval" > "$cache" -+ - xenstore_rm_cached() { - key="$1" - cache=/var/cache/xenstore/$key -@@ -195,7 +209,7 @@ - xenstore_write_cached "attr/PVAddons/MajorVersion" "5" - xenstore_write_cached "attr/PVAddons/MinorVersion" "5" - xenstore_write_cached "attr/PVAddons/MicroVersion" "0" --xenstore_write_cached "attr/PVAddons/BuildVersion" "17913" -+xenstore_write_cached "attr/PVAddons/BuildVersion" "25727" - xenstore_write_cached "attr/PVAddons/Installed" "1" - - # update xenstore if necc -- cgit v1.2.3