Update: Multiple Changes

1. Updated conf to use a global variable fo the code names
2. update dthe live normal python, file. Only for the flagship

Signed-off-by: debianpepper <pdpdebdevuan@protonmail.com>
This commit is contained in:
debianpepper 2024-08-31 23:01:29 +09:00
parent 26a7733210
commit e0798f2506
11 changed files with 246 additions and 225 deletions

View File

@ -1,3 +1,3 @@
#!/bin/bash #!/bin/bash
# run the main Hooks python module # run the main Hooks python module
python3 /usr/lib/python3/dist-packages/pepperpy/hooks_live.py python3 /usr/lib/python3/dist-packages/pepperpy/hooks_live.py

View File

@ -1,9 +1,3 @@
#!/bin/bash #!/bin/bash
# run the main Hooks python module # run the main Hooks python module
python3 /usr/lib/python3/dist-packages/pepperpy/hooks.py python3 /usr/lib/python3/dist-packages/pepperpy/hooks.py
### Setting --apt-recommends and --apt-suggests defaults to '0'
echo -e "# Changing these values to \"1\" may quickly fill up a small partition" > /etc/apt/apt.conf.d/99No-Recommends
echo -e "APT::Install-Recommends \"0\";\nAPT::Install-Suggests \"0\";" >> /etc/apt/apt.conf.d/99No-Recommends

View File

@ -1,9 +1,3 @@
#!/bin/bash #!/bin/bash
# run the main Hooks python module # run the main Hooks python module
python3 /usr/lib/python3/dist-packages/pepperpy/hooks.py python3 /usr/lib/python3/dist-packages/pepperpy/hooks.py
### Setting --apt-recommends and --apt-suggests defaults to '0'
echo -e "# Changing these values to \"1\" may quickly fill up a small partition" > /etc/apt/apt.conf.d/99No-Recommends
echo -e "APT::Install-Recommends \"0\";\nAPT::Install-Suggests \"0\";" >> /etc/apt/apt.conf.d/99No-Recommends

View File

@ -1,9 +1,3 @@
#!/bin/bash #!/bin/bash
# run the main Hooks python module # run the main Hooks python module
python3 /usr/lib/python3/dist-packages/pepperpy/hooks.py python3 /usr/lib/python3/dist-packages/pepperpy/hooks.py
### Setting --apt-recommends and --apt-suggests defaults to '0'
echo -e "# Changing these values to \"1\" may quickly fill up a small partition" > /etc/apt/apt.conf.d/99No-Recommends
echo -e "APT::Install-Recommends \"0\";\nAPT::Install-Suggests \"0\";" >> /etc/apt/apt.conf.d/99No-Recommends

View File

@ -1,9 +1,3 @@
#!/bin/bash #!/bin/bash
# run the main Hooks python module # run the main Hooks python module
python3 /usr/lib/python3/dist-packages/pepperpy/hooks.py python3 /usr/lib/python3/dist-packages/pepperpy/hooks.py
### Setting --apt-recommends and --apt-suggests defaults to '0'
echo -e "# Changing these values to \"1\" may quickly fill up a small partition" > /etc/apt/apt.conf.d/99No-Recommends
echo -e "APT::Install-Recommends \"0\";\nAPT::Install-Suggests \"0\";" >> /etc/apt/apt.conf.d/99No-Recommends

View File

@ -1,9 +1,3 @@
#!/bin/bash #!/bin/bash
# run the main Hooks python module # run the main Hooks python module
python3 /usr/lib/python3/dist-packages/pepperpy/hooks.py python3 /usr/lib/python3/dist-packages/pepperpy/hooks.py
### Setting --apt-recommends and --apt-suggests defaults to '0'
echo -e "# Changing these values to \"1\" may quickly fill up a small partition" > /etc/apt/apt.conf.d/99No-Recommends
echo -e "APT::Install-Recommends \"0\";\nAPT::Install-Suggests \"0\";" >> /etc/apt/apt.conf.d/99No-Recommends

View File

@ -1,9 +1,3 @@
#!/bin/bash #!/bin/bash
# run the main Hooks python module # run the main Hooks python module
python3 /usr/lib/python3/dist-packages/pepperpy/hooks.py python3 /usr/lib/python3/dist-packages/pepperpy/hooks.py
### Setting --apt-recommends and --apt-suggests defaults to '0'
echo -e "# Changing these values to \"1\" may quickly fill up a small partition" > /etc/apt/apt.conf.d/99No-Recommends
echo -e "APT::Install-Recommends \"0\";\nAPT::Install-Suggests \"0\";" >> /etc/apt/apt.conf.d/99No-Recommends

View File

