Module Update: set build iso to use variables for Arch.
Signed-off-by: debianpepper <pdpdebdevuan@protonmail.com>
This commit is contained in:
parent
39473902ea
commit
df8c5d66b5
|
@ -21,6 +21,12 @@ 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()
|
||||
|
@ -48,10 +54,10 @@ class BuildXfce:
|
|||
self.sarch = sarch
|
||||
os.chdir(HOME_FOLDER + FUSATO_ROOT)
|
||||
# Determine what base to build
|
||||
if sbase == "deb":
|
||||
if sbase == deb_base:
|
||||
# Run the Debian Build
|
||||
self.debian_build()
|
||||
elif sbase == "dev":
|
||||
elif sbase == dev_base:
|
||||
self.devuan_build()
|
||||
else:
|
||||
print("No base has been found")
|
||||
|
@ -61,10 +67,8 @@ class BuildXfce:
|
|||
""" Builds the 64bit ISO XFCE"""
|
||||
current_working_directory = os.getcwd()
|
||||
dir_current = "Current working directory" + current_working_directory
|
||||
|
||||
logger.info("Building a Debian based 64 bit ISO")
|
||||
logger.info(dir_current)
|
||||
|
||||
# Set the config tree
|
||||
lbsetup = conf.LBSET_DEB64
|
||||
os.system(lbsetup)
|
||||
|
@ -77,44 +81,36 @@ class BuildXfce:
|
|||
execute = i + '()'
|
||||
exec(execute)
|
||||
# Run the specific classes
|
||||
infra.ChrootFolders("deb", "_64")
|
||||
infra.BinaryFolders("deb", "_64")
|
||||
infra.ArchitectureFiles("deb", "_64")
|
||||
infra.ChrootFolders(deb_base, deb_base)
|
||||
infra.BinaryFolders(deb_base, deb_base)
|
||||
infra.ArchitectureFiles(deb_base, deb_base)
|
||||
# Run the Build
|
||||
|
||||
logger.info(CFG_READY)
|
||||
logger.info(START_LIVEBUILD)
|
||||
logger.info(dir_current)
|
||||
|
||||
lbsetup = conf.LBSET_DEB64
|
||||
os.system(lbsetup)
|
||||
run_cmd = 'sudo lb build'
|
||||
current_working_directory = os.getcwd()
|
||||
os.chdir(HOME_FOLDER + FUSATO_ROOT)
|
||||
# Set the build inidcator
|
||||
inflate_bubble.make_bld_xfce("deb", "64")
|
||||
inflate_bubble.make_bld_xfce(deb_base, "64")
|
||||
logger.info(dir_current)
|
||||
os.system(run_cmd)
|
||||
logger.info(BUILD_COMPLETED)
|
||||
|
||||
logger.info(dir_current)
|
||||
|
||||
finish_cleanup.make_check_sum()
|
||||
finish_cleanup.copy_debian_xfce_based()
|
||||
finish_cleanup.kill_old_iso()
|
||||
|
||||
logger.info(BUILD_COMPLETED)
|
||||
|
||||
|
||||
|
||||
def build_deb_32(self):
|
||||
""" Builds the 32bit ISO XFCE"""
|
||||
current_working_directory = os.getcwd()
|
||||
dir_current = "Current working directory" + current_working_directory
|
||||
|
||||
logger.info("Building a Debian based 32 bit ISO")
|
||||
logger.info(dir_current)
|
||||
|
||||
# Set the config tree
|
||||
lbsetup = conf.LBSET_DEB32
|
||||
os.system(lbsetup)
|
||||
|
@ -127,35 +123,28 @@ class BuildXfce:
|
|||
execute = i + '()'
|
||||
exec(execute)
|
||||
# Run the specific classes
|
||||
infra.ChrootFolders("deb", "_32")
|
||||
infra.BinaryFolders("deb", "_32")
|
||||
infra.ArchitectureFiles("deb", "_32")
|
||||
infra.Archive("deb", "_32")
|
||||
|
||||
|
||||
infra.ChrootFolders(deb_base, arch_32)
|
||||
infra.BinaryFolders(deb_base, arch_32)
|
||||
infra.ArchitectureFiles(deb_base, arch_32)
|
||||
infra.Archive(deb_base, arch_32)
|
||||
# Run the Build
|
||||
|
||||
logger.info(CFG_READY)
|
||||
logger.info(START_LIVEBUILD)
|
||||
logger.info(dir_current)
|
||||
|
||||
lbsetup = conf.LBSET_DEB32
|
||||
os.system(lbsetup)
|
||||
run_cmd = 'sudo lb build'
|
||||
current_working_directory = os.getcwd()
|
||||
os.chdir(HOME_FOLDER + FUSATO_ROOT)
|
||||
# Set the build inidcator
|
||||
inflate_bubble.make_bld_xfce("deb", "32")
|
||||
inflate_bubble.make_bld_xfce(deb_base, "32")
|
||||
logger.info(dir_current)
|
||||
os.system(run_cmd)
|
||||
logger.info(BUILD_COMPLETED)
|
||||
|
||||
logger.info(dir_current)
|
||||
|
||||
finish_cleanup.make_check_sum()
|
||||
finish_cleanup.copy_debian_xfce_based()
|
||||
finish_cleanup.kill_old_iso()
|
||||
|
||||
logger.info(BUILD_COMPLETED)
|
||||
|
||||
|
||||
|
@ -164,10 +153,8 @@ class BuildXfce:
|
|||
""" Builds the arm ISO XFCE"""
|
||||
current_working_directory = os.getcwd()
|
||||
dir_current = "Current working directory" + current_working_directory
|
||||
|
||||
logger.info("Building a Debian based arm bit ISO")
|
||||
logger.info(dir_current)
|
||||
|
||||
# Set the config tree
|
||||
lbsetup = conf.LBSET_DEBARM
|
||||
os.system(lbsetup)
|
||||
|
@ -180,45 +167,39 @@ class BuildXfce:
|
|||
execute = i + '()'
|
||||
exec(execute)
|
||||
# Run the specific classes
|
||||
infra.ChrootFolders("deb", "_arm")
|
||||
infra.BinaryFolders("deb", "_arm")
|
||||
infra.ArchitectureFiles("deb", "_arm")
|
||||
infra.ChrootFolders(deb_base, arch_arm)
|
||||
infra.BinaryFolders(deb_base, arch_arm)
|
||||
infra.ArchitectureFiles(deb_base, arch_arm)
|
||||
# Run the Build
|
||||
|
||||
logger.info(CFG_READY)
|
||||
logger.info(START_LIVEBUILD)
|
||||
logger.info(dir_current)
|
||||
|
||||
lbsetup = conf.LBSET_DEBARM
|
||||
os.system(lbsetup)
|
||||
run_cmd = 'sudo lb build'
|
||||
current_working_directory = os.getcwd()
|
||||
os.chdir(HOME_FOLDER + FUSATO_ROOT)
|
||||
# Set the build inidcator
|
||||
inflate_bubble.make_bld_xfce("deb", "arm")
|
||||
inflate_bubble.make_bld_xfce(deb_base, "arm")
|
||||
logger.info(dir_current)
|
||||
os.system(run_cmd)
|
||||
logger.info(BUILD_COMPLETED)
|
||||
|
||||
logger.info(dir_current)
|
||||
|
||||
finish_cleanup.make_check_sum()
|
||||
finish_cleanup.copy_debian_xfce_based()
|
||||
finish_cleanup.kill_old_iso()
|
||||
|
||||
logger.info(BUILD_COMPLETED)
|
||||
|
||||
|
||||
|
||||
def debian_build(self):
|
||||
"""
|
||||
Used to build the Debian base XFCE ISO
|
||||
"""
|
||||
if self.sarch == '_64':
|
||||
if self.sarch == arch_64:
|
||||
self.build_deb_64()
|
||||
elif self.sarch == '_32':
|
||||
elif self.sarch == arch_32:
|
||||
self.build_deb_32()
|
||||
elif self.sarch == '_arm':
|
||||
elif self.sarch == arch_arm:
|
||||
self.build_deb_arm()
|
||||
else:
|
||||
logger.warning("No active build specified!")
|
||||
|
@ -228,10 +209,8 @@ class BuildXfce:
|
|||
""" Builds the 64bit ISO XFCE"""
|
||||
current_working_directory = os.getcwd()
|
||||
dir_current = "Current working directory" + current_working_directory
|
||||
|
||||
logger.info("Building a devuan based 64 bit ISO")
|
||||
logger.info(dir_current)
|
||||
|
||||
# Set the config tree
|
||||
lbsetup = conf.LBSET_DEV64
|
||||
os.system(lbsetup)
|
||||
|
@ -244,45 +223,37 @@ class BuildXfce:
|
|||
execute = i + '()'
|
||||
exec(execute)
|
||||
# Run the specific classes
|
||||
infra.ChrootFolders("dev", "_64")
|
||||
infra.BinaryFolders("dev", "_64")
|
||||
infra.ArchitectureFiles("dev", "_64")
|
||||
infra.ChrootFolders(dev_base, deb_base)
|
||||
infra.BinaryFolders(dev_base, deb_base)
|
||||
infra.ArchitectureFiles(dev_base, deb_base)
|
||||
# Run the Build
|
||||
|
||||
logger.info(CFG_READY)
|
||||
logger.info(START_LIVEBUILD)
|
||||
logger.info(dir_current)
|
||||
|
||||
lbsetup = conf.LBSET_DEV64
|
||||
os.system(lbsetup)
|
||||
run_cmd = 'sudo lb build'
|
||||
current_working_directory = os.getcwd()
|
||||
os.chdir(HOME_FOLDER + FUSATO_ROOT)
|
||||
# Set the build inidcator
|
||||
inflate_bubble.make_bld_xfce("dev","64")
|
||||
inflate_bubble.make_bld_xfce(dev_base,"64")
|
||||
logger.info(dir_current)
|
||||
os.system(run_cmd)
|
||||
logger.info(BUILD_COMPLETED)
|
||||
|
||||
logger.info(dir_current)
|
||||
|
||||
finish_cleanup.make_check_sum()
|
||||
finish_cleanup.copy_devuan_xfce_based()
|
||||
finish_cleanup.kill_old_iso()
|
||||
#'finish_cleanup.copy_iso_file_prod_deb64',
|
||||
|
||||
logger.info(BUILD_COMPLETED)
|
||||
|
||||
|
||||
|
||||
def build_dev_32(self):
|
||||
""" Builds the 32bit ISO XFCE"""
|
||||
current_working_directory = os.getcwd()
|
||||
dir_current = "Current working directory" + current_working_directory
|
||||
|
||||
logger.info("Building a devuan based 32 bit ISO")
|
||||
logger.info(dir_current)
|
||||
|
||||
# Set the config tree
|
||||
lbsetup = conf.LBSET_DEV32
|
||||
os.system(lbsetup)
|
||||
|
@ -295,45 +266,37 @@ class BuildXfce:
|
|||
execute = i + '()'
|
||||
exec(execute)
|
||||
# Run the specific classes
|
||||
infra.ChrootFolders("dev", "_32")
|
||||
infra.BinaryFolders("dev", "_32")
|
||||
infra.ArchitectureFiles("dev", "_32")
|
||||
infra.ChrootFolders(dev_base, arch_32)
|
||||
infra.BinaryFolders(dev_base, arch_32)
|
||||
infra.ArchitectureFiles(dev_base, arch_32)
|
||||
# Run the Build
|
||||
|
||||
logger.info(CFG_READY)
|
||||
logger.info(START_LIVEBUILD)
|
||||
logger.info(dir_current)
|
||||
|
||||
lbsetup = conf.LBSET_DEV32
|
||||
os.system(lbsetup)
|
||||
run_cmd = 'sudo lb build'
|
||||
current_working_directory = os.getcwd()
|
||||
os.chdir(HOME_FOLDER + FUSATO_ROOT)
|
||||
# Set the build inidcator
|
||||
inflate_bubble.make_bld_xfce("dev","32")
|
||||
inflate_bubble.make_bld_xfce(dev_base,"32")
|
||||
logger.info(dir_current)
|
||||
os.system(run_cmd)
|
||||
logger.info(BUILD_COMPLETED)
|
||||
|
||||
logger.info(dir_current)
|
||||
|
||||
finish_cleanup.make_check_sum()
|
||||
finish_cleanup.copy_devuan_xfce_based()
|
||||
finish_cleanup.kill_old_iso()
|
||||
#'finish_cleanup.copy_iso_file_prod_deb32',
|
||||
|
||||
logger.info(BUILD_COMPLETED)
|
||||
|
||||
|
||||
|
||||
def build_dev_arm(self):
|
||||
""" Builds the arm ISO XFCE"""
|
||||
current_working_directory = os.getcwd()
|
||||
dir_current = "Current working directory" + current_working_directory
|
||||
|
||||
print("INFO: Building a devuan based arm bit ISO")
|
||||
logger.info(dir_current)
|
||||
|
||||
# Set the config tree
|
||||
lbsetup = conf.LBSET_DEVARM
|
||||
os.system(lbsetup)
|
||||
|
@ -346,46 +309,40 @@ class BuildXfce:
|
|||
execute = i + '()'
|
||||
exec(execute)
|
||||
# Run the specific classes
|
||||
infra.ChrootFolders("dev", "_arm")
|
||||
infra.BinaryFolders("dev", "_arm")
|
||||
infra.ArchitectureFiles("dev", "_arm")
|
||||
infra.ChrootFolders(dev_base, arch_arm)
|
||||
infra.BinaryFolders(dev_base, arch_arm)
|
||||
infra.ArchitectureFiles(dev_base, arch_arm)
|
||||
# Run the Build
|
||||
|
||||
logger.info(CFG_READY)
|
||||
logger.info(START_LIVEBUILD)
|
||||
logger.info(dir_current)
|
||||
|
||||
lbsetup = conf.LBSET_DEVARM
|
||||
os.system(lbsetup)
|
||||
run_cmd = 'sudo lb build'
|
||||
current_working_directory = os.getcwd()
|
||||
os.chdir(HOME_FOLDER + FUSATO_ROOT)
|
||||
# Set the build inidcator
|
||||
inflate_bubble.make_bld_xfce("dev","arm")
|
||||
inflate_bubble.make_bld_xfce(dev_base,"arm")
|
||||
logger.info(dir_current)
|
||||
os.system(run_cmd)
|
||||
logger.info(BUILD_COMPLETED)
|
||||
|
||||
logger.info(dir_current)
|
||||
|
||||
finish_cleanup.make_check_sum()
|
||||
finish_cleanup.copy_devuan_xfce_based()
|
||||
finish_cleanup.kill_old_iso()
|
||||
#'finish_cleanup.copy_iso_file_prod_DEBARM',
|
||||
|
||||
logger.info(BUILD_COMPLETED)
|
||||
|
||||
|
||||
|
||||
def devuan_build(self):
|
||||
"""
|
||||
Used to build the devuan base XFCE ISO
|
||||
"""
|
||||
if self.sarch == '_64':
|
||||
if self.sarch == arch_64:
|
||||
self.build_dev_64()
|
||||
elif self.sarch == '_32':
|
||||
elif self.sarch == arch_32:
|
||||
self.build_dev_32()
|
||||
elif self.sarch == '_arm':
|
||||
elif self.sarch == arch_arm:
|
||||
self.build_dev_arm()
|
||||
else:
|
||||
print("WARNING: No active build specified")
|
||||
|
@ -400,10 +357,10 @@ class BuildGflashback:
|
|||
self.sarch = sarch
|
||||
os.chdir(HOME_FOLDER + FUSATO_ROOT)
|
||||
# Determine what base to build
|
||||
if sbase == "deb":
|
||||
if sbase == deb_base:
|
||||
# Run the Debian Build
|
||||
self.debian_build()
|
||||
elif sbase == "dev":
|
||||
elif sbase == dev_base:
|
||||
self.devuan_build()
|
||||
else:
|
||||
print("No base has been found")
|
||||
|
@ -413,10 +370,8 @@ class BuildGflashback:
|
|||
""" Builds the 64bit ISO GNOME FlashBack"""
|
||||
current_working_directory = os.getcwd()
|
||||
dir_current = "Current working directory" + current_working_directory
|
||||
|
||||
logger.info("Building a Debian based 64 bit ISO")
|
||||
logger.info(dir_current)
|
||||
|
||||
# Set the config tree
|
||||
lbsetup = conf.LBSET_DEB64
|
||||
os.system(lbsetup)
|
||||
|
@ -429,45 +384,37 @@ class BuildGflashback:
|
|||
execute = i + '()'
|
||||
exec(execute)
|
||||
# Run the specific classes
|
||||
infra.ChrootFolders("deb", "_64")
|
||||
infra.BinaryFolders("deb", "_64")
|
||||
infra.ArchitectureFiles("deb", "_64")
|
||||
infra.Archive("deb", "_64")
|
||||
infra.ChrootFolders(deb_base, deb_base)
|
||||
infra.BinaryFolders(deb_base, deb_base)
|
||||
infra.ArchitectureFiles(deb_base, deb_base)
|
||||
infra.Archive(deb_base, deb_base)
|
||||
# Run the Build
|
||||
|
||||
logger.info(CFG_READY)
|
||||
logger.info(START_LIVEBUILD)
|
||||
logger.info(dir_current)
|
||||
|
||||
lbsetup = conf.LBSET_DEB64
|
||||
os.system(lbsetup)
|
||||
run_cmd = 'sudo lb build'
|
||||
current_working_directory = os.getcwd()
|
||||
os.chdir(HOME_FOLDER + FUSATO_ROOT)
|
||||
# Set the build inidcator
|
||||
inflate_bubble.make_bld_gnomeflashback("deb","64")
|
||||
inflate_bubble.make_bld_gnomeflashback(deb_base,"64")
|
||||
logger.info(dir_current)
|
||||
os.system(run_cmd)
|
||||
logger.info(BUILD_COMPLETED)
|
||||
|
||||
logger.info(dir_current)
|
||||
|
||||
finish_cleanup.make_check_sum()
|
||||
finish_cleanup.copy_debian_gfb_based()
|
||||
finish_cleanup.kill_old_iso()
|
||||
|
||||
logger.info(BUILD_COMPLETED)
|
||||
|
||||
|
||||
|
||||
def build_deb_32(self):
|
||||
""" Builds the 32bit ISO GNOME FlashBack"""
|
||||
current_working_directory = os.getcwd()
|
||||
dir_current = "Current working directory" + current_working_directory
|
||||
|
||||
print("INFO: Building a Debian based 32 bit ISO")
|
||||
logger.info(dir_current)
|
||||
|
||||
# Set the config tree
|
||||
lbsetup = conf.LBSET_DEB32
|
||||
os.system(lbsetup)
|
||||
|
@ -480,45 +427,37 @@ class BuildGflashback:
|
|||
execute = i + '()'
|
||||
exec(execute)
|
||||
# Run the specific classes
|
||||
infra.ChrootFolders("deb", "_32")
|
||||
infra.BinaryFolders("deb", "_32")
|
||||
infra.ArchitectureFiles("deb", "_32")
|
||||
infra.Archive("deb", "_32")
|
||||
infra.ChrootFolders(deb_base, arch_32)
|
||||
infra.BinaryFolders(deb_base, arch_32)
|
||||
infra.ArchitectureFiles(deb_base, arch_32)
|
||||
infra.Archive(deb_base, arch_32)
|
||||
# Run the Build
|
||||
|
||||
logger.info(CFG_READY)
|
||||
logger.info(START_LIVEBUILD)
|
||||
logger.info(dir_current)
|
||||
|
||||
lbsetup = conf.LBSET_DEB32
|
||||
os.system(lbsetup)
|
||||
run_cmd = 'sudo lb build'
|
||||
current_working_directory = os.getcwd()
|
||||
os.chdir(HOME_FOLDER + FUSATO_ROOT)
|
||||
# Set the build inidcator
|
||||
inflate_bubble.make_bld_gnomeflashback("deb","32")
|
||||
inflate_bubble.make_bld_gnomeflashback(deb_base,"32")
|
||||
logger.info(dir_current)
|
||||
os.system(run_cmd)
|
||||
logger.info(BUILD_COMPLETED)
|
||||
|
||||
logger.info(dir_current)
|
||||
|
||||
finish_cleanup.make_check_sum()
|
||||
finish_cleanup.copy_debian_gfb_based()
|
||||
finish_cleanup.kill_old_iso()
|
||||
|
||||
logger.info(BUILD_COMPLETED)
|
||||
|
||||
|
||||
|
||||
def build_deb_arm(self):
|
||||
""" Builds the arm ISO GNOME FlashBack"""
|
||||
current_working_directory = os.getcwd()
|
||||
dir_current = "Current working directory" + current_working_directory
|
||||
|
||||
print("INFO: Building a Debian based arm bit ISO")
|
||||
logger.info(dir_current)
|
||||
|
||||
# Set the config tree
|
||||
lbsetup = conf.LBSET_DEBARM
|
||||
os.system(lbsetup)
|
||||
|
@ -531,46 +470,40 @@ class BuildGflashback:
|
|||
execute = i + '()'
|
||||
exec(execute)
|
||||
# Run the specific classes
|
||||
infra.ChrootFolders("deb", "_arm")
|
||||
infra.BinaryFolders("deb", "_arm")
|
||||
infra.ArchitectureFiles("deb", "_arm")
|
||||
infra.Archive("deb", "_arm")
|
||||
infra.ChrootFolders(deb_base, arch_arm)
|
||||
infra.BinaryFolders(deb_base, arch_arm)
|
||||
infra.ArchitectureFiles(deb_base, arch_arm)
|
||||
infra.Archive(deb_base, arch_arm)
|
||||
# Run the Build
|
||||
|
||||
logger.info(CFG_READY)
|
||||
logger.info(START_LIVEBUILD)
|
||||
logger.info(dir_current)
|
||||
|
||||
lbsetup = conf.LBSET_DEBARM
|
||||
os.system(lbsetup)
|
||||
run_cmd = 'sudo lb build'
|
||||
current_working_directory = os.getcwd()
|
||||
os.chdir(HOME_FOLDER + FUSATO_ROOT)
|
||||
# Set the build inidcator
|
||||
inflate_bubble.make_bld_gnomeflashback("deb","arm")
|
||||
inflate_bubble.make_bld_gnomeflashback(deb_base,"arm")
|
||||
logger.info(dir_current)
|
||||
os.system(run_cmd)
|
||||
logger.info(BUILD_COMPLETED)
|
||||
|
||||
logger.info(dir_current)
|
||||
|
||||
finish_cleanup.make_check_sum()
|
||||
finish_cleanup.copy_debian_gfb_based()
|
||||
finish_cleanup.kill_old_iso()
|
||||
|
||||
logger.info(BUILD_COMPLETED)
|
||||
|
||||
|
||||
|
||||
def debian_build(self):
|
||||
"""
|
||||
Used to build the Debian base GNOME FlashBack ISO
|
||||
"""
|
||||
if self.sarch == '_64':
|
||||
if self.sarch == arch_64:
|
||||
self.build_deb_64()
|
||||
elif self.sarch == '_32':
|
||||
elif self.sarch == arch_32:
|
||||
self.build_deb_32()
|
||||
elif self.sarch == '_arm':
|
||||
elif self.sarch == arch_arm:
|
||||
self.build_deb_arm()
|
||||
else:
|
||||
print("WARNING: No active build specified")
|
||||
|
@ -580,10 +513,8 @@ class BuildGflashback:
|
|||
""" Builds the 64bit ISO GNOME FlashBack"""
|
||||
current_working_directory = os.getcwd()
|
||||
dir_current = "Current working directory" + current_working_directory
|
||||
|
||||
print("INFO: Building a devuan based 64 bit ISO")
|
||||
logger.info(dir_current)
|
||||
|
||||
# Set the config tree
|
||||
lbsetup = conf.LBSET_DEV64
|
||||
os.system(lbsetup)
|
||||
|
@ -596,46 +527,38 @@ class BuildGflashback:
|
|||
execute = i + '()'
|
||||
exec(execute)
|
||||
# Run the specific classes
|
||||
infra.ChrootFolders("dev", "_64")
|
||||
infra.BinaryFolders("dev", "_64")
|
||||
infra.ArchitectureFiles("dev", "_64")
|
||||
infra.Archive("dev", "_64")
|
||||
infra.ChrootFolders(dev_base, deb_base)
|
||||
infra.BinaryFolders(dev_base, deb_base)
|
||||
infra.ArchitectureFiles(dev_base, deb_base)
|
||||
infra.Archive(dev_base, deb_base)
|
||||
# Run the Build
|
||||
|
||||
logger.info(CFG_READY)
|
||||
logger.info(START_LIVEBUILD)
|
||||
logger.info(dir_current)
|
||||
|
||||
lbsetup = conf.LBSET_DEV64
|
||||
os.system(lbsetup)
|
||||
run_cmd = 'sudo lb build'
|
||||
current_working_directory = os.getcwd()
|
||||
os.chdir(HOME_FOLDER + FUSATO_ROOT)
|
||||
# Set the build inidcator
|
||||
inflate_bubble.make_bld_gnomeflashback("dev","64")
|
||||
inflate_bubble.make_bld_gnomeflashback(dev_base,"64")
|
||||
logger.info(dir_current)
|
||||
os.system(run_cmd)
|
||||
logger.info(BUILD_COMPLETED)
|
||||
|
||||
logger.info(dir_current)
|
||||
|
||||
finish_cleanup.make_check_sum()
|
||||
finish_cleanup.copy_devuan_gfb_based()
|
||||
finish_cleanup.kill_old_iso()
|
||||
#'finish_cleanup.copy_iso_file_prod_deb64',
|
||||
|
||||
logger.info(BUILD_COMPLETED)
|
||||
|
||||
|
||||
|
||||
def build_dev_32(self):
|
||||
""" Builds the 32bit ISO GNOME FlashBack"""
|
||||
current_working_directory = os.getcwd()
|
||||
dir_current = "Current working directory" + current_working_directory
|
||||
|
||||
print("INFO: Building a devuan based 32 bit ISO")
|
||||
logger.info(dir_current)
|
||||
|
||||
# Set the config tree
|
||||
lbsetup = conf.LBSET_DEV32
|
||||
os.system(lbsetup)
|
||||
|
@ -648,46 +571,38 @@ class BuildGflashback:
|
|||
execute = i + '()'
|
||||
exec(execute)
|
||||
# Run the specific classes
|
||||
infra.ChrootFolders("dev", "_32")
|
||||
infra.BinaryFolders("dev", "_32")
|
||||
infra.ArchitectureFiles("dev", "_32")
|
||||
infra.Archive("dev", "_32")
|
||||
infra.ChrootFolders(dev_base, arch_32)
|
||||
infra.BinaryFolders(dev_base, arch_32)
|
||||
infra.ArchitectureFiles(dev_base, arch_32)
|
||||
infra.Archive(dev_base, arch_32)
|
||||
# Run the Build
|
||||
|
||||
logger.info(CFG_READY)
|
||||
logger.info(START_LIVEBUILD)
|
||||
logger.info(dir_current)
|
||||
|
||||
lbsetup = conf.LBSET_DEV32
|
||||
os.system(lbsetup)
|
||||
run_cmd = 'sudo lb build'
|
||||
current_working_directory = os.getcwd()
|
||||
os.chdir(HOME_FOLDER + FUSATO_ROOT)
|
||||
# Set the build inidcator
|
||||
inflate_bubble.make_bld_gnomeflashback("dev","32")
|
||||
inflate_bubble.make_bld_gnomeflashback(dev_base,"32")
|
||||
logger.info(dir_current)
|
||||
os.system(run_cmd)
|
||||
logger.info(BUILD_COMPLETED)
|
||||
|
||||
logger.info(dir_current)
|
||||
|
||||
finish_cleanup.make_check_sum()
|
||||
finish_cleanup.copy_devuan_gfb_based()
|
||||
finish_cleanup.kill_old_iso()
|
||||
#'finish_cleanup.copy_iso_file_prod_deb32',
|
||||
|
||||
logger.info(BUILD_COMPLETED)
|
||||
|
||||
|
||||
|
||||
def build_dev_arm(self):
|
||||
""" Builds the arm ISO GNOME FlashBack"""
|
||||
current_working_directory = os.getcwd()
|
||||
dir_current = "Current working directory" + current_working_directory
|
||||
|
||||
print("INFO: Building a devuan based arm bit ISO")
|
||||
logger.info(dir_current)
|
||||
|
||||
# Set the config tree
|
||||
lbsetup = conf.LBSET_DEVARM
|
||||
os.system(lbsetup)
|
||||
|
@ -700,47 +615,41 @@ class BuildGflashback:
|
|||
execute = i + '()'
|
||||
exec(execute)
|
||||
# Run the specific classes
|
||||
infra.ChrootFolders("dev", "_arm")
|
||||
infra.BinaryFolders("dev", "_arm")
|
||||
infra.ArchitectureFiles("dev", "_arm")
|
||||
infra.Archive("dev", "_arm")
|
||||
infra.ChrootFolders(dev_base, arch_arm)
|
||||
infra.BinaryFolders(dev_base, arch_arm)
|
||||
infra.ArchitectureFiles(dev_base, arch_arm)
|
||||
infra.Archive(dev_base, arch_arm)
|
||||
# Run the Build
|
||||
|
||||
logger.info(CFG_READY)
|
||||
logger.info(START_LIVEBUILD)
|
||||
logger.info(dir_current)
|
||||
|
||||
lbsetup = conf.LBSET_DEVARM
|
||||
os.system(lbsetup)
|
||||
run_cmd = 'sudo lb build'
|
||||
current_working_directory = os.getcwd()
|
||||
os.chdir(HOME_FOLDER + FUSATO_ROOT)
|
||||
# Set the build inidcator
|
||||
inflate_bubble.make_bld_gnomeflashback("dev", "arm")
|
||||
inflate_bubble.make_bld_gnomeflashback(dev_base, "arm")
|
||||
logger.info(dir_current)
|
||||
os.system(run_cmd)
|
||||
logger.info(BUILD_COMPLETED)
|
||||
|
||||
logger.info(dir_current)
|
||||
|
||||
finish_cleanup.make_check_sum()
|
||||
finish_cleanup.copy_devuan_gfb_based()
|
||||
finish_cleanup.kill_old_iso()
|
||||
#'finish_cleanup.copy_iso_file_prod_DEBARM',
|
||||
|
||||
logger.info(BUILD_COMPLETED)
|
||||
|
||||
|
||||
|
||||
def devuan_build(self):
|
||||
"""
|
||||
Used to build the devuan base GNOME FlashBack ISO
|
||||
"""
|
||||
if self.sarch == '_64':
|
||||
if self.sarch == arch_64:
|
||||
self.build_dev_64()
|
||||
elif self.sarch == '_32':
|
||||
elif self.sarch == arch_32:
|
||||
self.build_dev_32()
|
||||
elif self.sarch == '_arm':
|
||||
elif self.sarch == arch_arm:
|
||||
self.build_dev_arm()
|
||||
else:
|
||||
print("WARNING: No active build specified")
|
||||
|
@ -798,22 +707,22 @@ class Decsions:
|
|||
if self.arguments.e == 'e-xfce':
|
||||
if self.arguments.b == 'b-deb64':
|
||||
readybuild()
|
||||
BuildXfce("deb", "_64")
|
||||
BuildXfce(deb_base, deb_base)
|
||||
elif self.arguments.b == 'b-deb32':
|
||||
readybuild()
|
||||
BuildXfce("deb", "_32")
|
||||
BuildXfce(deb_base, arch_32)
|
||||
elif self.arguments.b == 'b-dev64':
|
||||
readybuild()
|
||||
BuildXfce("dev", "_64")
|
||||
BuildXfce(dev_base, deb_base)
|
||||
elif self.arguments.b == 'b-dev32':
|
||||
readybuild()
|
||||
BuildXfce("dev", "_32")
|
||||
BuildXfce(dev_base, arch_32)
|
||||
elif self.arguments.b == 'b-debarm':
|
||||
readybuild()
|
||||
BuildXfce("deb", "_arm")
|
||||
BuildXfce(deb_base, arch_arm)
|
||||
elif self.arguments.b == 'b-devarm':
|
||||
readybuild()
|
||||
BuildXfce("dev", "_arm")
|
||||
BuildXfce(dev_base, arch_arm)
|
||||
else:
|
||||
logger.critical("You have not specified a build to process!")
|
||||
|
||||
|
@ -822,22 +731,22 @@ class Decsions:
|
|||
if self.arguments.e == 'e-gnomefb':
|
||||
if self.arguments.b == 'b-deb64':
|
||||
readybuild()
|
||||
BuildGflashback("deb", "_64")
|
||||
BuildGflashback(deb_base, deb_base)
|
||||
elif self.arguments.b == 'b-deb32':
|
||||
readybuild()
|
||||
BuildGflashback("deb", "_32")
|
||||
BuildGflashback(deb_base, arch_32)
|
||||
elif self.arguments.b == 'b-debarm':
|
||||
readybuild()
|
||||
BuildGflashback("deb", "_arm")
|
||||
BuildGflashback(deb_base, arch_arm)
|
||||
elif self.arguments.b == 'b-dev32':
|
||||
readybuild()
|
||||
BuildGflashback("dev", "_32")
|
||||
BuildGflashback(dev_base, arch_32)
|
||||
elif self.arguments.b == 'b-dev64':
|
||||
readybuild()
|
||||
BuildGflashback("dev", "_64")
|
||||
BuildGflashback(dev_base, deb_base)
|
||||
elif self.arguments.b == 'b-devarm':
|
||||
readybuild()
|
||||
BuildGflashback("dev", "_arm")
|
||||
BuildGflashback(dev_base, arch_arm)
|
||||
else:
|
||||
logger.critical("You have not specified a build to process!")
|
||||
|
||||
|
|
|
@ -109,7 +109,7 @@ GNOME_FLASHBACK_LIST = ('alacarte\n'
|
|||
'eog\n'
|
||||
'evince\n'
|
||||
'file-roller\n'
|
||||
'gdm3\n'
|
||||
#'gdm3\n' # Manuel mentioned not needed.
|
||||
'gedit\n'
|
||||
'gnome-calculator\n'
|
||||
'gnome-control-center\n'
|
||||
|
|
Loading…
Reference in New Issue