diff --git a/python_modules/conf.py b/python_modules/conf.py index 7fc60091..8b8732d0 100644 --- a/python_modules/conf.py +++ b/python_modules/conf.py @@ -1,29 +1,77 @@ -import paths +#import paths +#import inflate_bubble +#import finish_cleanup +#import copy_folders +#import copy_files_specified -src_paths = [paths.src_deb64_osrelease, - paths.src_deb64_osrelease, - paths.src_deb64_slpash, - paths.src_deb64_isolinux, - paths.src_deb64_multi, - paths.src_deb_grub_theme, - paths.src_deb64_modules, - paths.src_deb_splash_image, - paths.src_deb_splash_image, - paths.src_deb_live_theme - ] +# Copy folder lists for debian 64 +src_paths_deb64 = [paths.src_deb64_osrelease, + paths.src_deb64_osrelease, + paths.src_deb64_slpash, + paths.src_deb64_isolinux, + paths.src_deb64_multi, + paths.src_deb_grub_theme, + paths.src_deb64_modules, + paths.src_deb_splash_image, + paths.src_deb_splash_image, + paths.src_deb_live_theme + ] -des_paths =[paths.des_osrelease, - paths.des_osrelease_opt, - paths.des_splash, - paths.des_isolinux, - paths.des_archives, - paths.des_grub_theme, - paths.des_modules, - paths.des_splash_image_isolinux, - paths.des_splash_image_grub, - paths.des_live_theme - ] +des_paths_deb64 =[paths.des_osrelease, + paths.des_osrelease_opt, + paths.des_splash, + paths.des_isolinux, + paths.des_archives, + paths.des_grub_theme, + paths.des_modules, + paths.des_splash_image_isolinux, + paths.des_splash_image_grub, + paths.des_live_theme + ] +# Copy file lists for debian 64 +src_files_deb64 = [paths.src_deb64_grub_etc, + paths.src_deb64_settings, + paths.src_deb64_installer, + paths.src_deb64_sourcesfinal, + paths.src_deb64_bootloader, + paths.src_deb64_netinstall, + paths.src_deb64_sourcelist, + paths.src_main_line_pep_id + ] +des_files_deb64 = [paths.des_grub_etc, + paths.des_setttings, + paths.des_installer, + paths.des_sourcesfinal, + paths.des_bootloader, + paths.des_netinstall, + paths.des_sourcelist, + paths.des_main_line_pep_id + ] + +# Debian 64 def list +cmd_deb64_q = [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_artwork_packages(), + inflate_bubble.set_python_packages(), + inflate_bubble.set_calamares_packages(), + inflate_bubble.set_firmware_packages(), + 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() + ] diff --git a/python_modules/deb_64.py b/python_modules/deb_64.py index b7efef90..b3533398 100644 --- a/python_modules/deb_64.py +++ b/python_modules/deb_64.py @@ -39,42 +39,30 @@ def lbinit(): def copy_deb64_specific(): - """" Debian 64 copy jobs""" - source_q = collections.deque(conf.src_paths) - destination_q = collections.deque(conf.des_paths) - src_size = len(source_q) - for p in range(src_size): + """" Debian 64 copy jobs + First we copy all the folder trees + Then we copy specific files. + The inputs are stored in the conf.py file + """ + source_q = collections.deque(conf.src_paths_deb64) + destination_q = collections.deque(conf.des_paths_deb64) + src_size_q = len(source_q) + for p in range(src_size_q): x = source_q.popleft() y = destination_q.popleft() shutil.copytree(cur_dir + x, WP_CHROOT + y, dirs_exist_ok=True ) - - shutil.copy(cur_dir + paths.src_deb64_grub_etc, - WP_CHROOT + paths.des_grub_etc - ) - shutil.copy(cur_dir + paths.src_deb64_settings, - WP_CHROOT + paths.des_setttings - ) - shutil.copy(cur_dir + paths.src_deb64_installer, - WP_CHROOT + paths.des_installer - ) - shutil.copy(cur_dir + paths.src_deb64_sourcesfinal, - WP_CHROOT + paths.des_sourcesfinal - ) - shutil.copy(cur_dir + paths.src_deb64_bootloader, - WP_CHROOT + paths.des_bootloader - ) - shutil.copy(cur_dir + paths.src_deb64_netinstall, - WP_CHROOT + paths.des_netinstall - ) - shutil.copy(cur_dir + paths.src_deb64_sourcelist, - WP_CHROOT + paths.des_sourcelist - ) - shutil.copy(cur_dir + paths.src_main_line_pep_id, - WP_CHROOT + paths.des_main_line_pep_id - ) + source_f = collections.deque(conf.src_files_deb64) + destination_f = collections.deque(conf.des_files_deb64) + src_size_f = len(source_f) + for j in range(src_size_f): + w = source_f.popleft() + e = destination_f.popleft() + shutil.copy(cur_dir + w, + WP_CHROOT + e + ) def run_build(): @@ -84,64 +72,18 @@ def run_build(): os.chdir('fusato') os.system(run_cmd) - def readybuild(): """" Ready the bld structure""" if os.path.exists('fusato'): rm_cmd = "sudo rm -r -f fusato" os.system(rm_cmd) os.makedirs('fusato') - # Run lb config to begin the setup - lbinit() - # Prep the folders - inflate_bubble.set_fusato_structure() - # Packages - 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_artwork_packages() - inflate_bubble.set_python_packages() - inflate_bubble.set_calamares_packages() - inflate_bubble.set_firmware_packages() - 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() - + cmd_q = collections.deque(conf.cmd_deb64_q) + cmd_q.popleft() else: os.makedirs('fusato') - # Run lb config to begin the setup - lbinit() - # Prep the folders - inflate_bubble.set_fusato_structure() - # Packages - 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_artwork_packages() - inflate_bubble.set_python_packages() - inflate_bubble.set_calamares_packages() - inflate_bubble.set_firmware_packages() - 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() + cmd_q.popleft() +