@@ -31,6 +31,7 @@ endif

 FULL_PACKAGE_LIST_FILE := build_install_options_all.json

 MINIMAL_PACKAGE_LIST_FILE := build_install_options_minimal.json

+RT_PACKAGE_LIST_FILE := build_install_options_rt.json

 ifdef PHOTON_PUBLISH_RPMS_PATH

 PHOTON_PUBLISH_RPMS := publish-rpms-cached

@@ -154,6 +155,29 @@ packages-minimal: check-tools photon-stage $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURC

 		$(PACKAGE_WEIGHTS) \

 		--threads ${THREADS}

+packages-rt: check-tools photon-stage $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) generate-dep-lists

+	@echo "Building minimal RPMS for Real Time..."

+	@echo ""

+	@cd $(PHOTON_PKG_BUILDER_DIR) && \

+	$(PHOTON_PACKAGE_BUILDER) \

+		--spec-path $(PHOTON_SPECS_DIR) \

+		--rpm-path $(PHOTON_RPMS_DIR) \

+		--source-path $(PHOTON_SRCS_DIR) \

+		--build-root-path $(PHOTON_CHROOT_PATH) \

+		--packages-json-input $(PHOTON_DATA_DIR)/packages_rt.json \

+		--log-path $(PHOTON_LOGS_DIR) \

+		--log-level $(LOGLEVEL) \

+		--publish-RPMS-path $(PHOTON_PUBLISH_RPMS_DIR) \

+		--pullsources-config $(PHOTON_PULLSOURCES_CONFIG) \

+		--dist-tag $(PHOTON_DIST_TAG) \

+		--build-number $(PHOTON_BUILD_NUMBER) \

+		--release-version $(PHOTON_RELEASE_VERSION) \

+		--pkginfo-file $(PHOTON_PKGINFO_FILE) \

+		$(PHOTON_RPMCHECK_FLAGS) \

+		$(PUBLISH_BUILD_DEPENDENCIES) \

+		$(PACKAGE_WEIGHTS) \

+		--threads ${THREADS}

+

 packages-initrd: check-tools photon-stage $(PHOTON_PUBLISH_RPMS) $(PHOTON_SOURCES) generate-dep-lists

 	@echo "Building all initrd package RPMS..."

 	@echo ""

@@ -403,6 +427,23 @@ minimal-iso: check-tools photon-stage $(PHOTON_PUBLISH_XRPMS) packages-minimal p

                 --pkg-to-rpm-map-file $(PHOTON_PKGINFO_FILE) \

                 --pkg-to-be-copied-conf-file $(PHOTON_GENERATED_DATA_DIR)/$(MINIMAL_PACKAGE_LIST_FILE)

+rt-iso: check-tools photon-stage $(PHOTON_PUBLISH_XRPMS) packages-rt packages-initrd

+	@echo "Building Photon Real Time ISO..."

+	@$(PHOTON_REPO_TOOL) $(PHOTON_RPMS_DIR)

+	@$(CP) -f $(PHOTON_DATA_DIR)/$(RT_PACKAGE_LIST_FILE) $(PHOTON_GENERATED_DATA_DIR)/

+	@cd $(PHOTON_IMAGE_BUILDER_DIR) && \

+	sudo $(PHOTON_IMAGE_BUILDER) \

+                --iso-path $(PHOTON_STAGE)/photon-rt-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUM).iso \

+                --debug-iso-path $(PHOTON_STAGE)/photon-rt-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).debug.iso \

+                --log-path $(PHOTON_STAGE)/LOGS \

+                --log-level $(LOGLEVEL) \

+                --rpm-path $(PHOTON_STAGE)/RPMS \

+                --srpm-path $(PHOTON_STAGE)/SRPMS \

+                --package-list-file $(PHOTON_DATA_DIR)/$(RT_PACKAGE_LIST_FILE) \

+                --generated-data-path $(PHOTON_STAGE)/common/data \

+                --pkg-to-rpm-map-file $(PHOTON_PKGINFO_FILE) \

+                --pkg-to-be-copied-conf-file $(PHOTON_GENERATED_DATA_DIR)/$(RT_PACKAGE_LIST_FILE)

+

 src-iso: check-tools photon-stage $(PHOTON_PACKAGES)

 	@echo "Building Photon Full Source ISO..."

 	@cd $(PHOTON_IMAGE_BUILDER_DIR) && \

@@ -21,6 +21,11 @@

         "include" : [],

         "additional-files" : ["ostree-repo.tar.gz"]

     },

