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

Testing: Mods to the Debian 64 build in bubbles 

Signed-off-by: debianpepper <pdpdebdevuan@protonmail.com>
This commit is contained in:
debianpepper 2023-09-29 19:23:45 +09:00
parent 8c11dfa154
commit 8066a56bf9
1 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
python_modules/build_iso.py
View File

@ -57,39 +57,66 @@ class BuildXfce:
print("No base has been found") print("No base has been found")
def debian_build(self):
"""
Used to build the Debian base XFCE ISO
"""
if self.sarch == '_64':
self.build_deb_64()
elif self.sarch == '_32':
self.build_deb_32()
elif self.sarch == '_arm':
self.build_deb_arm()
else:
logger.warning("No active build specified!")
def build_deb_64(self): def build_deb_64(self):
""" Builds the 64bit ISO XFCE""" """ Builds the 64bit ISO XFCE"""
current_working_directory = os.getcwd() current_working_directory = os.getcwd()
dir_current = "Current working directory" + current_working_directory dir_current = "Current working directory" + current_working_directory
logger.info("Building a Debian based 64 bit ISO") logger.info("Building a " + self.sbase + self.sarch[1:] + " bit ISO")
logger.info(dir_current) logger.info(dir_current)
# Set the config tree # Set the config tree
lbsetup = conf.LBSET_DEB64 bit_arch = self.sarch[1:]
if bit_arch == 64:
lbsetup = conf.LBSET_DEB64
elif bit_arch == 32:
lbsetup = conf.LBSET_DEB32
elif bit_arch == "arm":
lbsetup = conf.LBSET_DEBARM
else:
lbsetup = None
os.system(lbsetup) os.system(lbsetup)
logger.info(CFG_TREE_READY) logger.info(CFG_TREE_READY)
# Start with the XFCE stuff # Start with the XFCE stuff
cmd_list_64 = collections.deque(conf.build64_xfce_build) if bit_arch == 64:
list_size_64 = len(cmd_list_64) cmd_list = collections.deque(conf.build64_xfce_build)
for _ in range(list_size_64): elif bit_arch == 32:
i = cmd_list_64.popleft() cmd_list = collections.deque(conf.build32_xfce_build)
elif bit_arch == "arm":
cmd_list = collections.deque(conf.buildarm_xfce_build)
else:
cmd_list = None
list_size = len(cmd_list)
for _ in range(list_size):
i = cmd_list.popleft()
execute = i + '()' execute = i + '()'
exec(execute) exec(execute)
# Run the specific classes # Run the specific classes
infra.ChrootFolders("deb", "_64") infra.ChrootFolders(self.sbase, self.sarch)
infra.BinaryFolders("deb", "_64") infra.BinaryFolders(self.sbase, self.sarch)
infra.ArchitectureFiles("deb", "_64") infra.ArchitectureFiles(self.sbase, self.sarch)
infra.Archive("deb", "_64") infra.Archive(self.sbase, self.sarch)
# Run the Build # Run the Build
logger.info(CFG_READY) logger.info(CFG_READY)
logger.info(START_LIVEBUILD) logger.info(START_LIVEBUILD)
logger.info(dir_current) logger.info(dir_current)
lbsetup = conf.LBSET_DEB64
os.system(lbsetup) os.system(lbsetup)
run_cmd = 'sudo lb build' run_cmd = 'sudo lb build'
current_working_directory = os.getcwd() current_working_directory = os.getcwd()
os.chdir(HOME_FOLDER + FUSATO_ROOT) os.chdir(HOME_FOLDER + FUSATO_ROOT)
# Set the build inidcator # Set the build inidcator
inflate_bubble.make_bld_xfce("deb", "64") inflate_bubble.make_bld_xfce(self.sbase, self.sarch[1:])
logger.info(dir_current) logger.info(dir_current)
os.system(run_cmd) os.system(run_cmd)
logger.info(BUILD_COMPLETED) logger.info(BUILD_COMPLETED)
@ -186,18 +213,7 @@ class BuildXfce:
logger.info(BUILD_COMPLETED) logger.info(BUILD_COMPLETED)
def debian_build(self):
"""
Used to build the Debian base XFCE ISO
"""
if self.sarch == '_64':
self.build_deb_64()
elif self.sarch == '_32':
self.build_deb_32()
elif self.sarch == '_arm':
self.build_deb_arm()
else:
logger.warning("No active build specified!")
def build_dev_64(self): def build_dev_64(self):