Merge pull request #9873 from mcalmer/introduce-arm64

handle architecture arm64
uyuni-project · Mar 3, 2025 · 923498e · 923498e
2 parents fdc57da + c72a9a4
commit 923498e
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelArch.java b/java/code/src/com/redhat/rhn/domain/channel/ChannelArch.java
@@ -206,7 +206,7 @@ public String cobblerArch() {
                 substrings[1].equals("iSeries") || substrings[1].equals("pSeries")) {
             return "ppc64";
         }
-        if (substrings[1].equals("aarch64")) {
+        if (substrings[1].equals("aarch64") || substrings[1].equals("arm64")) {
             return "aarch64";
         }
         if (substrings[1].equals("ppc64le")) {

diff --git a/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java b/java/code/src/com/redhat/rhn/manager/content/ContentSyncManager.java
@@ -1109,7 +1109,11 @@ private PtfProductRepositoryInfo parsePtfInfoFromUrl(SCCRepositoryJson jrepo) {
             return null;
         }
         String prdArch = parts[6];
-        String archStr = prdArch.equals("amd64") ? prdArch + "-deb" : prdArch;
+        String archStr = switch (prdArch) {
+            case "amd64" -> prdArch + "-deb";
+            case "arm64" -> prdArch + "-deb";
+            default -> prdArch;
+        };
 
         SCCRepository repo = new SCCRepository();
         repo.setSigned(isRepoSigned(true));
@@ -1334,7 +1338,7 @@ public List<String> buildRepoFileUrls(String url, SCCRepository repo) throws URI
         List<String> urls = new LinkedList<>();
 
         // Debian repo
-        if (repo.getDistroTarget() != null && repo.getDistroTarget().equals("amd64")) {
+        if (repo.getDistroTarget() != null && (List.of("amd64", "arm64").contains(repo.getDistroTarget()))) {
             // There is not only 1 file we can test.
             // https://wiki.debian.org/DebianRepository/Format
             relFiles.add("Packages.xz");

diff --git a/java/code/src/com/redhat/rhn/manager/content/MgrSyncUtils.java b/java/code/src/com/redhat/rhn/manager/content/MgrSyncUtils.java
@@ -54,7 +54,7 @@ public class MgrSyncUtils {
     private static final String OFFICIAL_NOVELL_UPDATE_HOST = "nu.novell.com";
     public static final String OFFICIAL_UPDATE_HOST_DOMAIN = ".suse.com";
     private static final List<String> PRODUCT_ARCHS = Arrays.asList("i386", "i486", "i586", "i686", "ia64", "ppc64le",
-            "ppc64", "ppc", "s390x", "s390", "x86_64", "aarch64", "amd64");
+            "ppc64", "ppc", "s390x", "s390", "x86_64", "aarch64", "amd64", "arm64");
 
     // No instances should be created
     private MgrSyncUtils() {
@@ -137,6 +137,9 @@ public static ChannelArch getChannelArch(PackageArch packageArch, String channel
             case "amd64":
                 arch = "amd64-deb";
                 break;
+            case "arm64":
+                arch = "arm64-deb";
+                break;
             default:
                 // keep arch unchanged
                 break;

diff --git a/java/code/src/com/suse/manager/matcher/MatcherJsonIO.java b/java/code/src/com/suse/manager/matcher/MatcherJsonIO.java
@@ -73,6 +73,7 @@ public class MatcherJsonIO {
 
     /** Architecture strings **/
     private static final String AMD64_ARCH_STR = "amd64";
+    private static final String ARM64_ARCH_STR = "arm64";
     private static final String S390_ARCH_STR = "s390";
     private static final String PPC64LE_ARCH_STR = "ppc64le";
 
@@ -149,6 +150,7 @@ PPC64LE_ARCH_STR, productIdForSelf(productName, version, PPC64LE_ARCH_STR, 2376L
 
         monitoringProductByArch = Map.of(
             AMD64_ARCH_STR, 1201L,      // SUSE Manager Monitoring Single
+            ARM64_ARCH_STR, 1201L,      // SUSE Manager Monitoring Single
             S390_ARCH_STR, 1203L,       // SUSE Manager Monitoring Unlimited Virtual Z
             PPC64LE_ARCH_STR, 1201L     // SUSE Manager Monitoring Single
         );

diff --git a/java/code/src/com/suse/scc/model/SCCProductJson.java b/java/code/src/com/suse/scc/model/SCCProductJson.java
@@ -512,7 +512,7 @@ public String getReleaseType() {
      * @return the arch
      */
     public String getArch() {
-        if (arch != null && arch.equals("amd64")) {
+        if (arch != null && List.of("amd64", "arm64").contains(arch)) {
             return arch + "-deb";
         }
         return arch;

diff --git a/java/spacewalk-java.changes.mcalmer.introduce-arm64 b/java/spacewalk-java.changes.mcalmer.introduce-arm64
@@ -0,0 +1 @@
+- Handle architecture arm64