@@ -68,6 +68,7 @@ micro-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MICRO)

 	@cd $(PHOTON_INSTALLER_DIR) && \

         $(PHOTON_INSTALLER) \

                 -i $(PHOTON_STAGE)/photon-micro-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).iso \

+                -k $(PHOTON_STAGE)/photon-micro-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).debug.iso \

                 -w $(PHOTON_STAGE)/photon_iso \

                 -l $(PHOTON_STAGE)/LOGS \

                 -r $(PHOTON_STAGE)/RPMS \

@@ -104,6 +105,7 @@ minimal-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MINIMAL)

 	@cd $(PHOTON_INSTALLER_DIR) && \

         $(PHOTON_INSTALLER) \

                 -i $(PHOTON_STAGE)/photon-minimal-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).iso \

+                -k $(PHOTON_STAGE)/photon-minimal-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).debug.iso \

                 -w $(PHOTON_STAGE)/photon_iso \

                 -l $(PHOTON_STAGE)/LOGS \

                 -r $(PHOTON_STAGE)/RPMS \

@@ -135,6 +137,7 @@ live-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES_MINIMAL) minimal-iso

 	@cd $(PHOTON_INSTALLER_DIR) && \

         $(PHOTON_INSTALLER) \

                 -i $(PHOTON_STAGE)/photon-live-iso-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).iso \

+                -k $(PHOTON_STAGE)/photon-live-iso-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).debug.iso \

                 -w $(PHOTON_STAGE)/photon_iso \

                 -l $(PHOTON_STAGE)/LOGS \

                 -r $(PHOTON_STAGE)/RPMS \

@@ -168,6 +171,7 @@ iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES) ostree-repo

 	@cd $(PHOTON_INSTALLER_DIR) && \

         sudo $(PHOTON_INSTALLER) \

                 -i $(PHOTON_STAGE)/photon-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER).iso \

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

                 -w $(PHOTON_STAGE)/photon_iso \

                 -l $(PHOTON_STAGE)/LOGS \

                 -r $(PHOTON_STAGE)/RPMS \

@@ -184,6 +188,7 @@ custom-iso: check $(PHOTON_STAGE) $(PHOTON_PACKAGES)

 	@cd $(PHOTON_INSTALLER_DIR) && \

         sudo $(PHOTON_INSTALLER) \

                 -i $(PHOTON_STAGE)/photon-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER)-custom.iso \

+                -k $(PHOTON_STAGE)/photon-$(PHOTON_RELEASE_VERSION)-$(PHOTON_BUILD_NUMBER)-custom.debug.iso \

                 -w $(PHOTON_STAGE)/photon_iso \

                 -l $(PHOTON_STAGE)/LOGS \

                 -r $(PHOTON_STAGE)/RPMS \

@@ -126,7 +126,7 @@ def create_rpm_list_to_be_copied_to_iso(pkg_to_rpm_map_file, build_install_optio

                 rpm_list.append(get_file_name_with_last_folder(filename))

             if not pkg_to_rpm_map[k]['debugrpm'] is None and bool(copy_flags & 2):

                 filename = pkg_to_rpm_map[k]['debugrpm']

-                rpm_list.append(get_file_name_with_last_folder(filename))

+                rpm_list.append(pkg_to_rpm_map[k]['debugrpm'])

             if not pkg_to_rpm_map[k]['sourcerpm'] is None and bool(copy_flags & 4):

                 rpm_list.append(pkg_to_rpm_map[k]['sourcerpm'])

     return rpm_list

@@ -167,12 +167,34 @@ def make_src_iso(working_directory, src_iso_path, rpm_list):

     process = subprocess.Popen(['rm', '-rf', options.working_directory])

     retval = process.wait()

+def make_debug_iso(working_directory, debug_iso_path, rpm_list):

+    if os.path.isdir(working_directory):

+        process = subprocess.Popen(['rm', '-rf', working_directory])

+        retval = process.wait()

+    process = subprocess.Popen(['mkdir', '-p', os.path.join(working_directory, "DEBUGRPMS")])

+    retval = process.wait()

+    for aaa in rpm_list:

+        if os.path.isfile(aaa):

+            dirname = os.path.dirname(aaa)

+            lastfolder = os.path.basename(dirname)

+            dest_working_directory = os.path.join(working_directory, "DEBUGRPMS", lastfolder)

+            if not os.path.isdir(dest_working_directory):

+                process = subprocess.Popen(['mkdir', dest_working_directory])

+                retval = process.wait()

+            process = subprocess.Popen(['cp', aaa, dest_working_directory])

+            retval = process.wait()

+    process = subprocess.Popen(['mkisofs', '-r', '-o', debug_iso_path, working_directory])

+    retval = process.wait()

+    process = subprocess.Popen(['rm', '-rf', options.working_directory])

+    retval = process.wait()

+

 if __name__ == '__main__':

     usage = "Usage: %prog [options] <config file> <tools path>"

     parser = OptionParser(usage)

     parser.add_option("-i", "--iso-path",  dest="iso_path")

     parser.add_option("-j", "--src-iso-path",  dest="src_iso_path")

+    parser.add_option("-k", "--debug-iso-path",  dest="debug_iso_path")

     parser.add_option("-v", "--vmdk-path", dest="vmdk_path")

     parser.add_option("-w",  "--working-directory",  dest="working_directory", default="/mnt/photon-root")

     parser.add_option("-l",  "--log-path",  dest="log_path", default="../stage/LOGS")

@@ -265,18 +287,22 @@ if __name__ == '__main__':

         # Making the iso if needed

         if options.iso_path:

-            rpm_list = " ".join(create_rpm_list_to_be_copied_to_iso(options.pkg_to_rpm_map_file, options.pkg_to_be_copied_conf_file, 3, options.output_data_path))

+            rpm_list = " ".join(create_rpm_list_to_be_copied_to_iso(options.pkg_to_rpm_map_file, options.pkg_to_be_copied_conf_file, 1, options.output_data_path))

             files_to_copy = " ".join(create_additional_file_list_to_copy_in_iso(os.path.abspath(options.stage_path), options.package_list_file))

             live_cd = get_live_cd_status_string(options.package_list_file)

             process = subprocess.Popen(['./mk-install-iso.sh', '-w', options.working_directory, options.iso_path, options.rpm_path, options.package_list_file, rpm_list, options.stage_path, files_to_copy, live_cd, options.json_data_path])

             retval = process.wait()

+        if options.debug_iso_path:

+            debug_rpm_list = create_rpm_list_to_be_copied_to_iso(options.pkg_to_rpm_map_file, options.pkg_to_be_copied_conf_file, 2, options.output_data_path)

+            make_debug_iso(options.working_directory, options.debug_iso_path, debug_rpm_list)

+

         # Cleaning up for vmdk

         if 'vmdk_install' in config and config['vmdk_install']:

             process = subprocess.Popen(['./mk-clean-vmdk.sh', config['disk']['disk']])

             process.wait()

         #Clean up the working directories

-        if (options.iso_path or options.vmdk_path):

+        if (options.iso_path or options.vmdk_path or options.debug_iso_path):

             process = subprocess.Popen(['rm', '-rf', options.working_directory])

             retval = process.wait()