From 6051d53acd48cc62a57f7f6ab5d8af5993314dd6 Mon Sep 17 00:00:00 2001
From: wangyueliang <wangyueliang@kylinos.cn>
Date: Fri, 12 Jul 2024 11:46:03 +0800
Subject: [PATCH] Adjust the list of dependent software packages and remove the
 use of 'python3 semver'

[upstream]
8897a49bc Drop use of `python3-semver`
---
 src/build-deps.txt     |  5 +++++
 src/cosalib/builds.py  | 13 ++++---------
 src/deps.txt           | 21 ++++++++++-----------
 src/vmdeps-aarch64.txt |  5 +++--
 src/vmdeps-x86_64.txt  |  2 --
 5 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/src/build-deps.txt b/src/build-deps.txt
index 644666b5..445bc2de 100644
--- a/src/build-deps.txt
+++ b/src/build-deps.txt
@@ -1,2 +1,7 @@
+# A common utility, can/will be used for diagnostics in cosa builds
+time
 # Used by mantle
 golang
+# Use tmux for developer multi-arch builder access UX 
+#https://github.com/coreos/fedora-coreos-pipeline/issues/803
+tmux
diff --git a/src/cosalib/builds.py b/src/cosalib/builds.py
index 216f6c3f..5fd70222 100644
--- a/src/cosalib/builds.py
+++ b/src/cosalib/builds.py
@@ -4,7 +4,6 @@ Builds interacts with builds.json
 
 import json
 import os
-import semver
 import gi
 import collections
 
@@ -45,14 +44,10 @@ class Builds:  # pragma: nocover
                 'builds': []
             }
             self.flush()
-        self._version = semver.parse_version_info(
-            self._data.get('schema-version', "0.0.1"))
-        # we understand < 2.0.0 only
-        if self._version._major >= 2:
-            raise Exception("Builds schema too new; please update cosa")
-        if self._version._major < 1:
-            err = f"Unsupported build metadata version {self._version}"
-            raise SystemExit(err)
+        ver = self._data.get('schema-version', "0.0.1")
+        parts = ver.split('.')
+        if int(parts[0]) != 1:
+            raise SystemExit(f"Unsupported build metadata version {ver}")
 
     def _path(self, path):
         if not self._workdir:
diff --git a/src/deps.txt b/src/deps.txt
index da8dba87..23befa32 100644
--- a/src/deps.txt
+++ b/src/deps.txt
@@ -25,8 +25,10 @@ make git rpm-build
 # virt dependencies
 libguestfs-tools libguestfs-tools-c virtiofsd /usr/bin/qemu-img qemu-kvm swtpm
 # And the main arch emulators for cross-arch testing
-#qemu-system-aarch64-core qemu-system-ppc-core qemu-system-s390x-core qemu-system-x86-core
-qemu-system-aarch64 qemu-system-x86
+# qemu-system-aarch64-core qemu-system-ppc-core qemu-system-s390x-core qemu-system-x86-core
+qemu-system-aarch64 qemu-system-x86_64
+# cross-arch emulators need these,but openEuler did not provide these packages in every repo currently.
+# edk2-ovmf edk2-aarch64
 
 # Useful for moving files around
 rsync
@@ -41,11 +43,9 @@ podman buildah skopeo
 jq
 
 # For interacting with AWS/Aliyun/HTTP
+# awscli golang-github-aliyun-cli python3-boto3 python3-requests
 python3-boto3 python3-requests
 
-# For metadata versioning
-python3-semver
-
 # For python retries
 python3-tenacity
 
@@ -62,11 +62,14 @@ python3-libvirt
 openssl
 
 # Support for Koji uploads.
-#krb5-libs krb5-workstation
+# krb5-libs krb5-workstation koji-utils python3-koji python3-koji-cli-plugins
 
 # LUKS support
 cryptsetup
 
+# For communicating with RoboSignatory for signing requests
+# fedora-messaging
+
 # For debugging running processes in the pipelines
 strace
 
@@ -82,14 +85,10 @@ nestos-installer
 butane
 
 # Support for meta.json file locking
-#python3-flufl-lock
+python3-flufl.lock
 
 # entrypoint uses bsdtar for automatic compression detection
 bsdtar
 
 # For pulling from the prod OSTree repo, e.g. during release jobs
 #fedora-repos-ostree
-
-python3-flufl.lock python3-pyyaml
-
-#guestfs-tools
diff --git a/src/vmdeps-aarch64.txt b/src/vmdeps-aarch64.txt
index 995f40f6..118da92b 100644
--- a/src/vmdeps-aarch64.txt
+++ b/src/vmdeps-aarch64.txt
@@ -5,6 +5,7 @@ bootupd
 # For creating bootable UEFI media on aarch64
 shim-aa64 grub2-efi-aa64
 
-qemu-system-aarch64
-
+# openEuler qemu package does not specify the requirement for edk2-aarch64, but it must be needed.
+# Due to improper placement of the edk2 package in the openEuler repo, it is temporarily placed here. 
+# After waiting for the openEuler repo to be fixed, move it into deps.txt or after qemu-system-aarch64 explicitly require edk2-aarch64, remove it here.
 edk2-aarch64
\ No newline at end of file
diff --git a/src/vmdeps-x86_64.txt b/src/vmdeps-x86_64.txt
index 2e37d1d7..5289937a 100644
--- a/src/vmdeps-x86_64.txt
+++ b/src/vmdeps-x86_64.txt
@@ -7,5 +7,3 @@ shim-x64 grub2-efi-x64
 
 # For pxe install kola testing (uses grub2-mknetdir)
 grub2-tools-extra
-
-qemu-system-x86_64
\ No newline at end of file
-- 
Gitee