From e0798f25060fb87a13a3bd088ec9e020d9b4c3ba Mon Sep 17 00:00:00 2001 From: debianpepper Date: Sat, 31 Aug 2024 23:01:29 +0900 Subject: [PATCH] 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 --- .../hooks/live/0020-run-py-live.hook.chroot | 2 +- .../normal/deb_32/0540-run-py.hook.chroot | 8 +- .../normal/deb_64/0540-run-py.hook.chroot | 8 +- .../normal/deb_arm/0540-run-py.hook.chroot | 8 +- .../normal/dev_32/0540-run-py.hook.chroot | 8 +- .../normal/dev_64/0540-run-py.hook.chroot | 8 +- .../normal/dev_arm/0540-run-py.hook.chroot | 8 +- iso_configs/pylibraries/pepperpy/hooks.py | 22 +- .../pylibraries/pepperpy/hooks_live.py | 1 + python_modules/build_iso.py | 24 +- python_modules/conf.py | 374 ++++++++++-------- 11 files changed, 246 insertions(+), 225 deletions(-) diff --git a/iso_configs/hooks/live/0020-run-py-live.hook.chroot b/iso_configs/hooks/live/0020-run-py-live.hook.chroot index d40c09aa..4c317904 100755 --- a/iso_configs/hooks/live/0020-run-py-live.hook.chroot +++ b/iso_configs/hooks/live/0020-run-py-live.hook.chroot @@ -1,3 +1,3 @@ #!/bin/bash # 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 \ No newline at end of file diff --git a/iso_configs/hooks/normal/deb_32/0540-run-py.hook.chroot b/iso_configs/hooks/normal/deb_32/0540-run-py.hook.chroot index 31cab666..2efea8bc 100755 --- a/iso_configs/hooks/normal/deb_32/0540-run-py.hook.chroot +++ b/iso_configs/hooks/normal/deb_32/0540-run-py.hook.chroot @@ -1,9 +1,3 @@ #!/bin/bash # run the main Hooks python module -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 - - +python3 /usr/lib/python3/dist-packages/pepperpy/hooks.py \ No newline at end of file diff --git a/iso_configs/hooks/normal/deb_64/0540-run-py.hook.chroot b/iso_configs/hooks/normal/deb_64/0540-run-py.hook.chroot index 31cab666..2efea8bc 100755 --- a/iso_configs/hooks/normal/deb_64/0540-run-py.hook.chroot +++ b/iso_configs/hooks/normal/deb_64/0540-run-py.hook.chroot @@ -1,9 +1,3 @@ #!/bin/bash # run the main Hooks python module -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 - - +python3 /usr/lib/python3/dist-packages/pepperpy/hooks.py \ No newline at end of file diff --git a/iso_configs/hooks/normal/deb_arm/0540-run-py.hook.chroot b/iso_configs/hooks/normal/deb_arm/0540-run-py.hook.chroot index 31cab666..2efea8bc 100755 --- a/iso_configs/hooks/normal/deb_arm/0540-run-py.hook.chroot +++ b/iso_configs/hooks/normal/deb_arm/0540-run-py.hook.chroot @@ -1,9 +1,3 @@ #!/bin/bash # run the main Hooks python module -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 - - +python3 /usr/lib/python3/dist-packages/pepperpy/hooks.py \ No newline at end of file diff --git a/iso_configs/hooks/normal/dev_32/0540-run-py.hook.chroot b/iso_configs/hooks/normal/dev_32/0540-run-py.hook.chroot index 31cab666..2efea8bc 100755 --- a/iso_configs/hooks/normal/dev_32/0540-run-py.hook.chroot +++ b/iso_configs/hooks/normal/dev_32/0540-run-py.hook.chroot @@ -1,9 +1,3 @@ #!/bin/bash # run the main Hooks python module -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 - - +python3 /usr/lib/python3/dist-packages/pepperpy/hooks.py \ No newline at end of file diff --git a/iso_configs/hooks/normal/dev_64/0540-run-py.hook.chroot b/iso_configs/hooks/normal/dev_64/0540-run-py.hook.chroot index 31cab666..2efea8bc 100755 --- a/iso_configs/hooks/normal/dev_64/0540-run-py.hook.chroot +++ b/iso_configs/hooks/normal/dev_64/0540-run-py.hook.chroot @@ -1,9 +1,3 @@ #!/bin/bash # run the main Hooks python module -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 - - +python3 /usr/lib/python3/dist-packages/pepperpy/hooks.py \ No newline at end of file diff --git a/iso_configs/hooks/normal/dev_arm/0540-run-py.hook.chroot b/iso_configs/hooks/normal/dev_arm/0540-run-py.hook.chroot index 31cab666..2efea8bc 100755 --- a/iso_configs/hooks/normal/dev_arm/0540-run-py.hook.chroot +++ b/iso_configs/hooks/normal/dev_arm/0540-run-py.hook.chroot @@ -1,9 +1,3 @@ #!/bin/bash # run the main Hooks python module -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 - - +python3 /usr/lib/python3/dist-packages/pepperpy/hooks.py \ No newline at end of file diff --git a/iso_configs/pylibraries/pepperpy/hooks.py b/iso_configs/pylibraries/pepperpy/hooks.py index 758e32b5..4c1c3da7 100644 --- a/iso_configs/pylibraries/pepperpy/hooks.py +++ b/iso_configs/pylibraries/pepperpy/hooks.py @@ -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 platform @@ -28,7 +35,7 @@ def remove_packages_from_the_build(): 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 """ @@ -128,7 +135,8 @@ def hblock_setup(): os.system('chmod 755 /usr/local/bin/hblock') 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(): """ 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. os.system('update-icon-caches /usr/share/icons/*') ### 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 "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. #sed s/keyutils/"keyutils --install-recommends"/ /usr/sbin/bootloader-config > /tmp/bootloader-config @@ -274,7 +282,7 @@ def start(): apt_install_packages() remove_packages_from_the_build() install_librewolf_browser() - remmove_desktop_files() + remove_desktop_files() setup_plymouth_theme_grub() hblock_setup() manage_raspi_firmware() @@ -285,7 +293,7 @@ def start(): rename_kernel() else: apt_install_packages() - remmove_desktop_files() + remove_desktop_files() remove_packages_from_the_build() setup_plymouth_theme_grub() hblock_setup() diff --git a/iso_configs/pylibraries/pepperpy/hooks_live.py b/iso_configs/pylibraries/pepperpy/hooks_live.py index 43961445..8247a77d 100644 --- a/iso_configs/pylibraries/pepperpy/hooks_live.py +++ b/iso_configs/pylibraries/pepperpy/hooks_live.py @@ -139,6 +139,7 @@ def other_misc_settings(): # Then recreate it with the Pep Background os.system(makelnk) + def remmove_desktop_files(): """ Use this def to remove any .desktop files you donot need diff --git a/python_modules/build_iso.py b/python_modules/build_iso.py index c56b615d..e157f73e 100644 --- a/python_modules/build_iso.py +++ b/python_modules/build_iso.py @@ -40,6 +40,7 @@ START_LIVEBUILD = "Start Live-Build Process" BUILD_COMPILED = "ISO build has compiled successfully" BUILD_COMPLETED = "ISO is ready for usage. Begin copy to Nightly for QA testing" + class BuildBase: """ Base class for building ISOs. @@ -55,10 +56,12 @@ class BuildBase: os.chdir(HOME_FOLDER + FUSATO_ROOT) self.build_system(desktop_helper) + def lb_helper(self): """ Helper to set the lb commands for live-build""" 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:] if arch_suffix in ["64", "32", "arm"]: lbsetup = getattr( @@ -67,6 +70,7 @@ class BuildBase: os.system(lbsetup) return lbsetup + def infra_helper(self): """ Get the build infrastucture ready """ infra_methods = [infra.BinaryFolders, infra.ChrootInstallerFiles, @@ -76,12 +80,14 @@ class BuildBase: for method in infra_methods: method(self.sbase, self.sarch) + def cleanup_helper(self): """ Clean and Move the comleted ISO """ finish_cleanup.make_check_sum() finish_cleanup.check_build_type() finish_cleanup.kill_old_iso() + def build_system(self, desktop_helper): """ The actual building process """ current_working_directory = os.getcwd() @@ -120,6 +126,7 @@ class BuildXfce(BuildBase): """ super().__init__(sbase, sarch, self.xfce_helper) + def xfce_helper(self): """ The helper functions to ensure the xfce requirements are used """ arch_suffix = self.sarch[1:] @@ -146,6 +153,7 @@ class BuildGflashback(BuildBase): """ super().__init__(sbase, sarch, self.gfb_helper) + def gfb_helper(self): """ The helper functions to ensure the gnome flashback requirements @@ -153,7 +161,8 @@ class BuildGflashback(BuildBase): """ arch_suffix = self.sarch[1:] 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"]: os.system(f'touch {self.sbase.upper()}.{arch_suffix}gfb') if arch_suffix in ["64", "32", "arm"]: @@ -174,6 +183,7 @@ class BuildOpenbox(BuildBase): """ super().__init__(sbase, sarch, self.opb_helper) + def opb_helper(self): """ The helper functions to ensure the openbox requirements are @@ -181,7 +191,8 @@ class BuildOpenbox(BuildBase): """ arch_suffix = self.sarch[1:] 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"]: os.system(f'touch {self.sbase.upper()}.{arch_suffix}opb') if arch_suffix in ["64", "32", "arm"]: @@ -202,6 +213,7 @@ class BuildLoaded(BuildBase): """ super().__init__(sbase, sarch, self.loaded_helper) + def loaded_helper(self): """ The helper functions to ensure the loaded xfce requirements are @@ -230,6 +242,7 @@ class BuildServer(BuildBase): """ super().__init__(sbase, sarch, self.server_helper) + def server_helper(self): """ The helper functions to ensure the server requirements are @@ -237,7 +250,8 @@ class BuildServer(BuildBase): """ arch_suffix = self.sarch[1:] 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"]: os.system(f'touch {self.sbase.upper()}.{arch_suffix}server') if arch_suffix in ["64", "32", "arm"]: @@ -258,6 +272,7 @@ class BuildMini(BuildBase): """ super().__init__(sbase, sarch, self.mini_helper) + def mini_helper(self): """ The helper functions to ensure the Mini requirements are @@ -320,6 +335,7 @@ class Decisions: if desktop_build_function: desktop_build_function() + def dxfce(self): """ Arguments for the XFCE """ build_type_mapping = { diff --git a/python_modules/conf.py b/python_modules/conf.py index c9a273be..43594961 100644 --- a/python_modules/conf.py +++ b/python_modules/conf.py @@ -3,11 +3,18 @@ * * License: SPDX-License-Identifier: GPL-3.0-or-later * -* This config file is the master configs used to build ISOs oer arch and desktop -* As the need to scale the builds arises, you can add more settings to meet the -* need. +* This config file is the master configs used to build ISOs or arch +* and desktop as the need to scale the builds arises, you can add more +* 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 ########################## @@ -27,33 +34,37 @@ shared_setup_cmds = ('inflate_bubble.set_fusato_structure', 'infra.add_web_profile' ) -shared_setup_loaded_cmds = ('inflate_bubble.set_fusato_structure', - 'inflate_bubble.set_fusato_installer_structure', - 'inflate_bubble.set_general_shared', - 'inflate_bubble.set_grub_shared', - 'inflate_bubble.set_binary_shared', - 'inflate_bubble.set_lightdm', - 'infra.shared_folders', - 'infra.icons_themes', - 'infra.shared_files', - 'infra.set_symlinks', - 'infra.boostrap_shared' +shared_setup_loaded_cmds = ( + 'inflate_bubble.set_fusato_structure', + 'inflate_bubble.set_fusato_installer_structure', + 'inflate_bubble.set_general_shared', + 'inflate_bubble.set_grub_shared', + 'inflate_bubble.set_binary_shared', + 'inflate_bubble.set_lightdm', + 'infra.shared_folders', + 'infra.icons_themes', + 'infra.shared_files', + 'infra.set_symlinks', + 'infra.boostrap_shared' ) -shared_setup_server_cmds = ('inflate_bubble.set_fusato_server_installer_structure', - 'inflate_bubble.set_fusato_server_structure', - 'inflate_bubble.set_grub_shared', - 'inflate_bubble.set_binary_shared', - 'infra.shared_server_files', - 'infra.boostrap_shared' +shared_setup_server_cmds = ( + 'inflate_bubble.set_fusato_server_installer_structure', + 'inflate_bubble.set_fusato_server_structure', + 'inflate_bubble.set_grub_shared', + 'inflate_bubble.set_binary_shared', + 'infra.shared_server_files', + 'infra.boostrap_shared' ) -shared_setup_mini_cmds = ('inflate_bubble.set_fusato_mini_installer_structure', - 'inflate_bubble.set_binary_shared', - 'infra.mini_shared_installer_files' +shared_setup_mini_cmds = ( + 'inflate_bubble.set_fusato_mini_installer_structure', + '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 # Add mor as needed @@ -168,8 +179,15 @@ build32_mini_build = (shared_setup_mini_cmds + setup_mini_cmds + ### Inflate bubble section # Packages that are to be installed as needed per Desktop # Add more Desktops as the need arises -XFCE_LIST = ('xfce4\n' +XFCE_LIST = ('apt-xapian-index\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-clipman-plugin\n' 'xfce4-power-manager\n' @@ -178,14 +196,7 @@ XFCE_LIST = ('xfce4\n' 'xfce4-screenshooter\n' 'xfce4-whiskermenu-plugin\n' 'xfce4-panel-profiles\n' - 'thunar-archive-plugin\n' - 'thunar-volman\n' 'xarchiver\n' - 'plank\n' - 'mugshot\n' - 'menulibre\n' - 'python3-xapian\n' - 'apt-xapian-index\n' ) GNOME_FLASHBACK_LIST = ('alacarte\n' 'eog\n' @@ -234,101 +245,99 @@ OPENBOX_LIST = ('openbox\n' 'jgmenu\n' ) -LOADED_LIST = ('xfce4\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' +LOADED_LIST = ('accountsservice\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-system-tools\n' 'gvfs-backends\n' - 'blueman\n' 'gufw\n' - 'tela-icon-theme\n' - 'system-config-printer\n' + 'gnome-calculator\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' + '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-data\n' 'xscreensaver-data-extra\n' 'xscreensaver-gl\n' 'xscreensaver-gl-extra\n' - 'gnome-calculator\n' - 'accountsservice\n' - 'catfish\n' - 'timeshift\n' - 'pepinstall\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' + 'xserver-xorg\n' + 'xserver-xorg-input-synaptics\n' + 'xserver-xorg-input-all\n' + 'xserver-xorg-video-vmware\n' + 'xserver-xorg-video-all\n' ) -SERVER_LIST = ('zonefstoolspep\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' +SERVER_LIST = ('btop\n' 'cups\n' + 'debsecan\n' + 'dmzonedtoolspep\n' + 'firewalld\n' 'gvfs-backends\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' + 'zonefstoolspep\n' ) MINI_LIST = ('nano\n' ) - KDE_LIST = ('sample1\n' 'sample2\n' ) - # The Light DM Login Settings LIGHT_DM_LIST = ('lightdm\n' 'lightdm-gtk-greeter\n' @@ -531,18 +540,19 @@ BINARY_LIST_32 = ('grub-efi-ia32\n' # Set the LB configs # Shared by all -LBSET_MAIN_SHARED = ('lb config noauto' - ' --archive-areas "main contrib non-free non-free-firmware"' - ' --apt-recommends true --backports false' - ' --binary-images iso-hybrid --cache true' - ' --checksums sha512 --clean --color' - ' --firmware-binary true --firmware-chroot false' - ' --iso-application "PeppermintOS"' - ' --iso-preparer "PeppermintOS-https://peppermintos.com/"' - ' --iso-publisher "Peppermint OS Team"' - ' --iso-volume "PeppermintOS" --mode debian --quiet' - ' --security true --zsync false' - ' --updates true --win32-loader false' +LBSET_MAIN_SHARED = ( + 'lb config noauto' + ' --archive-areas "main contrib non-free non-free-firmware"' + ' --apt-recommends true --backports false' + ' --binary-images iso-hybrid --cache true' + ' --checksums sha512 --clean --color' + ' --firmware-binary true --firmware-chroot false' + ' --iso-application "PeppermintOS"' + ' --iso-preparer "PeppermintOS-https://peppermintos.com/"' + ' --iso-publisher "Peppermint OS Team"' + ' --iso-volume "PeppermintOS" --mode debian --quiet' + ' --security true --zsync false' + ' --updates true --win32-loader false' ) # Shared by architecture @@ -556,7 +566,7 @@ LBSET_SHARED_ARM = (' --architectures arm64 --linux-flavours arm64' # Shared By Debian LBSET_DEBIAN_SHARED = ( -' --distribution bookworm' +f' --distribution {debian_codename}' ' --mirror-bootstrap https://deb.debian.org/debian' ' --parent-mirror-bootstrap https://deb.debian.org/debian' ' --parent-mirror-chroot https://deb.debian.org/debian' @@ -569,7 +579,7 @@ LBSET_DEBIAN_SHARED = ( # Shared By Devuan LBSET_DEVUAN_SHARED = ( -' --distribution daedalus' +f' --distribution {devuan_codename}' ' --initsystem sysvinit' ' --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_DEVARM = (' --debootstrap-options "--merged-usr"' ' --image-name "PeppermintOS-Devuan-ARM"') -LBSET_PRIVATE_LOADED_DEB64 = (' --image-name "PeppermintOS-Loaded-Debian-64"') -LBSET_PRIVATE_LOADED_DEV64 = (' --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"') +LBSET_PRIVATE_LOADED_DEB64 = ( + ' --image-name "PeppermintOS-Loaded-Debian-64"') +LBSET_PRIVATE_LOADED_DEV64 = ( + ' --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 -LBSET_SHARED_INSTALLER_DEB = (' --debian-installer-distribution "bookworm"' - ' --debian-installer-gui true' +# Share to deb server and mini builds +LBSET_SHARED_INSTALLER_DEB = ( + f' --debian-installer-distribution "{debian_codename}"' + ' --debian-installer-gui true' ) -LBSET_SHARED_INSTALLER_DEV = (' --debian-installer-distribution "daedalus"' - ' --debian-installer-gui true' - ' --parent-mirror-debian-installer http://deb.devuan.org/devuan' +LBSET_SHARED_INSTALLER_DEV = ( + f' --debian-installer-distribution "{devuan_codename}"' + ' --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' - ' --debian-installer cdrom' +LBSET_SHARED_INSTALLER_MINI = ( + ' --debootstrap-options --include=zstd,locales,dialog,krb5-locales' + ' --debian-installer cdrom' ) -LBSET_PRIVATE_SERVER_DEB64 = (' --image-name "PeppermintOS-server-Debian-64"' - ' --debian-installer live' +# Private to deb server and mini builds +LBSET_PRIVATE_SERVER_DEB64 = ( + ' --image-name "PeppermintOS-server-Debian-64"' + ' --debian-installer live' ) -LBSET_PRIVATE_SERVER_DEV64 = (' --image-name "PeppermintOS-server-Devuan-64"' - ' --debian-installer live' +LBSET_PRIVATE_SERVER_DEV64 = ( + ' --image-name "PeppermintOS-server-Devuan-64"' + ' --debian-installer live' ) -LBSET_PRIVATE_MINI_DEB64 = (' --image-name "PeppermintOS-mini-Debian-64"') -LBSET_PRIVATE_MINI_DEV64 = (' --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"') +LBSET_PRIVATE_MINI_DEB64 = ( + ' --image-name "PeppermintOS-mini-Debian-64"') +LBSET_PRIVATE_MINI_DEV64 = ( + ' --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 - + LBSET_DEBIAN_SHARED + LBSET_PRIVATE_DEB32 + + +# 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 + + LBSET_DEBIAN_SHARED + LBSET_PRIVATE_DEB32 ) -LBSET_DEB64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEBIAN_SHARED - + LBSET_PRIVATE_DEB64 +LBSET_DEB64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + + LBSET_DEBIAN_SHARED + LBSET_PRIVATE_DEB64 ) -LBSET_DEV32 = (LBSET_MAIN_SHARED + LBSET_SHARED_32 + LBSET_DEVUAN_SHARED - + LBSET_PRIVATE_DEV32 +LBSET_DEV32 = (LBSET_MAIN_SHARED + LBSET_SHARED_32 + + LBSET_DEVUAN_SHARED + LBSET_PRIVATE_DEV32 ) -LBSET_DEV64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEVUAN_SHARED - + LBSET_PRIVATE_DEV64 +LBSET_DEV64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + + LBSET_DEVUAN_SHARED + LBSET_PRIVATE_DEV64 ) -LBSET_DEVarm =(LBSET_MAIN_SHARED + LBSET_SHARED_ARM + LBSET_DEVUAN_SHARED - + LBSET_PRIVATE_DEVARM +LBSET_DEVarm =(LBSET_MAIN_SHARED + LBSET_SHARED_ARM + + LBSET_DEVUAN_SHARED + LBSET_PRIVATE_DEVARM ) -LBSET_DEBarm =(LBSET_MAIN_SHARED + LBSET_SHARED_ARM + LBSET_DEBIAN_SHARED - + LBSET_PRIVATE_DEBARM +LBSET_DEBarm =(LBSET_MAIN_SHARED + LBSET_SHARED_ARM + + LBSET_DEBIAN_SHARED + LBSET_PRIVATE_DEBARM ) -LBSET_DEBLD64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEBIAN_SHARED - + LBSET_PRIVATE_LOADED_DEB64 +LBSET_DEBLD64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + + LBSET_DEBIAN_SHARED + LBSET_PRIVATE_LOADED_DEB64 ) -LBSET_DEVLD64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEVUAN_SHARED - + LBSET_PRIVATE_LOADED_DEV64 +LBSET_DEVLD64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + + LBSET_DEVUAN_SHARED + LBSET_PRIVATE_LOADED_DEV64 ) -LBSET_DEBLD32 = (LBSET_MAIN_SHARED + LBSET_SHARED_32 + LBSET_DEBIAN_SHARED - + LBSET_PRIVATE_LOADED_DEB32 +LBSET_DEBLD32 = (LBSET_MAIN_SHARED + LBSET_SHARED_32 + + LBSET_DEBIAN_SHARED + LBSET_PRIVATE_LOADED_DEB32 ) -LBSET_DEVLD32 = (LBSET_MAIN_SHARED + LBSET_SHARED_32 + LBSET_DEVUAN_SHARED - + LBSET_PRIVATE_LOADED_DEV32 +LBSET_DEVLD32 = (LBSET_MAIN_SHARED + LBSET_SHARED_32 + + LBSET_DEVUAN_SHARED + LBSET_PRIVATE_LOADED_DEV32 ) -LBSET_DEBSRV64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEBIAN_SHARED - + LBSET_PRIVATE_SERVER_DEB64 + LBSET_SHARED_INSTALLER_DEB +LBSET_DEBSRV64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + + LBSET_DEBIAN_SHARED + LBSET_PRIVATE_SERVER_DEB64 + + LBSET_SHARED_INSTALLER_DEB ) -LBSET_DEVSRV64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEVUAN_SHARED - + LBSET_PRIVATE_SERVER_DEV64 + LBSET_SHARED_INSTALLER_DEV +LBSET_DEVSRV64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + + LBSET_DEVUAN_SHARED + LBSET_PRIVATE_SERVER_DEV64 + + LBSET_SHARED_INSTALLER_DEV ) -LBSET_DEBMIN64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEBIAN_SHARED - + LBSET_PRIVATE_MINI_DEB64 + LBSET_SHARED_INSTALLER_DEB - + LBSET_SHARED_INSTALLER_MINI +LBSET_DEBMIN64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + + LBSET_DEBIAN_SHARED + LBSET_PRIVATE_MINI_DEB64 + + LBSET_SHARED_INSTALLER_DEB + + LBSET_SHARED_INSTALLER_MINI ) -LBSET_DEVMIN64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEVUAN_SHARED - + LBSET_PRIVATE_MINI_DEB64 + LBSET_SHARED_INSTALLER_DEV - + LBSET_SHARED_INSTALLER_MINI +LBSET_DEVMIN64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + + LBSET_DEVUAN_SHARED + LBSET_PRIVATE_MINI_DEB64 + + LBSET_SHARED_INSTALLER_DEV + + LBSET_SHARED_INSTALLER_MINI ) -LBSET_DEBMIN32 = (LBSET_MAIN_SHARED + LBSET_SHARED_32 + LBSET_DEBIAN_SHARED - + LBSET_PRIVATE_MINI_DEB32 + LBSET_SHARED_INSTALLER_DEB - + LBSET_SHARED_INSTALLER_MINI +LBSET_DEBMIN32 = (LBSET_MAIN_SHARED + LBSET_SHARED_32 + + LBSET_DEBIAN_SHARED + LBSET_PRIVATE_MINI_DEB32 + + LBSET_SHARED_INSTALLER_DEB + + LBSET_SHARED_INSTALLER_MINI ) -LBSET_DEVMIN32 = (LBSET_MAIN_SHARED + LBSET_SHARED_32 + LBSET_DEVUAN_SHARED - + LBSET_PRIVATE_MINI_DEB32 + LBSET_SHARED_INSTALLER_DEV - + LBSET_SHARED_INSTALLER_MINI +LBSET_DEVMIN32 = (LBSET_MAIN_SHARED + LBSET_SHARED_32 + + LBSET_DEVUAN_SHARED + LBSET_PRIVATE_MINI_DEB32 + + LBSET_SHARED_INSTALLER_DEV + + LBSET_SHARED_INSTALLER_MINI )