Update: Suggested and bubbles conf
Modded the suggested to center the screen. for the conf.by, refractored some settings to reduce repeated code. Allows for better centralized changes Signed-off-by: debianpepper <pdpdebdevuan@protonmail.com>
This commit is contained in:
debianpepper
parent
e2831754d7
commit
08f82a05ea
|
|
@ -45,8 +45,6 @@ def check_packages():
|
|||
store['state'] = tk.DISABLED
|
||||
|
||||
|
||||
|
||||
|
||||
def check_web_browsers():
|
||||
""" Check what browsers are installed"""
|
||||
if os.path.exists('/usr/bin/firefox'):
|
||||
|
|
@ -340,6 +338,5 @@ lblpmtitle = ttk.Label(pwin, style="F62817.TLabel",
|
|||
check_base_snaps()
|
||||
check_packages()
|
||||
check_web_browsers()
|
||||
# call Center screen
|
||||
center_screen()
|
||||
pwin.mainloop()
|
||||
|
|
|
|||
|
|
@ -3,14 +3,15 @@
|
|||
*
|
||||
* License: SPDX-License-Identifier: GPL-3.0-or-later
|
||||
*
|
||||
* Config files used to manage bubbles
|
||||
* 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.
|
||||
"""
|
||||
|
||||
##########################
|
||||
# Commands to be run
|
||||
# Functions to be ran
|
||||
##########################
|
||||
# Run Deb 64 Commands
|
||||
# inflate_bubble sets the confgs files
|
||||
# inflate_bubble sets the configs files
|
||||
# infra copies the needed configs
|
||||
shared_setup_cmds = ('inflate_bubble.set_fusato_structure',
|
||||
'inflate_bubble.set_general_shared',
|
||||
|
|
@ -26,11 +27,11 @@ shared_setup_cmds = ('inflate_bubble.set_fusato_structure',
|
|||
)
|
||||
|
||||
|
||||
# Setup Desktop
|
||||
# Setup Desktop configs
|
||||
# Add mor as needed
|
||||
setup_xfce_cmds = ('inflate_bubble.set_xfce',
|
||||
'infra.xfce_configs'
|
||||
)
|
||||
|
||||
setup_gfb_cmds = ('inflate_bubble.set_gfb',
|
||||
'infra.gnome_flahsbak_configs'
|
||||
)
|
||||
|
|
@ -52,7 +53,8 @@ setup_binary_grub_32 = ('inflate_bubble.set_binary_32',)
|
|||
setup_fw_64_32 = ('inflate_bubble.set_firmware',)
|
||||
setup_fw_arm = ('inflate_bubble.set_firmware_arm',)
|
||||
|
||||
# Deb 64 combined tuples for building
|
||||
# Combined tuples for building
|
||||
# Add more as the need arises Per Desktop
|
||||
build64_xfce_build = (shared_setup_cmds + setup_xfce_cmds +
|
||||
setup_chroot_grub_64 + setup_binary_grub_64 +
|
||||
setup_fw_64_32
|
||||
|
|
@ -85,7 +87,8 @@ buildarm_gfb_build = (shared_setup_cmds + setup_gfb_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'
|
||||
'mousepad\n'
|
||||
'xfce4-battery-plugin\n'
|
||||
|
|
@ -103,8 +106,6 @@ XFCE_LIST = ('xfce4\n'
|
|||
'mugshot\n'
|
||||
'menulibre\n'
|
||||
)
|
||||
|
||||
|
||||
GNOME_FLASHBACK_LIST = ('alacarte\n'
|
||||
'eog\n'
|
||||
'evince\n'
|
||||
|
|
@ -120,18 +121,17 @@ GNOME_FLASHBACK_LIST = ('alacarte\n'
|
|||
'nautilus\n'
|
||||
'yelp\n'
|
||||
)
|
||||
|
||||
KDE_LIST = ('sample1\n'
|
||||
'sample2\n'
|
||||
)
|
||||
|
||||
|
||||
# The Light DM Login Settings
|
||||
LIGHT_DM_LIST = ('lightdm\n'
|
||||
'lightdm-gtk-greeter\n'
|
||||
'lightdm-gtk-greeter-settings\n'
|
||||
)
|
||||
|
||||
|
||||
# General Shared packages to be installed.
|
||||
GENERAL_SHARED_LIST = ('alsa-utils\n'
|
||||
'bluez\n'
|
||||
'calamares\n'
|
||||
|
|
@ -176,7 +176,7 @@ GENERAL_SHARED_LIST = ('alsa-utils\n'
|
|||
'xfsprogs\n'
|
||||
)
|
||||
|
||||
|
||||
# Grub things shared by all
|
||||
GRUB_LIST_SHARED = ('efibootmgr\n'
|
||||
'grub-common\n'
|
||||
'grub2-common\n'
|
||||
|
|
@ -191,7 +191,7 @@ GRUB_LIST_SHARED = ('efibootmgr\n'
|
|||
'libglib2.0\n'
|
||||
)
|
||||
|
||||
|
||||
# Grub things shared by 64bit
|
||||
GRUB_LIST_64 = ('grub-efi-amd64\n'
|
||||
'grub-efi-amd64-bin\n'
|
||||
'grub-efi-amd64-signed\n'
|
||||
|
|
@ -199,14 +199,14 @@ GRUB_LIST_64 = ('grub-efi-amd64\n'
|
|||
'grub-efi-ia32-bin\n'
|
||||
)
|
||||
|
||||
|
||||
# Grub things shared by ARM
|
||||
GRUB_LIST_ARM64 = ('grub-efi-arm64\n'
|
||||
'grub-efi-arm64-bin\n'
|
||||
'grub-efi-arm64-signed\n'
|
||||
'shim-helpers-arm64-signed\n'
|
||||
)
|
||||
|
||||
|
||||
# Grub things shared by 32bit
|
||||
GRUB_LIST_32 = ('efibootmgr\n'
|
||||
'grub-common\n'
|
||||
'grub2-common\n'
|
||||
|
|
@ -219,7 +219,7 @@ GRUB_LIST_32 = ('efibootmgr\n'
|
|||
'shim-helpers-i386-signed\n'
|
||||
)
|
||||
|
||||
|
||||
# Firmware packages shared by 32 adn 64 bit
|
||||
FIRMWARE_LIST_32_64 = ('atmel-firmware\n'
|
||||
'bluez-firmware\n'
|
||||
'firmware-atheros\n'
|
||||
|
|
@ -248,7 +248,7 @@ FIRMWARE_LIST_32_64 = ('atmel-firmware\n'
|
|||
'midisport-firmware\n'
|
||||
)
|
||||
|
||||
|
||||
# Frimware packages used by ARM
|
||||
FIRMWARE_LIST_ARM = ('firmware-atheros\n'
|
||||
'firmware-bnx2\n'
|
||||
'firmware-bnx2x\n'
|
||||
|
|
@ -264,7 +264,7 @@ FIRMWARE_LIST_ARM = ('firmware-atheros\n'
|
|||
'firmware-zd1211\n'
|
||||
)
|
||||
|
||||
|
||||
# Binary packages shared by all
|
||||
BINARY_LIST_SHARED = ('efibootmgr\n'
|
||||
'grub-common\n'
|
||||
'grub2-common\n'
|
||||
|
|
@ -278,7 +278,7 @@ BINARY_LIST_SHARED = ('efibootmgr\n'
|
|||
'shim-unsigned\n'
|
||||
)
|
||||
|
||||
|
||||
# Binary packages shared by 64bit
|
||||
BINARY_LIST_64 = ('grub-efi-amd64\n'
|
||||
'grub-efi-amd64-bin\n'
|
||||
'grub-efi-amd64-signed\n'
|
||||
|
|
@ -286,14 +286,14 @@ BINARY_LIST_64 = ('grub-efi-amd64\n'
|
|||
'grub-efi-ia32-bin\n'
|
||||
)
|
||||
|
||||
|
||||
# Binary packages shared by ARM
|
||||
BINARY_LIST_ARM = ('grub-efi-arm64\n'
|
||||
'grub-efi-arm64-bin\n'
|
||||
'grub-efi-arm64-signed\n'
|
||||
'shim-helpers-arm64-signed\n'
|
||||
)
|
||||
|
||||
|
||||
# Binary packages shared by 32bit
|
||||
BINARY_LIST_32 = ('grub-efi-ia32\n'
|
||||
'grub-efi-ia32-bin\n'
|
||||
'grub-efi-ia32-signed\n'
|
||||
|
|
@ -303,37 +303,33 @@ BINARY_LIST_32 = ('grub-efi-ia32\n'
|
|||
|
||||
### END Inflate
|
||||
|
||||
### Start Arch Specific
|
||||
# Set the LB configs
|
||||
LBSET_DEB32 = ('lb config --mode debian --distribution bookworm'
|
||||
# Shared by all
|
||||
LBSET_MAIN_SHARED = ('lb config noauto'
|
||||
' --archive-areas "main contrib non-free non-free-firmware"'
|
||||
' --architectures i386 --linux-flavours 686-pae'
|
||||
' --apt-recommends true --binary-images iso-hybrid'
|
||||
' --firmware-binary true --firmware-chroot false --security false'
|
||||
' --updates false --backports false '
|
||||
' --image-name "PeppermintOS-Debian-32"'
|
||||
' --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" --win32-loader false'
|
||||
' --checksums sha512 --cache true --clean --color --quiet'
|
||||
' --zsync false '
|
||||
' --iso-volume "PeppermintOS" --mode debian --quiet'
|
||||
' --security false --uefi-secure-boot enable'
|
||||
' --updates false --win32-loader false --zsync false'
|
||||
)
|
||||
|
||||
# Shared by architecture
|
||||
LBSET_SHARED_32 = (' --architectures i386 --linux-flavours 686-pae')
|
||||
LBSET_SHARED_64 = (' --architectures amd64 --linux-flavours amd64' )
|
||||
LBSET_SHARED_ARM = (' --architectures arm64 --linux-flavours arm64'
|
||||
' --bootstrap-qemu-arch arm64 --bootloaders grub-efi'
|
||||
' --bootstrap-qemu-static /usr/sbin/qemu-debootstrap'
|
||||
)
|
||||
|
||||
LBSET_DEB64 = ('lb config --mode debian --distribution bookworm'
|
||||
' --archive-areas "main contrib non-free non-free-firmware"'
|
||||
' --architectures amd64 --linux-flavours amd64'
|
||||
' --apt-recommends true --binary-images iso-hybrid'
|
||||
' --security true'
|
||||
' --updates true --backports false'
|
||||
' --image-name "PeppermintOS-Debian-64"'
|
||||
' --iso-application "PeppermintOS"'
|
||||
' --iso-preparer "PeppermintOS-https://peppermintos.com/"'
|
||||
' --iso-publisher "Peppermint OS Team"'
|
||||
' --iso-volume "PeppermintOS" --win32-loader false'
|
||||
' --checksums sha512 --cache true'
|
||||
' --zsync false '
|
||||
# Shared By Debian
|
||||
LBSET_DEBIAN_SHARED = (
|
||||
' --distribution bookworm'
|
||||
' --mirror-bootstrap https://deb.debian.org/debian'
|
||||
' --parent-mirror-bootstrap https://deb.debian.org/debian'
|
||||
' --parent-mirror-chroot https://deb.debian.org/debian'
|
||||
|
|
@ -344,12 +340,10 @@ LBSET_DEB64 = ('lb config --mode debian --distribution bookworm'
|
|||
' --mirror-chroot-security https://security.debian.org/debian-security'
|
||||
)
|
||||
|
||||
|
||||
LBSET_DEV32 = ('lb config noauto --clean --color --quiet'
|
||||
' --archive-areas "main contrib non-free non-free-firmware" --architectures i386'
|
||||
' --linux-flavours 686-pae --apt-recommends true'
|
||||
' --binary-images iso-hybrid --cache true --mode debian'
|
||||
' --distribution daedalus --initsystem sysvinit'
|
||||
# Shared By Devuan
|
||||
LBSET_DEVUAN_SHARED = (
|
||||
' --distribution daedalus'
|
||||
' --initsystem sysvinit'
|
||||
' --mirror-bootstrap http://deb.devuan.org/merged'
|
||||
' --parent-mirror-bootstrap http://deb.devuan.org/merged'
|
||||
' --parent-mirror-chroot http://deb.devuan.org/merged'
|
||||
|
|
@ -358,83 +352,35 @@ LBSET_DEV32 = ('lb config noauto --clean --color --quiet'
|
|||
' --parent-mirror-binary-security http://deb.devuan.org/merged'
|
||||
' --mirror-chroot http://deb.devuan.org/merged'
|
||||
' --mirror-chroot-security http://deb.devuan.org/merged'
|
||||
' --firmware-binary true --firmware-chroot true'
|
||||
' --uefi-secure-boot enable --iso-application "PeppermintOS"'
|
||||
' --iso-preparer "PeppermintOS-https://peppermintos.com/"'
|
||||
' --iso-publisher "Peppermint OS Team"'
|
||||
' --iso-volume "PeppermintOS"'
|
||||
' --image-name "PeppermintOS-Devuan-32"'
|
||||
' --security false --updates false --backports false'
|
||||
' --win32-loader false --checksums sha512 --zsync false'
|
||||
)
|
||||
|
||||
|
||||
LBSET_DEV64 = ('lb config noauto --clean --color --quiet'
|
||||
' --archive-areas "main contrib non-free non-free-firmware"'
|
||||
' --architectures amd64 --linux-flavours amd64'
|
||||
' --apt-recommends true'
|
||||
' --binary-images iso-hybrid --cache true --mode debian'
|
||||
' --distribution daedalus --initsystem sysvinit'
|
||||
' --mirror-bootstrap http://deb.devuan.org/merged'
|
||||
' --parent-mirror-bootstrap http://deb.devuan.org/merged'
|
||||
' --parent-mirror-chroot http://deb.devuan.org/merged'
|
||||
' --parent-mirror-chroot-security http://deb.devuan.org/merged'
|
||||
' --parent-mirror-binary http://deb.devuan.org/merged'
|
||||
' --parent-mirror-binary-security http://deb.devuan.org/merged'
|
||||
' --mirror-chroot http://deb.devuan.org/merged'
|
||||
' --mirror-chroot-security http://deb.devuan.org/merged'
|
||||
' --firmware-binary true --firmware-chroot false'
|
||||
' --uefi-secure-boot enable --iso-application "PeppermintOS"'
|
||||
' --iso-preparer "PeppermintOS-https://peppermintos.com/"'
|
||||
' --iso-publisher "Peppermint OS Team"'
|
||||
' --iso-volume "PeppermintOS"'
|
||||
'--image-name "PeppermintOS-Devuan-64"'
|
||||
' --security false --updates false --backports false'
|
||||
' --win32-loader false --checksums sha512 --zsync false'
|
||||
)
|
||||
|
||||
|
||||
LBSET_DEVARM = ('lb config no auto --clean --color --quiet'
|
||||
' --archive-areas "main contrib non-free non-free-firmware"'
|
||||
' --architectures arm64 --apt-recommends true'
|
||||
' --binary-images iso-hybrid --bootstrap-qemu-arch arm64'
|
||||
' --bootloaders grub-efi'
|
||||
' --bootstrap-qemu-static /usr/sbin/qemu-debootstrap'
|
||||
' --cache true --mode debian --distribution daedalus'
|
||||
' --debootstrap-options "--merged-usr" --initsystem sysvinit'
|
||||
' --mirror-bootstrap http://deb.devuan.org/merged'
|
||||
' --parent-mirror-bootstrap http://deb.devuan.org/merged'
|
||||
' --parent-mirror-chroot http://deb.devuan.org/merged'
|
||||
' --parent-mirror-chroot-security http://deb.devuan.org/merged'
|
||||
' --parent-mirror-binary http://deb.devuan.org/merged'
|
||||
' --parent-mirror-binary-security http://deb.devuan.org/merged'
|
||||
' --mirror-chroot http://deb.devuan.org/merged'
|
||||
' --mirror-chroot-security http://deb.devuan.org/merged'
|
||||
' --firmware-binary true --firmware-chroot true'
|
||||
' --uefi-secure-boot enable --iso-application "PeppermintOS"'
|
||||
' --iso-preparer "PeppermintOS-https://peppermintos.com/"'
|
||||
' --iso-publisher "Peppermint OS Team"'
|
||||
' --iso-volume "PeppermintOS"'
|
||||
# Private by ISO build not shared
|
||||
LBSET_PRIVATE_DEB32 = (' --image-name "PeppermintOS-Debian-32"')
|
||||
LBSET_PRIVATE_DEB64 = (' --image-name "PeppermintOS-Debian-64"')
|
||||
LBSET_PRIVATE_DEV32 = (' --image-name "PeppermintOS-Devuan-32"')
|
||||
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"'
|
||||
' --linux-flavours arm64 --security false'
|
||||
' --updates false --backports false --win32-loader false'
|
||||
' --checksums sha512 --zsync false'
|
||||
)
|
||||
|
||||
|
||||
LBSET_DEBARM = ('lb config noauto --clean --color --quiet'
|
||||
' --archive-areas "main contrib non-free non-free-firmware"'
|
||||
' --architectures arm64 --apt-recommends true'
|
||||
' --binary-images iso-hybrid --bootstrap-qemu-arch arm64'
|
||||
' --bootloaders grub-efi'
|
||||
' --bootstrap-qemu-static /usr/sbin/qemu-debootstrap'
|
||||
' --cache true --mode debian --distribution bookworm'
|
||||
' --firmware-binary true --firmware-chroot true'
|
||||
' --uefi-secure-boot enable --iso-application "PeppermintOS"'
|
||||
' --iso-preparer "PeppermintOS-https://peppermintos.com/"'
|
||||
' --iso-publisher "Peppermint OS Team"'
|
||||
' --iso-volume "PeppermintOS"'
|
||||
' --image-name "PeppermintOS-Debian-ARM"'
|
||||
' --linux-flavours arm64 --security false --updates false'
|
||||
' --backports false --win32-loader false --checksums sha512'
|
||||
# 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_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_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
|
||||
)
|
||||
|
|
|
|||
Loading…
Reference in New Issue