Peppermint
/
bubbles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Using a que on build defs 

Signed-off-by: debianpepper <peppermintosteam@proton.me>
This commit is contained in:
debianpepper 2023-08-05 21:04:10 +09:00
parent 9bdd870ff1
commit 76829d2e66
2 changed files with 93 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
python_modules/conf.py
View File

@ -1,6 +1,11 @@
import paths
#import paths
#import inflate_bubble
#import finish_cleanup
#import copy_folders
#import copy_files_specified
src_paths = [paths.src_deb64_osrelease,
# 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,
@ -12,7 +17,7 @@ src_paths = [paths.src_deb64_osrelease,
paths.src_deb_live_theme
]
des_paths =[paths.des_osrelease,
des_paths_deb64 =[paths.des_osrelease,
paths.des_osrelease_opt,
paths.des_splash,
paths.des_isolinux,
@ -24,6 +29,49 @@ des_paths =[paths.des_osrelease,
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()
]

100
python_modules/deb_64.py
View File

@ -39,41 +39,29 @@ 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
)
@ -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()