You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
63 lines
2.0 KiB
63 lines
2.0 KiB
1 year ago
|
From 1c6e194757ad5d0c645e4f129e2b504858cef9d3 Mon Sep 17 00:00:00 2001
|
||
|
|
From: tigro <tigro@msvsphere-os.ru>
|
||
|
|
Date: Mon, 18 Dec 2023 20:11:19 +0300
|
||
|
|
Subject: [PATCH] Initial msvsphere build configuration
|
||
|
|
|
||
|
|
---
|
||
|
|
makepkg.py | 2 +-
|
||
|
|
setup.py | 6 +++---
|
||
|
|
tests/data/ext/sample_ext-1.3.0/sample.py | 2 +-
|
||
|
|
3 files changed, 5 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/makepkg.py b/makepkg.py
|
||
|
|
index 11e90b9..1b6b435 100755
|
||
|
|
--- a/makepkg.py
|
||
|
|
+++ b/makepkg.py
|
||
|
|
@@ -1,4 +1,4 @@
|
||
|
|
-#!/usr/bin/env python
|
||
|
|
+#!/usr/bin/env python3
|
||
|
|
|
||
|
|
import glob
|
||
|
|
import os
|
||
|
|
diff --git a/setup.py b/setup.py
|
||
|
|
index 12c9e1d..586bb5c 100755
|
||
|
|
--- a/setup.py
|
||
|
|
+++ b/setup.py
|
||
|
|
@@ -1,4 +1,4 @@
|
||
|
|
-#!/usr/bin/env python
|
||
|
|
+#!/usr/bin/env python3
|
||
|
|
#
|
||
|
|
# Microsoft Azure Linux Agent setup.py
|
||
|
|
#
|
||
|
|
@@ -97,7 +97,7 @@ def get_data_files(name, version, fullname): # pylint: disable=R0912
|
||
|
|
agent_bin_path = osutil.get_agent_bin_path()
|
||
|
|
|
||
|
|
if name in ('redhat', 'centos', 'almalinux', 'cloudlinux'): # pylint: disable=R1714
|
||
|
|
- if version.startswith("8.2"):
|
||
|
|
+ if version.startswith("8"):
|
||
|
|
# redhat8+ default to py3
|
||
|
|
set_bin_files(data_files, dest=agent_bin_path,
|
||
|
|
src=["bin/py3/waagent", "bin/waagent2.0"])
|
||
|
|
@@ -106,7 +106,7 @@ def get_data_files(name, version, fullname): # pylint: disable=R0912
|
||
|
|
set_conf_files(data_files)
|
||
|
|
set_logrotate_files(data_files)
|
||
|
|
set_udev_files(data_files)
|
||
|
|
- if version.startswith("8.2"):
|
||
|
|
+ if version.startswith("8"):
|
||
|
|
# redhat 8+ uses systemd and python3
|
||
|
|
set_systemd_files(data_files, dest=systemd_dir_path,
|
||
|
|
src=["init/redhat/waagent.service",
|
||
|
|
diff --git a/tests/data/ext/sample_ext-1.3.0/sample.py b/tests/data/ext/sample_ext-1.3.0/sample.py
|
||
|
|
index 47f86af..92585ed 100755
|
||
|
|
--- a/tests/data/ext/sample_ext-1.3.0/sample.py
|
||
|
|
+++ b/tests/data/ext/sample_ext-1.3.0/sample.py
|
||
|
|
@@ -1,4 +1,4 @@
|
||
|
|
-#!/usr/bin/env python
|
||
|
|
+#!/usr/bin/env python3
|
||
|
|
import json
|
||
|
|
import os
|
||
|
|
import re
|
||
|
|
--
|
||
|
|
2.43.0
|
||
|
|
|