@ -1,4 +1,11 @@
" """
* Author: "PeppermintOS Team(peppermintosteam@proton.me)
*
* License: SPDX-License-Identifier: GPL-3.0-or-later
*
* This is the hook module use dto run for the normal hooks,
* this will run afte rthe ISO main build begins.
"""
import os import os
import platform import platform
@ -28,7 +35,7 @@ def remove_packages_from_the_build():
os.system(f'apt --purge --yes autoremove {package}') os.system(f'apt --purge --yes autoremove {package}')
def remmove_desktop_files(): def remove_desktop_files():
""" """
Use this def to remove any .desktop files you donot need Use this def to remove any .desktop files you donot need
""" """
@ -128,7 +135,8 @@ def hblock_setup():
os.system('chmod 755 /usr/local/bin/hblock') os.system('chmod 755 /usr/local/bin/hblock')
os.system('hblock -S none -D none exit 0') os.system('hblock -S none -D none exit 0')
## this function may not be necessary because the bug is already fixed in live-build. ## this function may not be necessary because the bug is already fixed
## in live-build.
def manage_raspi_firmware(): def manage_raspi_firmware():
""" """
Manage when the raspi firmware, is removed. Manage when the raspi firmware, is removed.
@ -236,9 +244,9 @@ def final_cleanup():
# Lowers the footprint in RAM by 200 MB at the small expense of added size to the ISO. # Lowers the footprint in RAM by 200 MB at the small expense of added size to the ISO.
os.system('update-icon-caches /usr/share/icons/*') os.system('update-icon-caches /usr/share/icons/*')
### Setting --apt-recommends and --apt-suggests defaults to '0' ### Setting --apt-recommends and --apt-suggests defaults to '0'
#os.system('echo -e "# Changing these values to \"1\" may quickly fill up a small partition" > /etc/apt/apt.conf.d/99No-Recommends') os.system('echo -e "# Changing these values to \"1\" may quickly fill up a small partition" > /etc/apt/apt.conf.d/99No-Recommends')
#os.system('echo -e "# Changing these values to \\"1\\" may quickly fill up a small partition" > /etc/apt/apt.conf.d/99No-Recommends') #os.system('echo -e "# Changing these values to \\"1\\" may quickly fill up a small partition" > /etc/apt/apt.conf.d/99No-Recommends')
#os.system('echo -e "APT::Install-Recommends \"0\";\nAPT::Install-Suggests \"0\";" >> /etc/apt/apt.conf.d/99No-Recommends') os.system('echo -e "APT::Install-Recommends \"0\";\nAPT::Install-Suggests \"0\";" >> /etc/apt/apt.conf.d/99No-Recommends')
#os.system('echo -e "APT::Install-Recommends \\"0\\";\nAPT::Install-Suggests \\"0\\";" >> /etc/apt/apt.conf.d/99No-Recommends') #os.system('echo -e "APT::Install-Recommends \\"0\\";\nAPT::Install-Suggests \\"0\\";" >> /etc/apt/apt.conf.d/99No-Recommends')
### Fixes the "Not installing grub for UEFI Secure Boot" in all versions , after the default was changed. ### Fixes the "Not installing grub for UEFI Secure Boot" in all versions , after the default was changed.
#sed s/keyutils/"keyutils --install-recommends"/ /usr/sbin/bootloader-config > /tmp/bootloader-config #sed s/keyutils/"keyutils --install-recommends"/ /usr/sbin/bootloader-config > /tmp/bootloader-config
@ -274,7 +282,7 @@ def start():
apt_install_packages() apt_install_packages()
remove_packages_from_the_build() remove_packages_from_the_build()
install_librewolf_browser() install_librewolf_browser()
remmove_desktop_files() remove_desktop_files()
setup_plymouth_theme_grub() setup_plymouth_theme_grub()
hblock_setup() hblock_setup()
manage_raspi_firmware() manage_raspi_firmware()
@ -285,7 +293,7 @@ def start():
rename_kernel() rename_kernel()
else: else:
apt_install_packages() apt_install_packages()
remmove_desktop_files() remove_desktop_files()
remove_packages_from_the_build() remove_packages_from_the_build()
setup_plymouth_theme_grub() setup_plymouth_theme_grub()
hblock_setup() hblock_setup()

View File

@ -139,6 +139,7 @@ def other_misc_settings():
# Then recreate it with the Pep Background # Then recreate it with the Pep Background
os.system(makelnk) os.system(makelnk)
def remmove_desktop_files(): def remmove_desktop_files():
""" """
Use this def to remove any .desktop files you donot need Use this def to remove any .desktop files you donot need

View File

@ -40,6 +40,7 @@ START_LIVEBUILD = "Start Live-Build Process"
BUILD_COMPILED = "ISO build has compiled successfully" BUILD_COMPILED = "ISO build has compiled successfully"
BUILD_COMPLETED = "ISO is ready for usage. Begin copy to Nightly for QA testing" BUILD_COMPLETED = "ISO is ready for usage. Begin copy to Nightly for QA testing"
class BuildBase: class BuildBase:
""" """
Base class for building ISOs. Base class for building ISOs.
@ -55,10 +56,12 @@ class BuildBase:
os.chdir(HOME_FOLDER + FUSATO_ROOT) os.chdir(HOME_FOLDER + FUSATO_ROOT)
self.build_system(desktop_helper) self.build_system(desktop_helper)
def lb_helper(self): def lb_helper(self):
""" Helper to set the lb commands for live-build""" """ Helper to set the lb commands for live-build"""
lbsetup = None lbsetup = None
if self.sbase in ["deb", "dev", "debmin", "devmin", "debsrv", "devsrv", "debld", "devld"]: if self.sbase in ["deb", "dev", "debmin", "devmin", "debsrv",
"devsrv", "debld", "devld"]:
arch_suffix = self.sarch[1:] arch_suffix = self.sarch[1:]
if arch_suffix in ["64", "32", "arm"]: if arch_suffix in ["64", "32", "arm"]:
lbsetup = getattr( lbsetup = getattr(
@ -67,6 +70,7 @@ class BuildBase:
os.system(lbsetup) os.system(lbsetup)
return lbsetup return lbsetup
def infra_helper(self): def infra_helper(self):
""" Get the build infrastucture ready """ """ Get the build infrastucture ready """
infra_methods = [infra.BinaryFolders, infra.ChrootInstallerFiles, infra_methods = [infra.BinaryFolders, infra.ChrootInstallerFiles,
@ -76,12 +80,14 @@ class BuildBase:
for method in infra_methods: for method in infra_methods:
method(self.sbase, self.sarch) method(self.sbase, self.sarch)
def cleanup_helper(self): def cleanup_helper(self):
""" Clean and Move the comleted ISO """ """ Clean and Move the comleted ISO """
finish_cleanup.make_check_sum() finish_cleanup.make_check_sum()
finish_cleanup.check_build_type() finish_cleanup.check_build_type()
finish_cleanup.kill_old_iso() finish_cleanup.kill_old_iso()
def build_system(self, desktop_helper): def build_system(self, desktop_helper):
""" The actual building process """ """ The actual building process """
current_working_directory = os.getcwd() current_working_directory = os.getcwd()
@ -120,6 +126,7 @@ class BuildXfce(BuildBase):
""" """
super().__init__(sbase, sarch, self.xfce_helper) super().__init__(sbase, sarch, self.xfce_helper)
def xfce_helper(self): def xfce_helper(self):
""" The helper functions to ensure the xfce requirements are used """ """ The helper functions to ensure the xfce requirements are used """
arch_suffix = self.sarch[1:] arch_suffix = self.sarch[1:]
@ -146,6 +153,7 @@ class BuildGflashback(BuildBase):
""" """
super().__init__(sbase, sarch, self.gfb_helper) super().__init__(sbase, sarch, self.gfb_helper)
def gfb_helper(self): def gfb_helper(self):
""" """
The helper functions to ensure the gnome flashback requirements The helper functions to ensure the gnome flashback requirements
@ -153,7 +161,8 @@ class BuildGflashback(BuildBase):
""" """
arch_suffix = self.sarch[1:] arch_suffix = self.sarch[1:]
cmd_list = None cmd_list = None
if self.sbase in ["deb", "dev", "debmin", "devmin", "debsrv", "devsrv", "debld", "devld"]: if self.sbase in ["deb", "dev", "debmin", "devmin", "debsrv",
"devsrv", "debld", "devld"]:
if arch_suffix in ["64", "32", "arm"]: if arch_suffix in ["64", "32", "arm"]:
os.system(f'touch {self.sbase.upper()}.{arch_suffix}gfb') os.system(f'touch {self.sbase.upper()}.{arch_suffix}gfb')
if arch_suffix in ["64", "32", "arm"]: if arch_suffix in ["64", "32", "arm"]:
@ -174,6 +183,7 @@ class BuildOpenbox(BuildBase):
""" """
super().__init__(sbase, sarch, self.opb_helper) super().__init__(sbase, sarch, self.opb_helper)
def opb_helper(self): def opb_helper(self):
""" """
The helper functions to ensure the openbox requirements are The helper functions to ensure the openbox requirements are
@ -181,7 +191,8 @@ class BuildOpenbox(BuildBase):
""" """
arch_suffix = self.sarch[1:] arch_suffix = self.sarch[1:]
cmd_list = None cmd_list = None
if self.sbase in ["deb", "dev", "debmin", "devmin", "debsrv", "devsrv", "debld", "devld"]: if self.sbase in ["deb", "dev", "debmin", "devmin", "debsrv",
"devsrv", "debld", "devld"]:
if arch_suffix in ["64", "32", "arm"]: if arch_suffix in ["64", "32", "arm"]:
os.system(f'touch {self.sbase.upper()}.{arch_suffix}opb') os.system(f'touch {self.sbase.upper()}.{arch_suffix}opb')
if arch_suffix in ["64", "32", "arm"]: if arch_suffix in ["64", "32", "arm"]:
@ -202,6 +213,7 @@ class BuildLoaded(BuildBase):
""" """
super().__init__(sbase, sarch, self.loaded_helper) super().__init__(sbase, sarch, self.loaded_helper)
def loaded_helper(self): def loaded_helper(self):
""" """
The helper functions to ensure the loaded xfce requirements are The helper functions to ensure the loaded xfce requirements are
@ -230,6 +242,7 @@ class BuildServer(BuildBase):
""" """
super().__init__(sbase, sarch, self.server_helper) super().__init__(sbase, sarch, self.server_helper)
def server_helper(self): def server_helper(self):
""" """
The helper functions to ensure the server requirements are The helper functions to ensure the server requirements are
@ -237,7 +250,8 @@ class BuildServer(BuildBase):
""" """
arch_suffix = self.sarch[1:] arch_suffix = self.sarch[1:]
cmd_list = None cmd_list = None
if self.sbase in ["deb", "dev", "debmin", "devmin", "debsrv", "devsrv", "debld", "devld"]: if self.sbase in ["deb", "dev", "debmin", "devmin", "debsrv",
"devsrv", "debld", "devld"]:
if arch_suffix in ["64", "32", "arm"]: if arch_suffix in ["64", "32", "arm"]:
os.system(f'touch {self.sbase.upper()}.{arch_suffix}server') os.system(f'touch {self.sbase.upper()}.{arch_suffix}server')
if arch_suffix in ["64", "32", "arm"]: if arch_suffix in ["64", "32", "arm"]:
@ -258,6 +272,7 @@ class BuildMini(BuildBase):
""" """
super().__init__(sbase, sarch, self.mini_helper) super().__init__(sbase, sarch, self.mini_helper)
def mini_helper(self): def mini_helper(self):
""" """
The helper functions to ensure the Mini requirements are The helper functions to ensure the Mini requirements are
@ -320,6 +335,7 @@ class Decisions:
if desktop_build_function: if desktop_build_function:
desktop_build_function() desktop_build_function()
def dxfce(self): def dxfce(self):
""" Arguments for the XFCE """ """ Arguments for the XFCE """
build_type_mapping = { build_type_mapping = {

View File

@ -3,11 +3,18 @@
* *
* License: SPDX-License-Identifier: GPL-3.0-or-later * License: SPDX-License-Identifier: GPL-3.0-or-later
* *
* This config file is the master configs used to build ISOs oer arch and desktop * This config file is the master configs used to build ISOs or arch
* As the need to scale the builds arises, you can add more settings to meet the * and desktop as the need to scale the builds arises, you can add more
* need. * settings to meet the need.
""" """
#########################################
# Sepcify the build to use, for exmaple #
# bookworm, trixie etc... #
#########################################
debian_codename ='bookworm'
devuan_codename ='daedalus'
########################## ##########################
# Functions to be ran # Functions to be ran
########################## ##########################
@ -27,33 +34,37 @@ shared_setup_cmds = ('inflate_bubble.set_fusato_structure',
'infra.add_web_profile' 'infra.add_web_profile'
) )
shared_setup_loaded_cmds = ('inflate_bubble.set_fusato_structure', shared_setup_loaded_cmds = (
'inflate_bubble.set_fusato_installer_structure', 'inflate_bubble.set_fusato_structure',
'inflate_bubble.set_general_shared', 'inflate_bubble.set_fusato_installer_structure',
'inflate_bubble.set_grub_shared', 'inflate_bubble.set_general_shared',
'inflate_bubble.set_binary_shared', 'inflate_bubble.set_grub_shared',
'inflate_bubble.set_lightdm', 'inflate_bubble.set_binary_shared',
'infra.shared_folders', 'inflate_bubble.set_lightdm',
'infra.icons_themes', 'infra.shared_folders',
'infra.shared_files', 'infra.icons_themes',
'infra.set_symlinks', 'infra.shared_files',
'infra.boostrap_shared' 'infra.set_symlinks',
'infra.boostrap_shared'
) )
shared_setup_server_cmds = ('inflate_bubble.set_fusato_server_installer_structure', shared_setup_server_cmds = (
'inflate_bubble.set_fusato_server_structure', 'inflate_bubble.set_fusato_server_installer_structure',
'inflate_bubble.set_grub_shared', 'inflate_bubble.set_fusato_server_structure',
'inflate_bubble.set_binary_shared', 'inflate_bubble.set_grub_shared',
'infra.shared_server_files', 'inflate_bubble.set_binary_shared',
'infra.boostrap_shared' 'infra.shared_server_files',
'infra.boostrap_shared'
) )
shared_setup_mini_cmds = ('inflate_bubble.set_fusato_mini_installer_structure', shared_setup_mini_cmds = (
'inflate_bubble.set_binary_shared', 'inflate_bubble.set_fusato_mini_installer_structure',
'infra.mini_shared_installer_files' 'inflate_bubble.set_binary_shared',
'infra.mini_shared_installer_files'
) )
flag_specific_setup_32_cmds = ('inflate_bubble.set_specific_32_packages',) flag_specific_setup_32_cmds = (
'inflate_bubble.set_specific_32_packages',)
# Setup Desktop configs # Setup Desktop configs
# Add mor as needed # Add mor as needed
@ -168,8 +179,15 @@ build32_mini_build = (shared_setup_mini_cmds + setup_mini_cmds +
### Inflate bubble section ### Inflate bubble section
# Packages that are to be installed as needed per Desktop # Packages that are to be installed as needed per Desktop
# Add more Desktops as the need arises # Add more Desktops as the need arises
XFCE_LIST = ('xfce4\n' XFCE_LIST = ('apt-xapian-index\n'
'mousepad\n' 'mousepad\n'
'mugshot\n'
'menulibre\n'
'plank\n'
'python3-xapian\n'
'thunar-archive-plugin\n'
'thunar-volman\n'
'xfce4\n'
'xfce4-battery-plugin\n' 'xfce4-battery-plugin\n'
'xfce4-clipman-plugin\n' 'xfce4-clipman-plugin\n'
'xfce4-power-manager\n' 'xfce4-power-manager\n'
@ -178,14 +196,7 @@ XFCE_LIST = ('xfce4\n'
'xfce4-screenshooter\n' 'xfce4-screenshooter\n'
'xfce4-whiskermenu-plugin\n' 'xfce4-whiskermenu-plugin\n'
'xfce4-panel-profiles\n' 'xfce4-panel-profiles\n'
'thunar-archive-plugin\n'
'thunar-volman\n'
'xarchiver\n' 'xarchiver\n'
'plank\n'
'mugshot\n'
'menulibre\n'
'python3-xapian\n'
'apt-xapian-index\n'
) )
GNOME_FLASHBACK_LIST = ('alacarte\n' GNOME_FLASHBACK_LIST = ('alacarte\n'
'eog\n' 'eog\n'
@ -234,101 +245,99 @@ OPENBOX_LIST = ('openbox\n'
'jgmenu\n' 'jgmenu\n'
) )
LOADED_LIST = ('xfce4\n' LOADED_LIST = ('accountsservice\n'
'xfce4-goodies\n'
'xorg\n'
'xserver-xorg\n'
'xserver-xorg-input-synaptics\n'
'xserver-xorg-input-all\n'
'xserver-xorg-video-vmware\n'
'xserver-xorg-video-all\n'
'apt-config-auto-update\n' 'apt-config-auto-update\n'
'atril\n'
'baobab\n'
'bleachbit\n'
'blueman\n'
'catfish\n'
'cheese\n'
'ffmpegthumbnailer\n'
'flatpak\n'
'gnome-packagekit\n' 'gnome-packagekit\n'
'gnome-system-tools\n' 'gnome-system-tools\n'
'gvfs-backends\n' 'gvfs-backends\n'
'blueman\n'
'gufw\n' 'gufw\n'
'tela-icon-theme\n' 'gnome-calculator\n'
'system-config-printer\n' 'gnome-2048\n'
'gnome-chess\n'
'gnome-mahjongg\n'
'gnome-sudoku\n'
'gimp\n'
'gimp-data-extras\n'
'gir1.2-flatpak-1.0\n'
'inkscape\n'
'menulibre\n' 'menulibre\n'
'libreoffice\n'
'libreoffice-gtk3\n'
'libreoffice-l10n*\n'
'mintstick\n'
'ntpsec-ntpdate\n'
'ntpsec\n'
'parole \n'
'peplocale\n'
'pepinstall\n'
'printer-driver-cups-pdf\n'
'qt5-style-plugins\n'
'qt5ct\n'
'squashfs-tools\n'
'sticky\n'
'transmission-gtk\n'
'timeshift\n'
'thunderbird\n'
'thunderbird-l10n-all\n'
'tumbler\n'
'tumbler-plugins-extra\n'
'system-config-printer\n'
'tela-icon-theme\n'
'xdg-user-dirs-gtk\n'
'xfce4\n'
'xfce4-goodies\n'
'xfsdump\n'
'xorg\n'
'xscreensaver\n' 'xscreensaver\n'
'xscreensaver-data\n' 'xscreensaver-data\n'
'xscreensaver-data-extra\n' 'xscreensaver-data-extra\n'
'xscreensaver-gl\n' 'xscreensaver-gl\n'
'xscreensaver-gl-extra\n' 'xscreensaver-gl-extra\n'
'gnome-calculator\n' 'xserver-xorg\n'
'accountsservice\n' 'xserver-xorg-input-synaptics\n'
'catfish\n' 'xserver-xorg-input-all\n'
'timeshift\n' 'xserver-xorg-video-vmware\n'
'pepinstall\n' 'xserver-xorg-video-all\n'
'sticky\n'
'mintstick\n'
'peplocale\n'
'bleachbit\n'
'gimp\n'
'gimp-data-extras\n'
'inkscape\n'
'atril\n'
'transmission-gtk\n'
'thunderbird\n'
'thunderbird-l10n-all\n'
'libreoffice\n'
'libreoffice-gtk3\n'
'libreoffice-l10n*\n'
'printer-driver-cups-pdf\n'
'gnome-2048\n'
'gnome-chess\n'
'gnome-mahjongg\n'
'gnome-sudoku\n'
'cheese\n'
'parole \n'
'qt5-style-plugins\n'
'qt5ct\n'
'xfsdump\n'
'tumbler\n'
'tumbler-plugins-extra\n'
'ffmpegthumbnailer\n'
'baobab\n'
'xdg-user-dirs-gtk\n'
'squashfs-tools\n'
'flatpak\n'
'gir1.2-flatpak-1.0\n'
'ntpsec-ntpdate\n'
'ntpsec\n'
) )
SERVER_LIST = ('zonefstoolspep\n' SERVER_LIST = ('btop\n'
'dmzonedtoolspep\n'
'libzbdpep1\n'
'sudo\n'
'task-ssh-server\n'
'task-web-server\n'
'sshguard\n'
'btop\n'
'whois\n'
'rkhunter\n'
'debsecan\n'
'net-tools\n'
'nfs-common\n'
'firewalld\n'
'samba\n'
'cups\n' 'cups\n'
'debsecan\n'
'dmzonedtoolspep\n'
'firewalld\n'
'gvfs-backends\n' 'gvfs-backends\n'
'git\n' 'git\n'
'net-tools\n'
'nfs-common\n'
'libzbdpep1\n'
'sudo\n'
'samba\n'
'rkhunter\n'
'sshguard\n'
'task-ssh-server\n'
'task-web-server\n'
'whois\n'
'wget\n' 'wget\n'
'zonefstoolspep\n'
) )
MINI_LIST = ('nano\n' MINI_LIST = ('nano\n'
) )
KDE_LIST = ('sample1\n' KDE_LIST = ('sample1\n'
'sample2\n' 'sample2\n'
) )
# The Light DM Login Settings # The Light DM Login Settings
LIGHT_DM_LIST = ('lightdm\n' LIGHT_DM_LIST = ('lightdm\n'
'lightdm-gtk-greeter\n' 'lightdm-gtk-greeter\n'
@ -531,18 +540,19 @@ BINARY_LIST_32 = ('grub-efi-ia32\n'
# Set the LB configs # Set the LB configs
# Shared by all # Shared by all
LBSET_MAIN_SHARED = ('lb config noauto' LBSET_MAIN_SHARED = (
' --archive-areas "main contrib non-free non-free-firmware"' 'lb config noauto'
' --apt-recommends true --backports false' ' --archive-areas "main contrib non-free non-free-firmware"'
' --binary-images iso-hybrid --cache true' ' --apt-recommends true --backports false'
' --checksums sha512 --clean --color' ' --binary-images iso-hybrid --cache true'
' --firmware-binary true --firmware-chroot false' ' --checksums sha512 --clean --color'
' --iso-application "PeppermintOS"' ' --firmware-binary true --firmware-chroot false'
' --iso-preparer "PeppermintOS-https://peppermintos.com/"' ' --iso-application "PeppermintOS"'
' --iso-publisher "Peppermint OS Team"' ' --iso-preparer "PeppermintOS-https://peppermintos.com/"'
' --iso-volume "PeppermintOS" --mode debian --quiet' ' --iso-publisher "Peppermint OS Team"'
' --security true --zsync false' ' --iso-volume "PeppermintOS" --mode debian --quiet'
' --updates true --win32-loader false' ' --security true --zsync false'
' --updates true --win32-loader false'
) )
# Shared by architecture # Shared by architecture
@ -556,7 +566,7 @@ LBSET_SHARED_ARM = (' --architectures arm64 --linux-flavours arm64'
# Shared By Debian # Shared By Debian
LBSET_DEBIAN_SHARED = ( LBSET_DEBIAN_SHARED = (
' --distribution bookworm' f' --distribution {debian_codename}'
' --mirror-bootstrap https://deb.debian.org/debian' ' --mirror-bootstrap https://deb.debian.org/debian'
' --parent-mirror-bootstrap https://deb.debian.org/debian' ' --parent-mirror-bootstrap https://deb.debian.org/debian'
' --parent-mirror-chroot https://deb.debian.org/debian' ' --parent-mirror-chroot https://deb.debian.org/debian'
@ -569,7 +579,7 @@ LBSET_DEBIAN_SHARED = (
# Shared By Devuan # Shared By Devuan
LBSET_DEVUAN_SHARED = ( LBSET_DEVUAN_SHARED = (
' --distribution daedalus' f' --distribution {devuan_codename}'
' --initsystem sysvinit' ' --initsystem sysvinit'
' --mirror-bootstrap http://deb.devuan.org/merged' ' --mirror-bootstrap http://deb.devuan.org/merged'
' --parent-mirror-bootstrap http://deb.devuan.org/merged' ' --parent-mirror-bootstrap http://deb.devuan.org/merged'
@ -589,84 +599,106 @@ LBSET_PRIVATE_DEV64 = (' --image-name "PeppermintOS-Devuan-64"')
LBSET_PRIVATE_DEBARM = (' --image-name "PeppermintOS-Debian-ARM"') LBSET_PRIVATE_DEBARM = (' --image-name "PeppermintOS-Debian-ARM"')
LBSET_PRIVATE_DEVARM = (' --debootstrap-options "--merged-usr"' LBSET_PRIVATE_DEVARM = (' --debootstrap-options "--merged-usr"'
' --image-name "PeppermintOS-Devuan-ARM"') ' --image-name "PeppermintOS-Devuan-ARM"')
LBSET_PRIVATE_LOADED_DEB64 = (' --image-name "PeppermintOS-Loaded-Debian-64"') LBSET_PRIVATE_LOADED_DEB64 = (
LBSET_PRIVATE_LOADED_DEV64 = (' --image-name "PeppermintOS-Loaded-Devuan-64"') ' --image-name "PeppermintOS-Loaded-Debian-64"')
LBSET_PRIVATE_LOADED_DEB32 = (' --image-name "PeppermintOS-Loaded-Debian-32"') LBSET_PRIVATE_LOADED_DEV64 = (
LBSET_PRIVATE_LOADED_DEV32 = (' --image-name "PeppermintOS-Loaded-Devuan-32"') ' --image-name "PeppermintOS-Loaded-Devuan-64"')
LBSET_PRIVATE_LOADED_DEB32 = (
' --image-name "PeppermintOS-Loaded-Debian-32"')
LBSET_PRIVATE_LOADED_DEV32 = (
' --image-name "PeppermintOS-Loaded-Devuan-32"')
# Private to de server and mini builds # Share to deb server and mini builds
LBSET_SHARED_INSTALLER_DEB = (' --debian-installer-distribution "bookworm"' LBSET_SHARED_INSTALLER_DEB = (
' --debian-installer-gui true' f' --debian-installer-distribution "{debian_codename}"'
' --debian-installer-gui true'
) )
LBSET_SHARED_INSTALLER_DEV = (' --debian-installer-distribution "daedalus"' LBSET_SHARED_INSTALLER_DEV = (
' --debian-installer-gui true' f' --debian-installer-distribution "{devuan_codename}"'
' --parent-mirror-debian-installer http://deb.devuan.org/devuan' ' --debian-installer-gui true'
' --parent-mirror-debian-installer http://deb.devuan.org/devuan'
) )
LBSET_SHARED_INSTALLER_MINI = (' --debootstrap-options --include=zstd,locales,dialog,krb5-locales' LBSET_SHARED_INSTALLER_MINI = (
' --debian-installer cdrom' ' --debootstrap-options --include=zstd,locales,dialog,krb5-locales'
' --debian-installer cdrom'
) )
LBSET_PRIVATE_SERVER_DEB64 = (' --image-name "PeppermintOS-server-Debian-64"' # Private to deb server and mini builds
' --debian-installer live' LBSET_PRIVATE_SERVER_DEB64 = (
' --image-name "PeppermintOS-server-Debian-64"'
' --debian-installer live'
) )
LBSET_PRIVATE_SERVER_DEV64 = (' --image-name "PeppermintOS-server-Devuan-64"' LBSET_PRIVATE_SERVER_DEV64 = (
' --debian-installer live' ' --image-name "PeppermintOS-server-Devuan-64"'
' --debian-installer live'
) )
LBSET_PRIVATE_MINI_DEB64 = (' --image-name "PeppermintOS-mini-Debian-64"') LBSET_PRIVATE_MINI_DEB64 = (
LBSET_PRIVATE_MINI_DEV64 = (' --image-name "PeppermintOS-mini-Devuan-64"') ' --image-name "PeppermintOS-mini-Debian-64"')
LBSET_PRIVATE_MINI_DEB32 = (' --image-name "PeppermintOS-mini-Debian-32"') LBSET_PRIVATE_MINI_DEV64 = (
LBSET_PRIVATE_MINI_DEV32 = (' --image-name "PeppermintOS-mini-Devuan-32"') ' --image-name "PeppermintOS-mini-Devuan-64"')
LBSET_PRIVATE_MINI_DEB32 = (
' --image-name "PeppermintOS-mini-Debian-32"')
LBSET_PRIVATE_MINI_DEV32 = (
' --image-name "PeppermintOS-mini-Devuan-32"')
# These are the correct order combined LB commands for the builds by ISO name
# these are used during the pipeline building process.
LBSET_DEB32 = (LBSET_MAIN_SHARED + LBSET_SHARED_32 # These are the correct order combined LB commands for the builds by ISO
+ LBSET_DEBIAN_SHARED + LBSET_PRIVATE_DEB32 # name these are used during the pipeline building process.
LBSET_DEB32 = (LBSET_MAIN_SHARED + LBSET_SHARED_32 +
LBSET_DEBIAN_SHARED + LBSET_PRIVATE_DEB32
) )
LBSET_DEB64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEBIAN_SHARED LBSET_DEB64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 +
+ LBSET_PRIVATE_DEB64 LBSET_DEBIAN_SHARED + LBSET_PRIVATE_DEB64
) )
LBSET_DEV32 = (LBSET_MAIN_SHARED + LBSET_SHARED_32 + LBSET_DEVUAN_SHARED LBSET_DEV32 = (LBSET_MAIN_SHARED + LBSET_SHARED_32 +
+ LBSET_PRIVATE_DEV32 LBSET_DEVUAN_SHARED + LBSET_PRIVATE_DEV32
) )
LBSET_DEV64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEVUAN_SHARED LBSET_DEV64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 +
+ LBSET_PRIVATE_DEV64 LBSET_DEVUAN_SHARED + LBSET_PRIVATE_DEV64
) )
LBSET_DEVarm =(LBSET_MAIN_SHARED + LBSET_SHARED_ARM + LBSET_DEVUAN_SHARED LBSET_DEVarm =(LBSET_MAIN_SHARED + LBSET_SHARED_ARM +
+ LBSET_PRIVATE_DEVARM LBSET_DEVUAN_SHARED + LBSET_PRIVATE_DEVARM
) )
LBSET_DEBarm =(LBSET_MAIN_SHARED + LBSET_SHARED_ARM + LBSET_DEBIAN_SHARED LBSET_DEBarm =(LBSET_MAIN_SHARED + LBSET_SHARED_ARM +
+ LBSET_PRIVATE_DEBARM LBSET_DEBIAN_SHARED + LBSET_PRIVATE_DEBARM
) )
LBSET_DEBLD64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEBIAN_SHARED LBSET_DEBLD64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 +
+ LBSET_PRIVATE_LOADED_DEB64 LBSET_DEBIAN_SHARED + LBSET_PRIVATE_LOADED_DEB64
) )
LBSET_DEVLD64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEVUAN_SHARED LBSET_DEVLD64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 +
+ LBSET_PRIVATE_LOADED_DEV64 LBSET_DEVUAN_SHARED + LBSET_PRIVATE_LOADED_DEV64
) )
LBSET_DEBLD32 = (LBSET_MAIN_SHARED + LBSET_SHARED_32 + LBSET_DEBIAN_SHARED LBSET_DEBLD32 = (LBSET_MAIN_SHARED + LBSET_SHARED_32 +
+ LBSET_PRIVATE_LOADED_DEB32 LBSET_DEBIAN_SHARED + LBSET_PRIVATE_LOADED_DEB32
) )
LBSET_DEVLD32 = (LBSET_MAIN_SHARED + LBSET_SHARED_32 + LBSET_DEVUAN_SHARED LBSET_DEVLD32 = (LBSET_MAIN_SHARED + LBSET_SHARED_32 +
+ LBSET_PRIVATE_LOADED_DEV32 LBSET_DEVUAN_SHARED + LBSET_PRIVATE_LOADED_DEV32
) )
LBSET_DEBSRV64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEBIAN_SHARED LBSET_DEBSRV64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 +
+ LBSET_PRIVATE_SERVER_DEB64 + LBSET_SHARED_INSTALLER_DEB LBSET_DEBIAN_SHARED + LBSET_PRIVATE_SERVER_DEB64 +
LBSET_SHARED_INSTALLER_DEB
) )
LBSET_DEVSRV64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEVUAN_SHARED LBSET_DEVSRV64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 +
+ LBSET_PRIVATE_SERVER_DEV64 + LBSET_SHARED_INSTALLER_DEV LBSET_DEVUAN_SHARED + LBSET_PRIVATE_SERVER_DEV64 +
LBSET_SHARED_INSTALLER_DEV
) )
LBSET_DEBMIN64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEBIAN_SHARED LBSET_DEBMIN64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 +
+ LBSET_PRIVATE_MINI_DEB64 + LBSET_SHARED_INSTALLER_DEB LBSET_DEBIAN_SHARED + LBSET_PRIVATE_MINI_DEB64 +
+ LBSET_SHARED_INSTALLER_MINI LBSET_SHARED_INSTALLER_DEB +
LBSET_SHARED_INSTALLER_MINI
) )
LBSET_DEVMIN64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEVUAN_SHARED LBSET_DEVMIN64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 +
+ LBSET_PRIVATE_MINI_DEB64 + LBSET_SHARED_INSTALLER_DEV LBSET_DEVUAN_SHARED + LBSET_PRIVATE_MINI_DEB64 +
+ LBSET_SHARED_INSTALLER_MINI LBSET_SHARED_INSTALLER_DEV +
LBSET_SHARED_INSTALLER_MINI
) )
LBSET_DEBMIN32 = (LBSET_MAIN_SHARED + LBSET_SHARED_32 + LBSET_DEBIAN_SHARED LBSET_DEBMIN32 = (LBSET_MAIN_SHARED + LBSET_SHARED_32 +
+ LBSET_PRIVATE_MINI_DEB32 + LBSET_SHARED_INSTALLER_DEB LBSET_DEBIAN_SHARED + LBSET_PRIVATE_MINI_DEB32 +
+ LBSET_SHARED_INSTALLER_MINI LBSET_SHARED_INSTALLER_DEB +
LBSET_SHARED_INSTALLER_MINI
) )
LBSET_DEVMIN32 = (LBSET_MAIN_SHARED + LBSET_SHARED_32 + LBSET_DEVUAN_SHARED LBSET_DEVMIN32 = (LBSET_MAIN_SHARED + LBSET_SHARED_32 +
+ LBSET_PRIVATE_MINI_DEB32 + LBSET_SHARED_INSTALLER_DEV LBSET_DEVUAN_SHARED + LBSET_PRIVATE_MINI_DEB32 +
+ LBSET_SHARED_INSTALLER_MINI LBSET_SHARED_INSTALLER_DEV +
LBSET_SHARED_INSTALLER_MINI
) )