diff --git a/python_modules/conf.py b/python_modules/conf.py index add93b47..ff667678 100644 --- a/python_modules/conf.py +++ b/python_modules/conf.py @@ -1,7 +1,8 @@ import paths - +########################## # Copy folder lists +######################### # Source CHROOT src_paths_chroot_deb64 = (paths.src_deb64_osrelease, paths.src_deb64_osrelease, @@ -23,16 +24,12 @@ src_paths_chroot_deb32 = (paths.src_deb32_osrelease, paths.src_deb_grub_theme, paths.src_deb32_modules, ) -#src_paths_chroot_debarm = (paths.src_debarm_osrelease, -# paths.src_debarm_osrelease, -# paths.src_deb_grub_theme, -# paths.src_debarm_modules, -# ) -#src_paths_chroot_devarm = (paths.src_devarm_osrelease, -# paths.src_devarm_osrelease, -# paths.src_dev_grub_theme, -# paths.src_devarm_modules, - #) +src_paths_chroot_debarm = (paths.src_debarm_osrelease, + paths.src_debarm_modules, + ) +src_paths_chroot_devarm = (paths.src_devarm_osrelease, + paths.src_devarm_modules, + ) # Source NON CHROOT src_paths_non_chroot_deb64 = ( paths.src_deb64_slpash, paths.src_deb64_isolinux, @@ -41,44 +38,38 @@ src_paths_non_chroot_deb64 = ( paths.src_deb64_slpash, paths.src_deb_splash_image, paths.src_deb_live_theme ) -src_paths_non_chroot_deb64 = ( paths.src_dev64_slpash, +src_paths_non_chroot_dev64 = ( paths.src_dev64_slpash, paths.src_dev64_isolinux, paths.src_dev64_multi, paths.src_dev_splash_image, paths.src_dev_splash_image, paths.src_dev_live_theme ) -src_paths_non_chroot_deb64 = ( paths.src_dev32_slpash, +src_paths_non_chroot_dev32 = ( paths.src_dev32_slpash, paths.src_dev32_isolinux, paths.src_dev32_multi, paths.src_dev_splash_image, paths.src_dev_splash_image, paths.src_dev_live_theme - ) -src_paths_non_chroot_deb64 = ( paths.src_deb32_slpash, + ) +src_paths_non_chroot_deb32 = ( paths.src_deb32_slpash, paths.src_deb32_isolinux, paths.src_deb32_multi, paths.src_deb_splash_image, paths.src_deb_splash_image, paths.src_deb_live_theme - ) -#src_paths_non_chroot_deb64 = ( paths.src_debarm_slpash, -# paths.src_debarm_isolinux, -# paths.src_debarm_multi, -# paths.src_debarm_splash_image, -# paths.src_debarm_splash_image, -# paths.src_debarm_live_theme -# ) -#src_paths_non_chroot_deb64 = ( paths.src_devarm_slpash, -# paths.src_devarm_isolinux, -# paths.src_devarm_multi, -# paths.src_devarm_splash_image, -# paths.src_devarm_splash_image, -# paths.src_devarm_live_theme -# ) - - + ) +src_paths_non_chroot_debarm = ( paths.src_debarm_slpash, + paths.src_debarm_isolinux, + paths.src_debarm_multi, + ) +src_paths_non_chroot_devarm = ( paths.src_devarm_slpash, + paths.src_devarm_isolinux, + paths.src_devarm_multi, +#################### # Copy file lists +#################### +# Specific files src_files_deb64 = (paths.src_deb64_grub_etc, paths.src_deb64_settings, paths.src_deb64_installer, @@ -88,7 +79,7 @@ src_files_deb64 = (paths.src_deb64_grub_etc, paths.src_deb64_sourcelist, paths.src_main_line_pep_id ) -src_files_deb64 = (paths.src_dev64_grub_etc, +src_files_dev64 = (paths.src_dev64_grub_etc, paths.src_dev64_settings, paths.src_dev64_installer, paths.src_dev64_sourcesfinal, @@ -97,7 +88,7 @@ src_files_deb64 = (paths.src_dev64_grub_etc, paths.src_dev64_sourcelist, paths.src_main_line_pep_id ) -src_files_deb64 = (paths.src_dev32_grub_etc, +src_files_dev32 = (paths.src_dev32_grub_etc, paths.src_dev32_settings, paths.src_dev32_installer, paths.src_dev32_sourcesfinal, @@ -106,7 +97,7 @@ src_files_deb64 = (paths.src_dev32_grub_etc, paths.src_dev32_sourcelist, paths.src_main_line_pep_id ) -src_files_deb64 = (paths.src_deb32_grub_etc, +src_files_deb32 = (paths.src_deb32_grub_etc, paths.src_deb32_settings, paths.src_deb32_installer, paths.src_deb32_sourcesfinal, @@ -115,40 +106,40 @@ src_files_deb64 = (paths.src_deb32_grub_etc, paths.src_deb32_sourcelist, paths.src_main_line_pep_id ) -#src_files_deb64 = (paths.src_debarm_grub_etc, -# paths.src_debarm_settings, -# paths.src_debarm_installer, -## paths.src_debarm_sourcesfinal, - # paths.src_debarm_bootloader, - # paths.src_debarm_netinstall, - # paths.src_debarm_sourcelist, - # paths.src_main_line_pep_id -# ) -#src_files_deb64 = (paths.src_devarm_grub_etc, -# paths.src_devarm_settings, -# paths.src_devarm_installer, -# paths.src_devarm_sourcesfinal, -# paths.src_devarm_bootloader, -# paths.src_devarm_netinstall, -# paths.src_devarm_sourcelist, -# paths.src_main_line_pep_id -# ) - +src_files_debarm = (paths.src_debarm_grub_etc, + paths.src_debarm_settings, + paths.src_debarm_installer, + paths.src_debarm_sourcesfinal, + paths.src_debarm_bootloader, + paths.src_debarm_netinstall, + paths.src_debarm_sourcelist, + ) +src_files_devarm = (paths.src_devarm_grub_etc, + paths.src_devarm_settings, + paths.src_devarm_installer, + paths.src_devarm_sourcesfinal, + paths.src_devarm_bootloader, + paths.src_devarm_netinstall, + paths.src_devarm_sourcelist, + ) +########################## # Shared Destination +########################## # Destination CHROOT Folders des_paths_chroot =(paths.des_osrelease, - paths.des_osrelease_opt, - paths.des_grub_theme, - paths.des_modules, - ) + paths.des_osrelease_opt, + paths.des_grub_theme, + paths.des_modules, + ) + # Destination NON CHROOT Folders des_paths_non_chroot = (paths.des_splash, - paths.des_isolinux, - paths.des_archives, - paths.des_splash_image_isolinux, - paths.des_splash_image_grub, - paths.des_live_theme - ) + paths.des_isolinux, + paths.des_archives, + paths.des_splash_image_isolinux, + paths.des_splash_image_grub, + paths.des_live_theme + ) # Destination Files des_files = (paths.des_grub_etc, @@ -161,27 +152,35 @@ des_files = (paths.des_grub_etc, paths.des_main_line_pep_id ) +########################## +# Commands to be run +########################## # Run Deb 64 Commands -deb_64_cmds= ('lbinit', - 'inflate_bubble.set_fusato_structure', - 'inflate_bubble.set_desktop_environment', - 'inflate_bubble.set_extra_packages', - 'inflate_bubble.set_general_packages', - 'inflate_bubble.set_system_packages', - 'inflate_bubble.set_system_packages_64', - 'inflate_bubble.set_python_packages', - 'inflate_bubble.set_calamares_packages', - 'inflate_bubble.set_firmware_packages', + +shared_setup_cmds = ('lbinit', + 'inflate_bubble.set_fusato_structure', + 'inflate_bubble.set_desktop_environment', + 'inflate_bubble.set_extra_packages', + 'inflate_bubble.set_general_packages', + 'inflate_bubble.set_system_packages', + 'inflate_bubble.set_python_packages', + 'inflate_bubble.set_calamares_packages', + 'inflate_bubble.set_firmware_packages', + 'copy_folders.copy_folders_files', + 'copy_files_specified.copy_specific_files', + 'copy_files_specified.set_symlinks', + ) + +shared_run_build('run_build', + 'finish_cleanup.make_check_sum', + 'finish_cleanup.copy_iso_file_nightly_deb64', + 'finish_cleanup.copy_iso_file_prod_deb64', + 'finish_cleanup.kill_old_iso' + ) + +deb_64_cmds= ('inflate_bubble.set_system_packages_64', 'inflate_bubble.set_binary_packages_64', - 'copy_folders.copy_folders_files', - 'copy_files_specified.copy_specific_files', - 'copy_files_specified.set_symlinks', 'copy_deb64_specific', - 'run_build', - 'finish_cleanup.make_check_sum', - 'finish_cleanup.copy_iso_file_nightly_deb64', - 'finish_cleanup.copy_iso_file_prod_deb64', - 'finish_cleanup.kill_old_iso' ) ### Inflate bubble section diff --git a/python_modules/deb_64.py b/python_modules/deb_64.py index 7e6765ed..40297bf1 100644 --- a/python_modules/deb_64.py +++ b/python_modules/deb_64.py @@ -55,6 +55,7 @@ def copy_deb64_specific(): WP_CHROOT + y, dirs_exist_ok=True ) + # Get the NONChroot Folders source_n = collections.deque(conf.src_paths_non_chroot_deb64) destination_n = collections.deque(conf.des_paths_non_chroot) @@ -66,6 +67,7 @@ def copy_deb64_specific(): cur_dir + y, dirs_exist_ok=True ) + # Get Specific files for CHROOT source_f = collections.deque(conf.src_files_deb64) destination_f = collections.deque(conf.des_files) @@ -90,9 +92,26 @@ def execute_build_cmds(): """ Loop through the commands for the Build Process """ - cmd_list = collections.deque(conf.deb_64_cmds) - cmd_size = len(cmd_list) - for h in range(cmd_size): + # Setup the structure + cmd_list_setup = collections.deque(conf.shared_setup_cmds) + cmd_size_setup = len(cmd_list_setup) + for h in range(cmd_size_setup): + x = cmd_list.popleft() + execute = x + '()' + exec(execute) + + # Arch Specific Commands + cmd_list_64 = collections.deque(conf.deb_64_cmds) + cmd_size_64 = len(cmd_list_64) + for h in range(cmd_size_64): + x = cmd_list.popleft() + execute = x + '()' + exec(execute) + + # Run the Build + cmd_list_build = collections.deque(conf.shared_run_build) + cmd_size_build = len(cmd_list_build) + for h in range(cmd_size_build): x = cmd_list.popleft() execute = x + '()' exec(execute)