From a3ef4f4744852db895da51c6701b60f60f281f8c Mon Sep 17 00:00:00 2001 From: manuel Date: Fri, 14 Jun 2024 10:14:38 +0000 Subject: [PATCH] add 32 bit architecture to the loaded builds --- python_modules/build_iso.py | 2 ++ python_modules/conf.py | 20 +++++++++++++------- python_modules/finish_cleanup.py | 2 ++ 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/python_modules/build_iso.py b/python_modules/build_iso.py index d0fd5f74..4b64fc77 100644 --- a/python_modules/build_iso.py +++ b/python_modules/build_iso.py @@ -394,6 +394,8 @@ class Decisions: build_type_mapping = { 'b-deb64': ("debld", "_64"), 'b-dev64': ("devld", "_64"), + 'b-deb32': ("debld", "_32"), + 'b-dev32': ("devld", "_32"), } build_argument = self.arguments.b diff --git a/python_modules/conf.py b/python_modules/conf.py index 390dfb1e..6d2f8342 100644 --- a/python_modules/conf.py +++ b/python_modules/conf.py @@ -142,6 +142,10 @@ build64_loaded_build = (shared_setup_loaded_cmds + setup_loaded_cmds + setup_chroot_grub_64 + setup_binary_grub_64 + setup_fw_64_32 ) +build64_loaded_build = (shared_setup_loaded_cmds + setup_loaded_cmds + + setup_chroot_grub_32 + setup_binary_grub_32 + + setup_fw_64_32 + ) #Server build64_server_build = (shared_setup_server_cmds + setup_server_cmds + @@ -582,10 +586,10 @@ 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"') -# Private to de server builds - - +# Private to de server and mini builds LBSET_SHARED_INSTALLER_DEB = (' --debian-installer-distribution "bookworm"' ' --debian-installer-gui true' ) @@ -594,19 +598,15 @@ LBSET_SHARED_INSTALLER_DEV = (' --debian-installer-distribution "daedalus"' ' --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_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_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"') @@ -638,6 +638,12 @@ LBSET_DEBLD64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEBIAN_SHARED LBSET_DEVLD64 = (LBSET_MAIN_SHARED + LBSET_SHARED_64 + LBSET_DEVUAN_SHARED + LBSET_PRIVATE_LOADED_DEV64 ) +LBSET_DEBLD64 = (LBSET_MAIN_SHARED + LBSET_SHARED_32 + LBSET_DEBIAN_SHARED + + LBSET_PRIVATE_LOADED_DEB32 + ) +LBSET_DEVLD64 = (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 ) diff --git a/python_modules/finish_cleanup.py b/python_modules/finish_cleanup.py index 18434900..b2fe103a 100644 --- a/python_modules/finish_cleanup.py +++ b/python_modules/finish_cleanup.py @@ -82,6 +82,8 @@ def check_build_type(): 'DEV.32opb': ('dev', '32', 'OPB'), 'DEBLD.64loaded': ('deb', '64', 'LOADED'), 'DEVLD.64loaded': ('dev', '64', 'LOADED'), + 'DEBLD.32loaded': ('deb', '32', 'LOADED'), + 'DEVLD.32loaded': ('dev', '32', 'LOADED'), 'DEBSRV.64server': ('deb', '64', 'SERVER'), 'DEVSRV.64server': ('dev', '64', 'SERVER'), 'DEBMIN.64mini': ('deb', '64', 'MINI'),