WALinuxAgent now supports Archlinux.

Update package.

3 files changed, 7 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 861bcd57ddff..16a5f4e69658 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = walinuxagent
 	pkgdesc = Microsoft Azure Linux Guest Agent
-	pkgver = 2.1.6
+	pkgver = 2.2.10
 	pkgrel = 1
 	url = https://github.com/Azure/WALinuxAgent
 	arch = any
@@ -19,10 +19,8 @@ pkgbase = walinuxagent
 	depends = iproute2
 	provides = walinuxagent
 	conflicts = walinuxagent
-	source = https://github.com/Azure/WALinuxAgent/archive/v2.1.6.zip
-	source = setup_default_systemd.patch
-	sha256sums = cb70ab8f55fc82c89f33b2c88e691c0b8809b187fdaa6c481ec7ae357f32c3a9
-	sha256sums = e7cb463690dd312a9e63a4efe1e869e1d3c04b59ea71001198cbcfd5c1cba351
+	source = https://github.com/Azure/WALinuxAgent/archive/v2.2.10.zip
+	sha256sums = 0a1225d3292fab251456a7055a929d38da76d6a913bf5549e42b1d2975112672
 
 pkgname = walinuxagent
 
diff --git a/PKGBUILD b/PKGBUILD
index 80b27a1c99bd..fb3b43594471 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=walinuxagent
 _pkgname=WALinuxAgent
-pkgver=2.1.6
+pkgver=2.2.10
 pkgrel=1
 pkgdesc="Microsoft Azure Linux Guest Agent"
 arch=('any')
@@ -19,26 +19,11 @@ options=()
 install=
 changelog=
 source=(
-  "https://github.com/Azure/WALinuxAgent/archive/v${pkgver}.zip"
-  "setup_default_systemd.patch")
+  "https://github.com/Azure/WALinuxAgent/archive/v${pkgver}.zip")
 sha256sums=(
-  'cb70ab8f55fc82c89f33b2c88e691c0b8809b187fdaa6c481ec7ae357f32c3a9'
-  'e7cb463690dd312a9e63a4efe1e869e1d3c04b59ea71001198cbcfd5c1cba351')
-
-prepare() {
-  #cd "$_pkgname-$pkgver"
-  #find . -type f -exec \
-  #  sed -i 's/\/usr\/sbin/\/usr\/bin/g' {} +
-  # TODO: Replace directory /usr/sbin with /usr/bin
-  patch -p1 < setup_default_systemd.patch
-}
+  '0a1225d3292fab251456a7055a929d38da76d6a913bf5549e42b1d2975112672')
 
 package() {
   cd "$_pkgname-$pkgver"
-  python setup.py install --root="$pkgdir" --prefix="/usr" --init-system=systemd --optimize=1
-  mv $pkgdir/usr/sbin $pkgdir/usr/bin
-  sed -i -e 's/\/usr\/sbin/\/usr\/bin/g' $pkgdir/usr/lib/systemd/system/waagent.service
-  #sed -i -e '0,/env python/s/env python/env python2/' $pkgdir/usr/bin/waagent
+  python setup.py install --root="$pkgdir" --prefix="/usr" --optimize=1
 }
-
-# vim:set ts=2 sw=2 et:
diff --git a/setup_default_systemd.patch b/setup_default_systemd.patch
deleted file mode 100644
index d8958c87c9fc..000000000000
--- a/setup_default_systemd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/WALinuxAgent-2.1.6/setup.py	2016-08-12 18:48:21.000000000 -0500
-+++ b/WALinuxAgent-2.1.6/setup.py	2016-08-15 04:38:57.472956839 -0500
-@@ -127,7 +127,7 @@
-         set_conf_files(data_files)
-         set_logrotate_files(data_files)
-         set_udev_files(data_files)
--        set_sysv_files(data_files)
-+        set_systemd_files(data_files, dest="/usr/lib/systemd/system")
-     return data_files
- 
- class install(_install):