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

Trouble Shooting: Arch Variables 

Signed-off-by: debianpepper <pdpdebdevuan@protonmail.com>
This commit is contained in:
debianpepper 2023-09-24 00:19:18 +09:00
parent d76789bfa9
commit 3903335d1a
1 changed files with 92 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

181
python_modules/build_iso.py
View File

@ -21,12 +21,8 @@ HOME_FOLDER = str(Path(BSTRING_ISO_CONFIGS).expanduser())
FUSATO_ROOT = '/fusato'
WPCHROOT = '/fusato/config/includes.chroot'
# Set the architecture variables
deb_base = 'deb'
dev_base = 'dev'
arch_64 = '_64'
arch_32 = '_32'
arch_arm = '_arm'
# Set up the logging format
logger = logging.getLogger()
@ -54,10 +50,10 @@ class BuildXfce:
self.sarch = sarch
os.chdir(HOME_FOLDER + FUSATO_ROOT)
# Determine what base to build
if sbase == deb_base:
if sbase == "deb":
# Run the Debian Build
self.debian_build()
elif sbase == dev_base:
elif sbase == "dev":
self.devuan_build()
else:
print("No base has been found")
@ -81,9 +77,9 @@ class BuildXfce:
execute = i + '()'
exec(execute)
# Run the specific classes
infra.ChrootFolders(deb_base, deb_base)
infra.BinaryFolders(deb_base, deb_base)
infra.ArchitectureFiles(deb_base, deb_base)
infra.ChrootFolders("deb", "_64")
infra.BinaryFolders("deb", "_64")
infra.ArchitectureFiles("deb", "_64")
# Run the Build
logger.info(CFG_READY)
logger.info(START_LIVEBUILD)
@ -94,7 +90,7 @@ class BuildXfce:
current_working_directory = os.getcwd()
os.chdir(HOME_FOLDER + FUSATO_ROOT)
# Set the build inidcator
inflate_bubble.make_bld_xfce(deb_base, "64")
inflate_bubble.make_bld_xfce("deb", "64")
logger.info(dir_current)
os.system(run_cmd)
logger.info(BUILD_COMPLETED)
@ -123,10 +119,10 @@ class BuildXfce:
execute = i + '()'
exec(execute)
# Run the specific classes
infra.ChrootFolders(deb_base, arch_32)
infra.BinaryFolders(deb_base, arch_32)
infra.ArchitectureFiles(deb_base, arch_32)
infra.Archive(deb_base, arch_32)
infra.ChrootFolders("deb", "_32")
infra.BinaryFolders("deb", "_32")
infra.ArchitectureFiles("deb", "_32")
infra.Archive("deb", "_32")
# Run the Build
logger.info(CFG_READY)
logger.info(START_LIVEBUILD)
@ -137,7 +133,7 @@ class BuildXfce:
current_working_directory = os.getcwd()
os.chdir(HOME_FOLDER + FUSATO_ROOT)
# Set the build inidcator
inflate_bubble.make_bld_xfce(deb_base, "32")
inflate_bubble.make_bld_xfce("deb", "32")
logger.info(dir_current)
os.system(run_cmd)
logger.info(BUILD_COMPLETED)
@ -148,6 +144,7 @@ class BuildXfce:
logger.info(BUILD_COMPLETED)
def build_deb_arm(self):
""" Builds the arm ISO XFCE"""
current_working_directory = os.getcwd()
@ -166,9 +163,9 @@ class BuildXfce:
execute = i + '()'
exec(execute)
# Run the specific classes
infra.ChrootFolders(deb_base, arch_arm)
infra.BinaryFolders(deb_base, arch_arm)
infra.ArchitectureFiles(deb_base, arch_arm)
infra.ChrootFolders("deb", "_arm")
infra.BinaryFolders("deb", "_arm")
infra.ArchitectureFiles("deb", "_arm")
# Run the Build
logger.info(CFG_READY)
logger.info(START_LIVEBUILD)
@ -179,7 +176,7 @@ class BuildXfce:
current_working_directory = os.getcwd()
os.chdir(HOME_FOLDER + FUSATO_ROOT)
# Set the build inidcator
inflate_bubble.make_bld_xfce(deb_base, "arm")
inflate_bubble.make_bld_xfce("deb", "arm")
logger.info(dir_current)
os.system(run_cmd)
logger.info(BUILD_COMPLETED)
@ -194,11 +191,11 @@ class BuildXfce:
"""
Used to build the Debian base XFCE ISO
"""
if self.sarch == arch_64:
if self.sarch == '_64':
self.build_deb_64()
elif self.sarch == arch_32:
elif self.sarch == '_32':
self.build_deb_32()
elif self.sarch == arch_arm:
elif self.sarch == '_arm':
self.build_deb_arm()
else:
logger.warning("No active build specified!")
@ -222,9 +219,9 @@ class BuildXfce:
execute = i + '()'
exec(execute)
# Run the specific classes
infra.ChrootFolders(dev_base, deb_base)
infra.BinaryFolders(dev_base, deb_base)
infra.ArchitectureFiles(dev_base, deb_base)
infra.ChrootFolders("dev", "_64")
infra.BinaryFolders("dev", "_64")
infra.ArchitectureFiles("dev", "_64")
# Run the Build
logger.info(CFG_READY)
logger.info(START_LIVEBUILD)
@ -235,7 +232,7 @@ class BuildXfce:
current_working_directory = os.getcwd()
os.chdir(HOME_FOLDER + FUSATO_ROOT)
# Set the build inidcator
inflate_bubble.make_bld_xfce(dev_base,"64")
inflate_bubble.make_bld_xfce("dev","64")
logger.info(dir_current)
os.system(run_cmd)
logger.info(BUILD_COMPLETED)
@ -247,6 +244,7 @@ class BuildXfce:
logger.info(BUILD_COMPLETED)
def build_dev_32(self):
""" Builds the 32bit ISO XFCE"""
current_working_directory = os.getcwd()
@ -265,9 +263,9 @@ class BuildXfce:
execute = i + '()'
exec(execute)
# Run the specific classes
infra.ChrootFolders(dev_base, arch_32)
infra.BinaryFolders(dev_base, arch_32)
infra.ArchitectureFiles(dev_base, arch_32)
infra.ChrootFolders("dev", "_32")
infra.BinaryFolders("dev", "_32")
infra.ArchitectureFiles("dev", "_32")
# Run the Build
logger.info(CFG_READY)
logger.info(START_LIVEBUILD)
@ -278,7 +276,7 @@ class BuildXfce:
current_working_directory = os.getcwd()
os.chdir(HOME_FOLDER + FUSATO_ROOT)
# Set the build inidcator
inflate_bubble.make_bld_xfce(dev_base,"32")
inflate_bubble.make_bld_xfce("dev","32")
logger.info(dir_current)
os.system(run_cmd)
logger.info(BUILD_COMPLETED)
@ -308,9 +306,9 @@ class BuildXfce:
execute = i + '()'
exec(execute)
# Run the specific classes
infra.ChrootFolders(dev_base, arch_arm)
infra.BinaryFolders(dev_base, arch_arm)
infra.ArchitectureFiles(dev_base, arch_arm)
infra.ChrootFolders("dev", "_arm")
infra.BinaryFolders("dev", "_arm")
infra.ArchitectureFiles("dev", "_arm")
# Run the Build
logger.info(CFG_READY)
logger.info(START_LIVEBUILD)
@ -321,7 +319,7 @@ class BuildXfce:
current_working_directory = os.getcwd()
os.chdir(HOME_FOLDER + FUSATO_ROOT)
# Set the build inidcator
inflate_bubble.make_bld_xfce(dev_base,"arm")
inflate_bubble.make_bld_xfce("dev","arm")
logger.info(dir_current)
os.system(run_cmd)
logger.info(BUILD_COMPLETED)
@ -333,15 +331,16 @@ class BuildXfce:
logger.info(BUILD_COMPLETED)
def devuan_build(self):
"""
Used to build the devuan base XFCE ISO
"""
if self.sarch == "_64":
if self.sarch == '_64':
self.build_dev_64()
elif self.sarch == "_32":
elif self.sarch == '_32':
self.build_dev_32()
elif self.sarch == "_arm":
elif self.sarch == '_arm':
self.build_dev_arm()
else:
print("WARNING: No active build specified")
@ -356,10 +355,10 @@ class BuildGflashback:
self.sarch = sarch
os.chdir(HOME_FOLDER + FUSATO_ROOT)
# Determine what base to build
if sbase == deb_base:
if sbase == "deb":
# Run the Debian Build
self.debian_build()
elif sbase == dev_base:
elif sbase == "dev":
self.devuan_build()
else:
print("No base has been found")
@ -383,10 +382,10 @@ class BuildGflashback:
execute = i + '()'
exec(execute)
# Run the specific classes
infra.ChrootFolders(deb_base, deb_base)
infra.BinaryFolders(deb_base, deb_base)
infra.ArchitectureFiles(deb_base, deb_base)
infra.Archive(deb_base, deb_base)
infra.ChrootFolders("deb", "_64")
infra.BinaryFolders("deb", "_64")
infra.ArchitectureFiles("deb", "_64")
infra.Archive("deb", "_64")
# Run the Build
logger.info(CFG_READY)
logger.info(START_LIVEBUILD)
@ -397,7 +396,7 @@ class BuildGflashback:
current_working_directory = os.getcwd()
os.chdir(HOME_FOLDER + FUSATO_ROOT)
# Set the build inidcator
inflate_bubble.make_bld_gnomeflashback(deb_base,"64")
inflate_bubble.make_bld_gnomeflashback("deb","64")
logger.info(dir_current)
os.system(run_cmd)
logger.info(BUILD_COMPLETED)
@ -408,6 +407,7 @@ class BuildGflashback:
logger.info(BUILD_COMPLETED)
def build_deb_32(self):
""" Builds the 32bit ISO GNOME FlashBack"""
current_working_directory = os.getcwd()
@ -426,10 +426,10 @@ class BuildGflashback:
execute = i + '()'
exec(execute)
# Run the specific classes
infra.ChrootFolders(deb_base, arch_32)
infra.BinaryFolders(deb_base, arch_32)
infra.ArchitectureFiles(deb_base, arch_32)
infra.Archive(deb_base, arch_32)
infra.ChrootFolders("deb", "_32")
infra.BinaryFolders("deb", "_32")
infra.ArchitectureFiles("deb", "_32")
infra.Archive("deb", "_32")
# Run the Build
logger.info(CFG_READY)
logger.info(START_LIVEBUILD)
@ -440,7 +440,7 @@ class BuildGflashback:
current_working_directory = os.getcwd()
os.chdir(HOME_FOLDER + FUSATO_ROOT)
# Set the build inidcator
inflate_bubble.make_bld_gnomeflashback(deb_base,"32")
inflate_bubble.make_bld_gnomeflashback("deb","32")
logger.info(dir_current)
os.system(run_cmd)
logger.info(BUILD_COMPLETED)
@ -451,6 +451,7 @@ class BuildGflashback:
logger.info(BUILD_COMPLETED)
def build_deb_arm(self):
""" Builds the arm ISO GNOME FlashBack"""
current_working_directory = os.getcwd()
@ -469,10 +470,10 @@ class BuildGflashback:
execute = i + '()'
exec(execute)
# Run the specific classes
infra.ChrootFolders(deb_base, arch_arm)
infra.BinaryFolders(deb_base, arch_arm)
infra.ArchitectureFiles(deb_base, arch_arm)
infra.Archive(deb_base, arch_arm)
infra.ChrootFolders("deb", "_arm")
infra.BinaryFolders("deb", "_arm")
infra.ArchitectureFiles("deb", "_arm")
infra.Archive("deb", "_arm")
# Run the Build
logger.info(CFG_READY)
logger.info(START_LIVEBUILD)
@ -483,7 +484,7 @@ class BuildGflashback:
current_working_directory = os.getcwd()
os.chdir(HOME_FOLDER + FUSATO_ROOT)
# Set the build inidcator
inflate_bubble.make_bld_gnomeflashback(deb_base,"arm")
inflate_bubble.make_bld_gnomeflashback("deb","arm")
logger.info(dir_current)
os.system(run_cmd)
logger.info(BUILD_COMPLETED)
@ -494,15 +495,16 @@ class BuildGflashback:
logger.info(BUILD_COMPLETED)
def debian_build(self):
"""
Used to build the Debian base GNOME FlashBack ISO
"""
if self.sarch == arch_64:
if self.sarch == '_64':
self.build_deb_64()
elif self.sarch == arch_32:
elif self.sarch == '_32':
self.build_deb_32()
elif self.sarch == arch_arm:
elif self.sarch == '_arm':
self.build_deb_arm()
else:
print("WARNING: No active build specified")
@ -526,10 +528,10 @@ class BuildGflashback:
execute = i + '()'
exec(execute)
# Run the specific classes
infra.ChrootFolders(dev_base, deb_base)
infra.BinaryFolders(dev_base, deb_base)
infra.ArchitectureFiles(dev_base, deb_base)
infra.Archive(dev_base, deb_base)
infra.ChrootFolders("dev", "_64")
infra.BinaryFolders("dev", "_64")
infra.ArchitectureFiles("dev", "_64")
infra.Archive("dev", "_64")
# Run the Build
logger.info(CFG_READY)
logger.info(START_LIVEBUILD)
@ -540,7 +542,7 @@ class BuildGflashback:
current_working_directory = os.getcwd()
os.chdir(HOME_FOLDER + FUSATO_ROOT)
# Set the build inidcator
inflate_bubble.make_bld_gnomeflashback(dev_base,"64")
inflate_bubble.make_bld_gnomeflashback("dev","64")
logger.info(dir_current)
os.system(run_cmd)
logger.info(BUILD_COMPLETED)
@ -570,10 +572,10 @@ class BuildGflashback:
execute = i + '()'
exec(execute)
# Run the specific classes
infra.ChrootFolders(dev_base, arch_32)
infra.BinaryFolders(dev_base, arch_32)
infra.ArchitectureFiles(dev_base, arch_32)
infra.Archive(dev_base, arch_32)
infra.ChrootFolders("dev", "_32")
infra.BinaryFolders("dev", "_32")
infra.ArchitectureFiles("dev", "_32")
infra.Archive("dev", "_32")
# Run the Build
logger.info(CFG_READY)
logger.info(START_LIVEBUILD)
@ -584,7 +586,7 @@ class BuildGflashback:
current_working_directory = os.getcwd()
os.chdir(HOME_FOLDER + FUSATO_ROOT)
# Set the build inidcator
inflate_bubble.make_bld_gnomeflashback(dev_base,"32")
inflate_bubble.make_bld_gnomeflashback("dev","32")
logger.info(dir_current)
os.system(run_cmd)
logger.info(BUILD_COMPLETED)
@ -596,6 +598,7 @@ class BuildGflashback:
logger.info(BUILD_COMPLETED)
def build_dev_arm(self):
""" Builds the arm ISO GNOME FlashBack"""
current_working_directory = os.getcwd()
@ -614,10 +617,10 @@ class BuildGflashback:
execute = i + '()'
exec(execute)
# Run the specific classes
infra.ChrootFolders(dev_base, arch_arm)
infra.BinaryFolders(dev_base, arch_arm)
infra.ArchitectureFiles(dev_base, arch_arm)
infra.Archive(dev_base, arch_arm)
infra.ChrootFolders("dev", "_arm")
infra.BinaryFolders("dev", "_arm")
infra.ArchitectureFiles("dev", "_arm")
infra.Archive("dev", "_arm")
# Run the Build
logger.info(CFG_READY)
logger.info(START_LIVEBUILD)
@ -628,7 +631,7 @@ class BuildGflashback:
current_working_directory = os.getcwd()
os.chdir(HOME_FOLDER + FUSATO_ROOT)
# Set the build inidcator
inflate_bubble.make_bld_gnomeflashback(dev_base, "arm")
inflate_bubble.make_bld_gnomeflashback("dev", "arm")
logger.info(dir_current)
os.system(run_cmd)
logger.info(BUILD_COMPLETED)
@ -644,11 +647,11 @@ class BuildGflashback:
"""
Used to build the devuan base GNOME FlashBack ISO
"""
if self.sarch == arch_64:
if self.sarch == '_64':
self.build_dev_64()
elif self.sarch == arch_32:
elif self.sarch == '_32':
self.build_dev_32()
elif self.sarch == arch_arm:
elif self.sarch == '_arm':
self.build_dev_arm()
else:
print("WARNING: No active build specified")
@ -706,22 +709,22 @@ class Decsions:
if self.arguments.e == 'e-xfce':
if self.arguments.b == 'b-deb64':
readybuild()
BuildXfce(deb_base, deb_base)
BuildXfce("deb", "_64")
elif self.arguments.b == 'b-deb32':
readybuild()
BuildXfce(deb_base, arch_32)
BuildXfce("deb", "_32")
elif self.arguments.b == 'b-dev64':
readybuild()
BuildXfce(dev_base, deb_base)
BuildXfce("dev", "_64")
elif self.arguments.b == 'b-dev32':
readybuild()
BuildXfce(dev_base, arch_32)
BuildXfce("dev", "_32")
elif self.arguments.b == 'b-debarm':
readybuild()
BuildXfce(deb_base, arch_arm)
BuildXfce("deb", "_arm")
elif self.arguments.b == 'b-devarm':
readybuild()
BuildXfce(dev_base, arch_arm)
BuildXfce("dev", "_arm")
else:
logger.critical("You have not specified a build to process!")
@ -730,22 +733,22 @@ class Decsions:
if self.arguments.e == 'e-gnomefb':
if self.arguments.b == 'b-deb64':
readybuild()
BuildGflashback(deb_base, deb_base)
BuildGflashback("deb", "_64")
elif self.arguments.b == 'b-deb32':
readybuild()
BuildGflashback(deb_base, arch_32)
BuildGflashback("deb", "_32")
elif self.arguments.b == 'b-debarm':
readybuild()
BuildGflashback(deb_base, arch_arm)
BuildGflashback("deb", "_arm")
elif self.arguments.b == 'b-dev32':
readybuild()
BuildGflashback(dev_base, arch_32)
BuildGflashback("dev", "_32")
elif self.arguments.b == 'b-dev64':
readybuild()
BuildGflashback(dev_base, deb_base)
BuildGflashback("dev", "_64")
elif self.arguments.b == 'b-devarm':
readybuild()
BuildGflashback(dev_base, arch_arm)
BuildGflashback("dev", "_arm")
else:
logger.critical("You have not specified a build to process!")