cottsay pushed to WALinuxAgent (el6). "Update to 2.0.12-Oracle"
notifications at fedoraproject.org
notifications at fedoraproject.org
Thu Apr 2 08:21:32 UTC 2015
>From d3958f71e6c6c7804d3923c5e40d68b08a07382b Mon Sep 17 00:00:00 2001
From: Scott K Logan <logans at cottsay.net>
Date: Thu, 2 Apr 2015 01:15:51 -0700
Subject: Update to 2.0.12-Oracle
diff --git a/.gitignore b/.gitignore
index 960e851..e0200c7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/WALinuxAgent-b3f2619a854455675ae5f2ee14726659e0398af7.tar.gz
+/WALinuxAgent-26785b64279913d416767a6288a3b3f970ed4522.tar.gz
diff --git a/WALinuxAgent-2.0.12-oracle-linux-name.patch b/WALinuxAgent-2.0.12-oracle-linux-name.patch
new file mode 100644
index 0000000..08721a9
--- /dev/null
+++ b/WALinuxAgent-2.0.12-oracle-linux-name.patch
@@ -0,0 +1,34 @@
+From 95d1985deca1bc2561031ef08cc300b29558269c Mon Sep 17 00:00:00 2001
+From: Yue Zhang <yuezha at microsoft.com>
+Date: Thu, 26 Mar 2015 21:51:15 +0800
+Subject: [PATCH] Merge distro name fix on oracle linux
+
+---
+ waagent | 7 +++++++
+ 1 file changed, 7 insertions(+)
+
+diff --git a/waagent b/waagent
+index cbd005b..68d3c64 100644
+--- a/waagent
++++ b/waagent
+@@ -5619,6 +5619,7 @@ def DistInfo(fullname=0):
+ release = re.sub('\-.*\Z', '', str(platform.release()))
+ distinfo = ['FreeBSD', release]
+ return distinfo
++
+ if 'linux_distribution' in dir(platform):
+ distinfo = list(platform.linux_distribution(full_distribution_name=fullname))
+ distinfo[0] = distinfo[0].strip() # remove trailing whitespace in distro name
+@@ -5747,6 +5748,12 @@ def main():
+ LoggerInit('/var/log/waagent.log','/dev/console')
+ global LinuxDistro
+ LinuxDistro=DistInfo()[0]
++
++ #The platform.py lib has issue with detecting oracle linux distribution.
++ #Merge the following patch provided by oracle as a temparory fix.
++ if os.path.exists("/etc/oracle-release"):
++ LinuxDistro="Oracle Linux"
++
+ global MyDistro
+ MyDistro=GetMyDistro()
+ if MyDistro == None :
diff --git a/WALinuxAgent.spec b/WALinuxAgent.spec
index 2706ffa..829f7ea 100644
--- a/WALinuxAgent.spec
+++ b/WALinuxAgent.spec
@@ -1,4 +1,4 @@
-%global commit b3f2619a854455675ae5f2ee14726659e0398af7
+%global commit 26785b64279913d416767a6288a3b3f970ed4522
%if 0%{?fedora}
%global distro fedora
@@ -17,8 +17,8 @@
%endif
Name: WALinuxAgent
-Version: 2.0.11
-Release: 2%{?dist}
+Version: 2.0.12
+Release: 1%{?dist}
Summary: The Microsoft Azure Linux Agent
Group: System Environment/Daemons
@@ -27,6 +27,8 @@ URL: https://github.com/Azure/%{name}
Source0: https://github.com/Azure/%{name}/archive/%{commit}/%{name}-%{commit}.tar.gz
# Redhat-specific patch (not submitted upstream)
Patch0: %{name}-2.0.8-logrotate-name.patch
+# Pulled from upstream
+Patch1: %{name}-2.0.12-oracle-linux-name.patch
BuildArch: noarch
@@ -66,6 +68,7 @@ images that are built to run in the Microsoft Azure environment.
%prep
%setup -qn %{name}-%{commit}
%patch0 -p1
+%patch1 -p1
chmod 0755 distro/redhat/waagent.sysV
@@ -126,6 +129,9 @@ fi
%endif
%changelog
+* Thu Apr 02 2015 Scott K Logan <logans at cottsay.net> - 2.0.12-1
+- Update to 2.0.12-Oracle
+
* Sat Jan 10 2015 Scott K Logan <logans at cottsay.net> - 2.0.11-2
- Use systemd for rhel7
- Own logrotate.d
diff --git a/sources b/sources
index 892776c..9b1c4c8 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-21ad3de60c83523795894fec0ce2f1f7 WALinuxAgent-b3f2619a854455675ae5f2ee14726659e0398af7.tar.gz
+ea919b93822b7f047b0a4c4a87c149fa WALinuxAgent-26785b64279913d416767a6288a3b3f970ed4522.tar.gz
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/WALinuxAgent.git/commit/?h=el6&id=d3958f71e6c6c7804d3923c5e40d68b08a07382b
More information about the scm-commits
mailing list