summaryrefslogtreecommitdiff
path: root/rpm
diff options
context:
space:
mode:
Diffstat (limited to 'rpm')
-rw-r--r--rpm/README7
-rw-r--r--rpm/walinuxagent.spec14
2 files changed, 14 insertions, 7 deletions
diff --git a/rpm/README b/rpm/README
index 08d9014..b731b9b 100644
--- a/rpm/README
+++ b/rpm/README
@@ -4,16 +4,17 @@ Platform images in the Azure Gallery will already include the agent
package. This guide is primarily for individuals who would like to
build their own custom packages.
-OpenLogic provides supported RPM packages for CentOS in their package
-repositories, for example
+OpenLogic provides an RPM package for CentOS-based distributions
+in their package repositories, for example
http://olcentgbl.trafficmanager.net/openlogic/6/openlogic/x86_64/RPMS/
+http://olcentgbl.trafficmanager.net/openlogic/7/openlogic/x86_64/RPMS/
Note: Official packaging and other patches for SLES and OpenSUSE can be
found on the OpenSUSE Build Service:
https://build.opensuse.org/package/show?package=WALinuxAgent&project=Cloud%3ATools
The instructions below will describe how you can build your own RPM
-package on a CentOS host:
+package:
1. Install required rpmbuild package:
diff --git a/rpm/walinuxagent.spec b/rpm/walinuxagent.spec
index f20cb64..45a2b42 100644
--- a/rpm/walinuxagent.spec
+++ b/rpm/walinuxagent.spec
@@ -2,25 +2,28 @@
# Name: walinuxagent.spec
#-------------------------------------------------------------------------------
# Purpose : RPM Spec file for Python script packaging
-# Version : 2.0.4
+# Version : 2.0.8
# Created : April 20 2012
#===============================================================================
Name: WALinuxAgent
Summary: The Windows Azure Linux Agent
-Version: 2.0.4
+Version: 2.0.8
Release: 1
License: Apache License Version 2.0
Group: System/Daemons
Url: http://go.microsoft.com/fwlink/?LinkId=250998
-Source0: WALinuxAgent-2.0.4.tar.gz
+Source0: WALinuxAgent-2.0.8.tar.gz
Requires: python python-pyasn1 openssh openssl util-linux sed grep sudo iptables
-Conflicts: NetworkManager
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildArch: noarch
Vendor: Microsoft Corporation
Packager: Microsoft Corporation <walinuxagent@microsoft.com>
+%if 0%{?rhel} < 7
+Conflicts: NetworkManager
+%endif
+
%description
The Windows Azure Linux Agent supports the provisioning and running of Linux
VMs in the Windows Azure cloud. This package should be installed on Linux disk
@@ -69,6 +72,9 @@ fi
%changelog
+* Thu Sep 18 2014 - walinuxagent@microsoft.com
+- Remove NetworkManager conflict for EL7+
+
* Thu Mar 25 2014 - walinuxagent@microsoft.com
- Create directory /var/lib/waagent
- Updated version to 2.0.4 for release