Modificar python_modules/build_iso.py
This commit is contained in:
parent
d9259dd95f
commit
e3504fab38
|
@ -208,9 +208,9 @@ class BuildLoaded(BuildBase):
|
|||
arch_suffix = self.sarch[1:]
|
||||
cmd_list = None
|
||||
if self.sbase in ["deb", "dev"]:
|
||||
if arch_suffix in ["64"]:
|
||||
if arch_suffix in ["64", "32", "arm"]:
|
||||
os.system(f'touch {self.sbase.upper()}.{arch_suffix}loaded')
|
||||
if arch_suffix in ["64"]:
|
||||
if arch_suffix in ["64", "32", "arm"]:
|
||||
cmd_list = getattr(conf, f"build{arch_suffix}_loaded_build", [])
|
||||
for command in cmd_list:
|
||||
execute = command + '()'
|
||||
|
@ -218,33 +218,6 @@ class BuildLoaded(BuildBase):
|
|||
return cmd_list
|
||||
|
||||
|
||||
#class BuildServer(BuildBase):
|
||||
# """ This class will ensure the Server builds are built """
|
||||
# def __init__(self, sbase, sarch):
|
||||
# """
|
||||
# init the building, super will
|
||||
# ensure that the method resolution order (MRO) is followed
|
||||
# correctly, allowing for a smooth inheritance hierarchy
|
||||
# """
|
||||
# super().__init__(sbase, sarch, self.server_helper)
|
||||
|
||||
# def server_helper(self):
|
||||
# """
|
||||
# The helper functions to ensure the server requirements are
|
||||
# used
|
||||
# """
|
||||
# arch_suffix = self.sarch[1:]
|
||||
# cmd_list = None
|
||||
# if self.sbase in ["deb", "dev"]:
|
||||
# if arch_suffix in ["64"]:
|
||||
# os.system(f'touch {self.sbase.upper()}.{arch_suffix}server')
|
||||
# if arch_suffix in ["64"]:
|
||||
# cmd_list = getattr(conf, f"build{arch_suffix}_server_build", [])
|
||||
# for command in cmd_list:
|
||||
# execute = command + '()'
|
||||
# exec(execute)
|
||||
# return cmd_list
|
||||
|
||||
class BuildServer(BuildBase):
|
||||
""" This class will ensure the Server builds are built """
|
||||
def __init__(self, sbase, sarch):
|
||||
|
@ -263,9 +236,9 @@ class BuildServer(BuildBase):
|
|||
arch_suffix = self.sarch[1:]
|
||||
cmd_list = None
|
||||
if self.sbase in ["deb", "dev"]:
|
||||
if arch_suffix in ["64"]:
|
||||
if arch_suffix in ["64", "32", "arm"]:
|
||||
os.system(f'touch {self.sbase.upper()}.{arch_suffix}server')
|
||||
if arch_suffix in ["64"]:
|
||||
if arch_suffix in ["64", "32", "arm"]:
|
||||
cmd_list = getattr(conf, f"build{arch_suffix}_server_build", [])
|
||||
for command in cmd_list:
|
||||
execute = command + '()'
|
||||
|
@ -396,8 +369,8 @@ class Decsions:
|
|||
def dloadxf(self):
|
||||
""" Arguments for the loaded xfce """
|
||||
build_type_mapping = {
|
||||
'b-loadeb': ("loaded_deb", "_64"),
|
||||
'b-loadev': ("loaded_dev", "_64"),
|
||||
'b-loadeb': ("deb", "_64"),
|
||||
'b-loadev': ("dev", "_64"),
|
||||
}
|
||||
|
||||
build_argument = self.arguments.b
|
||||
|
@ -412,8 +385,8 @@ class Decsions:
|
|||
def dserver(self):
|
||||
""" Arguments for the Server """
|
||||
build_type_mapping = {
|
||||
'b-srvdeb': ("server_deb", "_64"),
|
||||
'b-srvdev': ("server_dev", "_64"),
|
||||
'b-srvdeb': ("deb", "_64"),
|
||||
'b-srvdev': ("dev", "_64"),
|
||||
}
|
||||
|
||||
build_argument = self.arguments.b
|
||||
|
|
Loading…
Reference in New Issue