+    "realtime" : {

+        "title" : "5. Photon Real Time",

+        "packagelist_file" : "packages_rt.json",

+        "visible" : true

+    },

     "appliance" : {

         "title" : "Minimal packages to support appliances.",

         "packagelist_file" : "packages_appliance.json",

new file mode 100644

@@ -0,0 +1,7 @@

+{

+    "realtime" : {

+        "title" : "Photon Real Time",

+        "packagelist_file" : "packages_rt.json",

+        "visible" : false

+    }

+}

new file mode 100644

@@ -0,0 +1,34 @@

+{

+    "packages": [

+                 "minimal",

+                 "linux-rt",

+                 "linux-rt-devel",

+                 "linux-tools",

+                 "initramfs",

+                 "build-essential",

+                 "git",

+                 "mpc",

+                 "tar",

+                 "less",

+                 "device-mapper",

+                 "python3",

+                 "wget",

+                 "sudo",

+                 "lvm2",

+                 "linux-firmware",

+                 "curl",

+                 "coreutils",

+                 "iputils",

+                 "pciutils",

+                 "tuna",

+                 "tuned",

+                 "linuxptp",

+                 "lxcfs",

+                 "lksctp-tools",

+                 "libhugetlbfs",

+                 "libhugetlbfs-devel",

+                 "libnuma",

+                 "libnuma-devel",

+                 "cmake"

+                 ]

+}

@@ -66,7 +66,8 @@ class Installer(object):

         'setup_grub_script',

         'shadow_password',

         'type',

-        'ui'

+        'ui',

+        'linux_flavor'

     }

     default_partitions = [{"mountpoint": "/", "size": 0, "filesystem": "ext4"}]

@@ -232,8 +233,13 @@ class Installer(object):

         if not 'disk' in install_config:

             return "No disk configured"

-        if 'install_linux_esx' not in install_config:

-            install_config['install_linux_esx'] = False

+

+        if 'linux_flavor' not in install_config:

+            if install_config.get('install_linux_esx', False) == True:

+                install_config['linux_flavor'] = "linux-esx"

+            else:

+                install_config['linux_flavor'] = "linux"

+        install_config['install_linux_esx'] = False

         # Perform following checks here:

         # 1) Only one extensible partition is allowed per disk

@@ -779,9 +785,47 @@ class Installer(object):

                 self.install_config['packages'] = list(filter(regex.match,self.install_config['packages']))

             self.install_config['packages'].append('linux-esx')

         else:

-            regex = re.compile(r'(?!linux-esx-[0-9].*)')

-            self.install_config['packages'] = list(filter(regex.match,self.install_config['packages']))

+            if 'linux-esx' in self.install_config['packages']:

+                self.install_config['packages'].remove('linux-esx')

+            else:

+                regex = re.compile(r'(?!linux-esx-[0-9].*)')

+                self.install_config['packages'] = list(filter(regex.match,self.install_config['packages']))

+

+    def filter_packages(self, package):

+        all_linux_flavors = ["", "esx", "aws", "secure", "rt"]

+        linux_dependencies = ["devel", "drivers", "docs", "oprofile", "dtb", "hmacgen"]

+        redundent_linux_flavors = list(filter(self.filter_flavors, all_linux_flavors))

+        package = package.split('-')

+        if len(package) > 1:

+            flavor = package[1]

+        else:

+            flavor = ""

+        if(package[0] != "linux"):

+            return True

+        elif("" in redundent_linux_flavors and flavor in linux_dependencies):

+            return False

+        elif(flavor in redundent_linux_flavors):

+            return False

+        else:

+            return True

+

+    def filter_flavors(self, linux_flavor):

+        selected_linux_flavor = self.install_config['linux_flavor'].split('-')

+        if len(selected_linux_flavor) > 1:

+            selected_linux_flavor = selected_linux_flavor[1]

+        else:

+            selected_linux_flavor = ""

+        if(linux_flavor == selected_linux_flavor):

+            return False

+        else:

+            return True

+    def _adjust_packages_based_on_selected_flavor(self):

+        """

+        Install slected linux flavor only

+        """

+        if 'linux_flavor' in self.install_config:

