1. photon
  2. Commit 3ad97d411eaf9ebc2d1cf5aa203e8a50e2a9bfd3
Browse code

Realtime: Skip flavor selection for aarch64

linux-esx: Moved linux-esx to packages_x86_64 to skip
linux selection screen during iso installation
for aarch64.

Change-Id: I95714e8a4a1b85c4eadffbb4d07f1c139495a9ec
Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/11692
Tested-by: gerrit-photon <photon-checkins@vmware.com>
Reviewed-by: Ankit Jain <ankitja@vmware.com>
Reviewed-by: Anish Swaminathan <anishs@vmware.com>
Reviewed-by: Srivatsa S. Bhat <srivatsab@vmware.com>

Piyush Gupta authored on 2020/11/05 02:21:46
Showing 4 changed files
common/data/packages_developer.json
History View file @ 3ad97d4
... ... 
@@ -2,7 +2,6 @@
2 2 
     "packages": [
3 3 
                  "minimal",
4 4 
                  "linux",
5 
-                 "linux-esx",
6 5 
                  "initramfs",
7 6 
                  "build-essential",
8 7 
                  "go",
... ... 
@@ -21,5 +20,5 @@
21 21 
                  "wget",
22 22 
                  "sudo"
23 23 
                  ],
24 
-    "packages_x86_64":["grub2-pc"]
24 
+    "packages_x86_64":["grub2-pc", "linux-esx"]
25 25 
 }
common/data/packages_minimal.json
History View file @ 3ad97d4
... ... 
@@ -3,7 +3,7 @@
3 3 
                  "minimal",
4 4 
                  "linux",
5 5 
                  "initramfs",
6 
-                 "linux-esx",
7 6 
                  "lvm2"
8 
-                 ]
7 
+                 ],
8 
+    "packages_x86_64": ["linux-esx"]
9 9 
 }
installer/packageselector.py
History View file @ 3ad97d4
... ... 
@@ -3,6 +3,7 @@
3 3 
 #    Author: Mahmoud Bassiouny <mbassiouny@vmware.com>
4 4
5 5 
 import os
6 
+import platform
6 7 
 from jsonwrapper import JsonWrapper
7 8 
 from menu import Menu
8 9 
 from window import Window
... ... 
@@ -36,7 +37,6 @@ class PackageSelector(object):
36 36 
                                                 option['packagelist_file']))
37 37 
             package_list_json = json_wrapper_package_list.read()
38 38
39 
-            import platform
40 39 
             platform_packages = "packages_" + platform.machine()
41 40 
             if platform_packages in package_list_json:
42 41 
                 return package_list_json["packages"] + package_list_json[platform_packages]
... ... 
@@ -60,6 +60,10 @@ class PackageSelector(object):
60 60 
             self.inactive_screen = True
61 61 
             list(options_sorted)[0][1]['visible'] = True
62 62
63 
+        if platform.machine() == "aarch64" and 'realtime' in dict(options_sorted):
64 
+            dict(options_sorted)['realtime']['visible'] = False
65 
+
66 
+
63 67 
         default_selected = 0
64 68 
         visible_options_cnt = 0
65 69 
         for install_option in options_sorted:
support/package-builder/builder.py
History View file @ 3ad97d4
... ... 
@@ -36,6 +36,9 @@ class Builder:
36 36 
         with open(pkgJsonInput) as jsonData:
37 37 
             pkg_list_json = json.load(jsonData)
38 38 
             listPackages = pkg_list_json["packages"]
39 
+            archSpecificPkgs = "packages_" + constants.buildArch
40 
+            if archSpecificPkgs in pkg_list_json:
41 
+                listPackages += pkg_list_json[archSpecificPkgs]
39 42 
         Builder.buildSpecifiedPackages(listPackages, buildThreads, pkgBuildType, pkgInfoJsonFile, logger)
40 43
41 44