|
 |
41c999 |
From ee6172c4d57103ac857bbd69c46f247cee5394c3 Mon Sep 17 00:00:00 2001
|
|
|
488707 |
From: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
488707 |
Date: Thu, 6 Oct 2016 12:25:35 +0200
|
|
|
488707 |
Subject: Add inital redhat build support
|
|
|
488707 |
|
|
|
b7f0e7 |
Rebase notes (2.2.32):
|
|
|
488707 |
- Fix license text
|
|
|
488707 |
|
|
|
488707 |
Rebase notes (2.2.26):
|
|
|
488707 |
- update to RHEL 8 build
|
|
|
488707 |
- Do not use INSTALED_FILES for %files
|
|
|
488707 |
|
|
|
488707 |
Rebase notes (2.2.10):
|
|
|
488707 |
- switched to sha256
|
|
|
488707 |
- added .gitpublish profile
|
|
|
488707 |
|
|
|
b7f0e7 |
Rebase notes (2.2.46):
|
|
|
b7f0e7 |
- added waagent-extn.logrotate
|
|
|
b7f0e7 |
|
|
|
41c999 |
Rebase notes (2.7.0.6):
|
|
|
41c999 |
- new files - azure.slice and azure-vmextensions.slice
|
|
|
41c999 |
- removed changes in not shipped scripts
|
|
|
41c999 |
|
|
|
b7f0e7 |
Merged patches (2.2.45):
|
|
|
416c82 |
- df29beb Switch from platform-python to python36
|
|
|
416c82 |
- 6749108 Stop packaging legacy waagent2.0
|
|
|
416c82 |
|
|
|
488707 |
Merged patches (2.2.32):
|
|
|
488707 |
- ce36fd9 Use Python3
|
|
|
488707 |
- 952c830 Remove FIPS setting from the default config
|
|
|
488707 |
- cc9df73 Switch hardcoded python3 shebangs into the %%{__python3} macro
|
|
|
488707 |
- 66b6f8c Use correct macro for waagent.service
|
|
|
488707 |
- 1b15ada Switch to platform-python in systemd unit file
|
|
|
488707 |
- 59f682b Use sys.executable to find system python
|
|
|
488707 |
|
|
|
e47d71 |
Merged patches (2.2.49):
|
|
|
e47d71 |
- 3a23336 Mark logrotate configs with %config(noreplace)
|
|
|
dc48e5 |
|
|
|
dc48e5 |
Merged patches (2.3.0.2):
|
|
|
dc48e5 |
- 30bb06f9 Provide udev rules as a separate subpackage.
|
|
|
41c999 |
|
|
|
41c999 |
Merged patches (2.7.0.6):
|
|
|
41c999 |
- a790fb5c Require iptables for setting up persistent firewall rules
|
|
|
488707 |
---
|
|
|
e47d71 |
.gitignore | 1 +
|
|
|
488707 |
.gitpublish | 8 +
|
|
|
488707 |
makepkg.py | 2 +-
|
|
|
488707 |
redhat/.gitignore | 1 +
|
|
|
dc48e5 |
redhat/Makefile | 72 +++++
|
|
|
dc48e5 |
redhat/Makefile.common | 37 +++
|
|
|
41c999 |
redhat/WALinuxAgent.spec.template | 243 ++++++++++++++++
|
|
|
488707 |
redhat/rpmbuild/BUILD/.gitignore | 2 +
|
|
|
488707 |
redhat/rpmbuild/RPMS/.gitignore | 2 +
|
|
|
488707 |
redhat/rpmbuild/SOURCES/.gitignore | 2 +
|
|
|
488707 |
redhat/rpmbuild/SPECS/.gitignore | 2 +
|
|
|
488707 |
redhat/rpmbuild/SRPMS/.gitignore | 2 +
|
|
|
dc48e5 |
redhat/scripts/frh.py | 27 ++
|
|
|
dc48e5 |
redhat/scripts/git-backport-diff | 327 ++++++++++++++++++++++
|
|
|
dc48e5 |
redhat/scripts/git-compile-check | 215 ++++++++++++++
|
|
|
dc48e5 |
redhat/scripts/process-patches.sh | 93 ++++++
|
|
|
488707 |
redhat/scripts/tarball_checksum.sh | 3 +
|
|
|
41c999 |
setup.py | 6 +-
|
|
|
488707 |
tests/data/ext/sample_ext-1.3.0/sample.py | 2 +-
|
|
|
41c999 |
19 files changed, 1042 insertions(+), 5 deletions(-)
|
|
|
488707 |
create mode 100644 .gitpublish
|
|
|
488707 |
create mode 100644 redhat/.gitignore
|
|
|
488707 |
create mode 100644 redhat/Makefile
|
|
|
488707 |
create mode 100644 redhat/Makefile.common
|
|
|
488707 |
create mode 100644 redhat/WALinuxAgent.spec.template
|
|
|
488707 |
create mode 100644 redhat/rpmbuild/BUILD/.gitignore
|
|
|
488707 |
create mode 100644 redhat/rpmbuild/RPMS/.gitignore
|
|
|
488707 |
create mode 100644 redhat/rpmbuild/SOURCES/.gitignore
|
|
|
488707 |
create mode 100644 redhat/rpmbuild/SPECS/.gitignore
|
|
|
488707 |
create mode 100644 redhat/rpmbuild/SRPMS/.gitignore
|
|
|
488707 |
create mode 100755 redhat/scripts/frh.py
|
|
|
488707 |
create mode 100755 redhat/scripts/git-backport-diff
|
|
|
488707 |
create mode 100755 redhat/scripts/git-compile-check
|
|
|
488707 |
create mode 100755 redhat/scripts/process-patches.sh
|
|
|
488707 |
create mode 100755 redhat/scripts/tarball_checksum.sh
|
|
|
488707 |
|
|
|
488707 |
diff --git a/makepkg.py b/makepkg.py
|
|
|
dc48e5 |
index 11e90b95..1b6b4351 100755
|
|
|
488707 |
--- a/makepkg.py
|
|
|
488707 |
+++ b/makepkg.py
|
|
|
488707 |
@@ -1,4 +1,4 @@
|
|
|
488707 |
-#!/usr/bin/env python
|
|
|
488707 |
+#!/usr/bin/env python3
|
|
|
488707 |
|
|
|
488707 |
import glob
|
|
|
488707 |
import os
|
|
|
488707 |
diff --git a/setup.py b/setup.py
|
|
|
41c999 |
index 12c9e1d6..586bb5ca 100755
|
|
|
488707 |
--- a/setup.py
|
|
|
488707 |
+++ b/setup.py
|
|
|
488707 |
@@ -1,4 +1,4 @@
|
|
|
488707 |
-#!/usr/bin/env python
|
|
|
488707 |
+#!/usr/bin/env python3
|
|
|
488707 |
#
|
|
|
488707 |
# Microsoft Azure Linux Agent setup.py
|
|
|
488707 |
#
|
|
|
41c999 |
@@ -97,7 +97,7 @@ def get_data_files(name, version, fullname): # pylint: disable=R0912
|
|
|
41c999 |
agent_bin_path = osutil.get_agent_bin_path()
|
|
|
41c999 |
|
|
|
41c999 |
if name in ('redhat', 'centos', 'almalinux', 'cloudlinux'): # pylint: disable=R1714
|
|
|
41c999 |
- if version.startswith("8.2"):
|
|
|
41c999 |
+ if version.startswith("8"):
|
|
|
41c999 |
# redhat8+ default to py3
|
|
|
41c999 |
set_bin_files(data_files, dest=agent_bin_path,
|
|
|
41c999 |
src=["bin/py3/waagent", "bin/waagent2.0"])
|
|
|
41c999 |
@@ -106,7 +106,7 @@ def get_data_files(name, version, fullname): # pylint: disable=R0912
|
|
|
41c999 |
set_conf_files(data_files)
|
|
|
41c999 |
set_logrotate_files(data_files)
|
|
|
41c999 |
set_udev_files(data_files)
|
|
|
41c999 |
- if version.startswith("8.2"):
|
|
|
41c999 |
+ if version.startswith("8"):
|
|
|
41c999 |
# redhat 8+ uses systemd and python3
|
|
|
41c999 |
set_systemd_files(data_files, dest=systemd_dir_path,
|
|
|
41c999 |
src=["init/redhat/waagent.service",
|
|
|
488707 |
diff --git a/tests/data/ext/sample_ext-1.3.0/sample.py b/tests/data/ext/sample_ext-1.3.0/sample.py
|
|
|
dc48e5 |
index 47f86af8..92585ed3 100755
|
|
|
488707 |
--- a/tests/data/ext/sample_ext-1.3.0/sample.py
|
|
|
488707 |
+++ b/tests/data/ext/sample_ext-1.3.0/sample.py
|
|
|
488707 |
@@ -1,4 +1,4 @@
|
|
|
488707 |
-#!/usr/bin/env python
|
|
|
488707 |
+#!/usr/bin/env python3
|
|
|
dc48e5 |
import json
|
|
|
488707 |
import os
|
|
|
dc48e5 |
import re
|
|
|
488707 |
--
|
|
|
41c999 |
2.31.1
|
|
|
488707 |
|