+            self.install_config['packages'] = list(filter(self.filter_packages,self.install_config['packages']))

     def _add_packages_to_install(self, package):

         """

@@ -830,7 +874,7 @@ class Installer(object):

         """

         Install packages using tdnf command

         """

-        self._adjust_packages_for_vmware_virt()

+        self._adjust_packages_based_on_selected_flavor()

         selected_packages = self.install_config['packages']

         state = 0

         packages_to_install = {}

@@ -255,9 +255,8 @@ class IsoConfig(object):

             fd = FileDownloader(maxy, maxx, install_config, title, intro, dest, True)

             items.append((fd.display, True))

-        if CommandUtils.is_vmware_virtualization():

-            linux_selector = LinuxSelector(maxy, maxx, install_config)

-            items.append((linux_selector.display, True))

+        linux_selector = LinuxSelector(maxy, maxx, install_config)

+        items.append((linux_selector.display, True))

         items.append((hostname_reader.get_user_string, True))

         items.append((root_password_reader.get_user_string, True))

         items.append((confirm_password_reader.get_user_string, False))

@@ -235,4 +235,10 @@ Kickstart config file is a json format with following possible parameters:

 	Default value: false

 	Example: { "ui": true }

+"linux_flavor" (optional)

+	Contains the flavor of linux to install, if multiple linux flavors

+	are present in "packages" or "packagelist_file"

+	Acceptable values are: "linux", "linux-esx", "linux-rt", "linux-aws", and "linux-secure"

+	Example: { "linux_flavor": "linux-esx" }

+

 For reference, look at "sample_ks.cfg" file

@@ -6,6 +6,7 @@

 from menu import Menu

 from window import Window

 from actionresult import ActionResult

+from commandutils import CommandUtils

 class LinuxSelector(object):

     def __init__(self, maxy, maxx, install_config):

@@ -13,16 +14,33 @@ class LinuxSelector(object):

         self.maxx = maxx

         self.maxy = maxy

         self.win_width = 60

-        self.win_height = 13

+        self.win_height = 16

         self.win_starty = (self.maxy - self.win_height) // 2

         self.win_startx = (self.maxx - self.win_width) // 2

         self.menu_starty = self.win_starty + 6

+    def set_linux_esx_installation(self, is_linux_esx):

+        self.install_config['install_linux_esx'] = is_linux_esx

+        return ActionResult(True, None)

+

+    def set_linux_installation(self, selected_linux_package):

+        self.install_config['linux_flavor'] = selected_linux_package

+        return ActionResult(True, None)

+

+    def create_available_linux_menu(self):

+        linux_flavors = {"linux":"Generic", "linux-esx":"VMware hypervisor optimized", "linux-aws":"AWS optimized", "linux-secure":"Security hardened", "linux-rt":"Real Time"}

+

         self.menu_items = []

-        self.menu_items.append(("1. VMware hypervisor optimized", self.set_linux_esx_installation, True))

-        self.menu_items.append(("2. Generic", self.set_linux_esx_installation, False))

+        for flavor,menu_entry in linux_flavors.items():

+            if flavor in self.install_config['packages']:

+                if flavor == "linux-esx" and not CommandUtils.is_vmware_virtualization():

+                    continue

+                self.menu_items.append((menu_entry, self.set_linux_installation, flavor))

+

+        if len(self.menu_items) == 1:

+            self.install_config['linux_flavor'] = self.menu_items[0][2]

         self.host_menu = Menu(self.menu_starty, self.maxx, self.menu_items,

                               default_selected=0, tab_enable=False)

@@ -32,15 +50,13 @@ class LinuxSelector(object):

                              position=1, can_go_next=True)

         self.window.set_action_panel(self.host_menu)

-    def set_linux_esx_installation(self, is_linux_esx):

-        self.install_config['install_linux_esx'] = is_linux_esx

-        return ActionResult(True, None)

-

     def display(self):

         if 'ostree' in self.install_config:

             return ActionResult(None, {"inactive_screen": True})

-        self.window.addstr(0, 0, 'The installer has detected that you are installing')

-        self.window.addstr(1, 0, 'Photon OS on a VMware hypervisor.')

-        self.window.addstr(2, 0, 'Which type of Linux kernel would you like to install?')

+        self.create_available_linux_menu()

+        if len(self.menu_items) < 2:

+            return ActionResult(None, {"inactive_screen": True})

+

+        self.window.addstr(0, 0, 'Which type of Linux kernel would you like to install?')

         return self.window.do_action()

@@ -34,7 +34,7 @@ def create_pkg_list_to_copy_to_iso(build_install_option, output_data_path):

     packages = []

     for install_option in options_sorted:

         if install_option[0] != "iso":

-            file_path = os.path.join(output_data_path, install_option[1]["packagelist_file"])

+            file_path = os.path.join(output_data_path, os.path.splitext(install_option[1]["packagelist_file"])[0]+"_expanded.json")

             package_list_json = Utils.jsonread(file_path)

             packages = packages + package_list_json["packages"]

     return packages

@@ -253,8 +253,9 @@ def main():

             for json_file in list_json_files:

                 output_file = None

                 if options.display_option == "json":

-                    output_file = os.path.join(options.output_dir, os.path.basename(json_file))

+                    output_file = os.path.join(options.output_dir, os.path.splitext(os.path.basename(json_file))[0]+"_expanded.json")

                     specDeps.process(options.input_type, json_file, options.display_option, output_file)

+                    shutil.copyfile(json_file, os.path.join(options.output_dir, os.path.basename(json_file)))

     except Exception as e:

         traceback.print_exc()

         sys.stderr.write(str(e))