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

Adjusted the tuples 

Signed-off-by: debianpepper <peppermintosteam@proton.me>
This commit is contained in:
debianpepper 2023-08-08 21:29:52 +09:00
parent 165f4a2c93
commit e1e87f673e
2 changed files with 131 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

144
python_modules/conf.py
View File

@ -1,13 +1,38 @@
import paths
# Copy folder lists for debian 64
# Copy folder lists
# Source CHROOT
src_paths_chroot_deb64 = (paths.src_deb64_osrelease,
paths.src_deb64_osrelease,
paths.src_deb_grub_theme,
paths.src_deb64_modules,
)
src_paths_chroot_dev64 = (paths.src_dev64_osrelease,
paths.src_dev64_osrelease,
paths.src_dev_grub_theme,
paths.src_dev64_modules,
)
src_paths_chroot_dev32 = (paths.src_dev32_osrelease,
paths.src_dev32_osrelease,
paths.src_dev_grub_theme,
paths.src_dev32_modules,
)
src_paths_chroot_deb32 = (paths.src_deb32_osrelease,
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,
)
# Source NON CHROOT
src_paths_non_chroot_deb64 = ( paths.src_deb64_slpash,
paths.src_deb64_isolinux,
@ -16,22 +41,44 @@ src_paths_non_chroot_deb64 = ( paths.src_deb64_slpash,
paths.src_deb_splash_image,
paths.src_deb_live_theme
)
# Destination CHROOT
des_paths_chroot_deb64 =(paths.des_osrelease,
paths.des_osrelease_opt,
paths.des_grub_theme,
paths.des_modules,
)
# Destination NON CHROOT
des_paths_non_chroot_deb64 = (paths.des_splash,
paths.des_isolinux,
paths.des_archives,
paths.des_splash_image_isolinux,
paths.des_splash_image_grub,
paths.des_live_theme
)
src_paths_non_chroot_deb64 = ( 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,
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,
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
)
# Copy file lists for debian 64
# Copy file lists
src_files_deb64 = (paths.src_deb64_grub_etc,
paths.src_deb64_settings,
paths.src_deb64_installer,
@ -41,7 +88,70 @@ src_files_deb64 = (paths.src_deb64_grub_etc,
paths.src_deb64_sourcelist,
paths.src_main_line_pep_id
)
des_files_deb64 = (paths.des_grub_etc,
src_files_deb64 = (paths.src_dev64_grub_etc,
paths.src_dev64_settings,
paths.src_dev64_installer,
paths.src_dev64_sourcesfinal,
paths.src_dev64_bootloader,
paths.src_dev64_netinstall,
paths.src_dev64_sourcelist,
paths.src_main_line_pep_id
)
src_files_deb64 = (paths.src_dev32_grub_etc,
paths.src_dev32_settings,
paths.src_dev32_installer,
paths.src_dev32_sourcesfinal,
paths.src_dev32_bootloader,
paths.src_dev32_netinstall,
paths.src_dev32_sourcelist,
paths.src_main_line_pep_id
)
src_files_deb64 = (paths.src_deb32_grub_etc,
paths.src_deb32_settings,
paths.src_deb32_installer,
paths.src_deb32_sourcesfinal,
paths.src_deb32_bootloader,
paths.src_deb32_netinstall,
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
)
# Shared Destination
# Destination CHROOT Folders
des_paths_chroot =(paths.des_osrelease,
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
)
# Destination Files
des_files = (paths.des_grub_etc,
paths.des_setttings,
paths.des_installer,
paths.des_sourcesfinal,

8
python_modules/deb_64.py
View File

@ -46,7 +46,7 @@ def copy_deb64_specific():
"""
# Get the CHROOT Folders
source_q = collections.deque(conf.src_paths_chroot_deb64)
destination_q = collections.deque(conf.des_paths_chroot_deb64)
destination_q = collections.deque(conf.des_paths_chroot)
src_size_q = len(source_q)
for p in range(src_size_q):
x = source_q.popleft()
@ -57,7 +57,7 @@ def copy_deb64_specific():
)
# Get the NONChroot Folders
source_n = collections.deque(conf.src_paths_non_chroot_deb64)
destination_n = collections.deque(conf.des_paths_non_chroot_deb64)
destination_n = collections.deque(conf.des_paths_non_chroot)
src_size_n = len(source_n)
for p in range(src_size_n):
x = source_n.popleft()
@ -66,9 +66,9 @@ def copy_deb64_specific():
cur_dir + y,
dirs_exist_ok=True
)
# Get Specific files for Chroot
# Get Specific files for CHROOT
source_f = collections.deque(conf.src_files_deb64)
destination_f = collections.deque(conf.des_files_deb64)
destination_f = collections.deque(conf.des_files)
src_size_f = len(source_f)
for j in range(src_size_f):
w = source_f.popleft()