update build script

PepDeb32/pepbld.py

@@ -86,10 +86,8 @@ shutil.copytree(os.path.join(uchinanchu, "PepProTools"), os.path.join(uchinanchu
 shutil.copytree(os.path.join(uchinanchu, "peplightdm"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "lightdm"), dirs_exist_ok=True)
 
 # Copy recursive files and sub-directories
-shutil.copytree(os.path.join(uchinanchu, "peploadersplash", "debian", "boot"), os.path.join(uchinanchu, "fusato", "config", "includes.binary"), dirs_exist_ok=True)
-shutil.copytree(os.path.join(uchinanchu, "peploadersplash", "debian", "isolinux"), os.path.join(uchinanchu, "fusato", "config", "includes.binary"), dirs_exist_ok=True)
-shutil.copytree(os.path.join(uchinanchu, "pepinstaller", "graphics"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "share"), dirs_exist_ok=True)
-shutil.copytree(os.path.join(uchinanchu, "pepinstaller", "themes"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "share"), dirs_exist_ok=True)
+shutil.copytree(os.path.join(uchinanchu, "peploadersplash", "debian"), os.path.join(uchinanchu, "fusato", "config", "includes.binary"), dirs_exist_ok=True)
+shutil.copytree(os.path.join(uchinanchu, "pepinstaller"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "share"), dirs_exist_ok=True)
 shutil.copytree(os.path.join(uchinanchu, "pepgrub", "debian"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "grub"), dirs_exist_ok=True)
 shutil.copytree(os.path.join(uchinanchu, "pylibraries"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "py"), dirs_exist_ok=True)
 shutil.copytree(os.path.join(uchinanchu, "pmostools"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "tools"), dirs_exist_ok=True)

PepDeb64/fusato/config/binary

@@ -0,0 +1,119 @@
+# config/binary - options for live-build(7), binary stage
+
+# Set image type
+LB_IMAGE_TYPE="iso-hybrid"
+
+# Set image filesystem
+LB_BINARY_FILESYSTEM="fat32"
+
+# Set apt/aptitude generic indices
+LB_APT_INDICES="true"
+
+# Set boot parameters
+LB_BOOTAPPEND_LIVE="boot=live components quiet splash"
+
+# Set boot parameters
+LB_BOOTAPPEND_INSTALL="file=/cdrom/install/preseed.cfg"
+
+# Set boot parameters
+LB_BOOTAPPEND_LIVE_FAILSAFE="boot=live components memtest noapic noapm nodma nomce nolapic nosmp nosplash vga=788"
+
+# Set BIOS bootloader
+LB_BOOTLOADER_BIOS="syslinux"
+
+# Set EFI bootloader
+LB_BOOTLOADER_EFI="grub-efi"
+
+# Set bootloaders
+LB_BOOTLOADERS=""
+
+# Set checksums
+LB_CHECKSUMS="sha512 md5"
+
+# Set compression
+LB_COMPRESSION="none"
+
+# Support dm-verity on rootfs
+LB_DM_VERITY=""
+
+# Support FEC on dm-verity rootfs
+LB_DM_VERITY_FEC_ROOTS=""
+
+# Set sign script for roothash for dm-verity rootfs
+LB_DM_VERITY_SIGN=""
+
+# Set zsync
+LB_ZSYNC="false"
+
+# Control if we build binary images chrooted
+# NEVER, *EVER*, *E*V*E*R* SET THIS OPTION to false.
+LB_BUILD_WITH_CHROOT="true"
+
+# Set debian-installer
+LB_DEBIAN_INSTALLER="netinst"
+
+# Set debian-installer suite
+LB_DEBIAN_INSTALLER_DISTRIBUTION="bookworm"
+
+# Set debian-installer preseed filename/url
+LB_DEBIAN_INSTALLER_PRESEEDFILE="preseed.cfg"
+
+# Toggle use of GUI debian-installer
+LB_DEBIAN_INSTALLER_GUI="true"
+
+# Set hdd label
+LB_HDD_LABEL="DEBIAN_LIVE"
+
+# Set hdd filesystem size
+LB_HDD_SIZE="auto"
+
+# Set start of partition for the hdd target for BIOSes that expect a specific boot partition start (e.g. "63s"). If empty, use optimal layout.
+LB_HDD_PARTITION_START=""
+
+# Set iso author
+LB_ISO_APPLICATION="Debian Live"
+
+# Set iso preparer
+LB_ISO_PREPARER="PeppermintOS-https://peppermintos.com/"
+
+# Set iso publisher
+LB_ISO_PUBLISHER="Peppermint OS Team"
+
+# Set iso volume (max 32 chars)
+LB_ISO_VOLUME="PeppermintOS"
+
+# Set jffs2 eraseblock size
+LB_JFFS2_ERASEBLOCK=""
+
+# Set memtest
+LB_MEMTEST="none"
+
+# Set loadlin
+LB_LOADLIN="true"
+
+# Set win32-loader
+LB_WIN32_LOADER="false"
+
+# Set net tarball
+LB_NET_TARBALL="true"
+
+# Set onie
+LB_ONIE="false"
+
+# Set onie additional kernel cmdline options
+LB_ONIE_KERNEL_CMDLINE=""
+
+# Set inclusion of firmware packages in debian-installer
+LB_FIRMWARE_BINARY="true"
+
+# Set inclusion of firmware packages in the live image
+LB_FIRMWARE_CHROOT="false"
+
+# Set swap file path
+LB_SWAP_FILE_PATH=""
+
+# Set swap file size
+LB_SWAP_FILE_SIZE="512"
+
+# Enable/disable UEFI secure boot support
+LB_UEFI_SECURE_BOOT="auto"

PepDeb64/fusato/config/bootstrap

@@ -0,0 +1,76 @@
+# config/bootstrap - options for live-build(7), bootstrap stage
+
+# Select architecture to use
+LB_ARCHITECTURE="amd64"
+
+# Select distribution to use
+LB_DISTRIBUTION="bookworm"
+
+# Select parent distribution to use
+LB_PARENT_DISTRIBUTION=""
+
+# Select distribution to use in the chroot
+LB_DISTRIBUTION_CHROOT="bookworm"
+
+# Select parent distribution to use in the chroot
+LB_PARENT_DISTRIBUTION_CHROOT="bookworm"
+
+# Select distribution to use in the final image
+LB_DISTRIBUTION_BINARY="bookworm"
+
+# Select parent distribution to use in the final image
+LB_PARENT_DISTRIBUTION_BINARY="bookworm"
+
+# Select parent distribution for debian-installer to use
+LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="bookworm"
+
+# Select archive areas to use
+LB_ARCHIVE_AREAS="main contrib non-free non-free-firmware"
+
+# Select parent archive areas to use
+LB_PARENT_ARCHIVE_AREAS="main contrib non-free non-free-firmware"
+
+# Set parent mirror to bootstrap from
+LB_PARENT_MIRROR_BOOTSTRAP="http://deb.debian.org/debian/"
+
+# Set parent mirror to fetch packages from
+LB_PARENT_MIRROR_CHROOT="http://deb.debian.org/debian/"
+
+# Set security parent mirror to fetch packages from
+LB_PARENT_MIRROR_CHROOT_SECURITY="http://security.debian.org/"
+
+# Set parent mirror which ends up in the image
+LB_PARENT_MIRROR_BINARY="http://deb.debian.org/debian/"
+
+# Set security parent mirror which ends up in the image
+LB_PARENT_MIRROR_BINARY_SECURITY="http://security.debian.org/"
+
+# Set debian-installer parent mirror
+LB_PARENT_MIRROR_DEBIAN_INSTALLER="http://repo.peppermintos.com/packages"
+
+# Set mirror to bootstrap from
+LB_MIRROR_BOOTSTRAP="http://deb.debian.org/debian/"
+
+# Set mirror to fetch packages from
+LB_MIRROR_CHROOT="http://deb.debian.org/debian/"
+
+# Set security mirror to fetch packages from
+LB_MIRROR_CHROOT_SECURITY="http://security.debian.org/"
+
+# Set mirror which ends up in the image
+LB_MIRROR_BINARY="http://deb.debian.org/debian/"
+
+# Set security mirror which ends up in the image
+LB_MIRROR_BINARY_SECURITY="http://security.debian.org/"
+
+# Set debian-installer mirror
+LB_MIRROR_DEBIAN_INSTALLER="http://deb.debian.org/debian/"
+
+# Set architectures to use foreign bootstrap
+LB_BOOTSTRAP_QEMU_ARCHITECTURE=""
+
+# Set packages to exclude during foreign bootstrap
+LB_BOOTSTRAP_QEMU_EXCLUDE=""
+
+# Set static qemu binary for foreign bootstrap
+LB_BOOTSTRAP_QEMU_STATIC=""

PepDeb64/fusato/config/chroot

@@ -0,0 +1,34 @@
+# config/chroot - options for live-build(7), chroot stage
+
+# Set chroot filesystem
+LB_CHROOT_FILESYSTEM="squashfs"
+
+# Set chroot squashfs compression level
+LB_CHROOT_SQUASHFS_COMPRESSION_LEVEL=""
+
+# Set chroot squashfs compression type
+LB_CHROOT_SQUASHFS_COMPRESSION_TYPE=""
+
+# Set union filesystem
+LB_UNION_FILESYSTEM="overlay"
+
+# Set interactive build
+LB_INTERACTIVE="false"
+
+# Set keyring packages
+LB_KEYRING_PACKAGES="debian-archive-keyring"
+
+# Set kernel flavour to use (with arch)
+LB_LINUX_FLAVOURS_WITH_ARCH="amd64"
+
+# Set kernel packages to use
+LB_LINUX_PACKAGES="linux-image"
+
+# Enable security updates
+LB_SECURITY="true"
+
+# Enable updates updates
+LB_UPDATES="true"
+
+# Enable backports updates
+LB_BACKPORTS="false"

PepDeb64/fusato/config/common

@@ -0,0 +1,102 @@
+# config/common - common options for live-build(7)
+
+# Version of live-build used to build config (config format version)
+LB_CONFIGURATION_VERSION="20230131acoros1"
+
+# Set package manager
+LB_APT="apt"
+
+# Set proxy for HTTP connections
+LB_APT_HTTP_PROXY=""
+
+# Set apt/aptitude pipeline depth
+LB_APT_PIPELINE=""
+
+# Set apt/aptitude recommends
+LB_APT_RECOMMENDS="true"
+
+# Set apt/aptitude security
+LB_APT_SECURE="true"
+
+# Set apt/aptitude source entries in sources.list
+LB_APT_SOURCE_ARCHIVES="true"
+
+# Control cache
+LB_CACHE="true"
+
+# Control if downloaded package indices should be cached
+LB_CACHE_INDICES="false"
+
+# Control if downloaded packages files should be cached
+LB_CACHE_PACKAGES="true"
+
+# Control if completed stages should be cached
+LB_CACHE_STAGES="bootstrap"
+
+# Set debconf(1) frontend to use
+LB_DEBCONF_FRONTEND="noninteractive"
+
+# Set debconf(1) priority to use
+LB_DEBCONF_PRIORITY="critical"
+
+# Set initramfs hook
+LB_INITRAMFS="live-boot"
+
+# Set initramfs compression
+LB_INITRAMFS_COMPRESSION="gzip"
+
+# Set init system
+LB_INITSYSTEM="systemd"
+
+# Set distribution mode
+LB_MODE="debian"
+
+# Set system type
+LB_SYSTEM="live"
+
+# Set base name of the image
+LB_IMAGE_NAME="PepOS-mini-iso"
+
+# Set options to use with apt
+APT_OPTIONS="--yes -o Acquire::Retries=5"
+
+# Set options to use with aptitude
+APTITUDE_OPTIONS="--assume-yes -o Acquire::Retries=5"
+
+# Set options to use with debootstrap
+DEBOOTSTRAP_OPTIONS=""
+
+# Set script to use with debootstrap
+DEBOOTSTRAP_SCRIPT=""
+
+# Set options to use with gzip
+GZIP_OPTIONS="-6 --rsyncable"
+
+# Enable UTC timestamps
+LB_UTC_TIME="false"
+
+# live-build options
+
+# Enable breakpoints
+# If set here, overrides the command line option
+#_BREAKPOINTS="false"
+
+# Enable debug
+# If set here, overrides the command line option
+#_DEBUG="false"
+
+# Enable color
+# If set here, overrides the command line option
+#_COLOR="auto"
+
+# Enable force
+# If set here, overrides the command line option
+#_FORCE="false"
+
+# Enable quiet
+# If set here, overrides the command line option
+#_QUIET="false"
+
+# Enable verbose
+# If set here, overrides the command line option
+#_VERBOSE="false"

PepDeb64/fusato/config/hooks/live/0010-disable-kexec-tools.hook.chroot

@@ -0,0 +1 @@
+/usr/share/live/build/hooks/live/0010-disable-kexec-tools.hook.chroot

PepDeb64/fusato/config/hooks/live/0050-disable-sysvinit-tmpfs.hook.chroot

@@ -0,0 +1 @@
+/usr/share/live/build/hooks/live/0050-disable-sysvinit-tmpfs.hook.chroot

PepDeb64/fusato/config/hooks/normal/0020-create-mtab-symlink.hook.chroot

@@ -0,0 +1 @@
+/usr/share/live/build/hooks/normal/0020-create-mtab-symlink.hook.chroot

PepDeb64/fusato/config/hooks/normal/0030-enable-cryptsetup.hook.chroot

@@ -0,0 +1 @@
+/usr/share/live/build/hooks/normal/0030-enable-cryptsetup.hook.chroot

PepDeb64/fusato/config/hooks/normal/0040-create-locales-files.hook.chroot

@@ -0,0 +1 @@
+/usr/share/live/build/hooks/normal/0040-create-locales-files.hook.chroot

PepDeb64/fusato/config/hooks/normal/0100-remove-adjtime-configuration.hook.chroot

@@ -0,0 +1 @@
+/usr/share/live/build/hooks/normal/0100-remove-adjtime-configuration.hook.chroot

PepDeb64/fusato/config/hooks/normal/0110-remove-backup-files.hook.chroot

@@ -0,0 +1 @@
+/usr/share/live/build/hooks/normal/0110-remove-backup-files.hook.chroot

PepDeb64/fusato/config/hooks/normal/0120-remove-dbus-machine-id.hook.chroot

@@ -0,0 +1 @@
+/usr/share/live/build/hooks/normal/0120-remove-dbus-machine-id.hook.chroot

PepDeb64/fusato/config/hooks/normal/0130-remove-gnome-icon-cache.hook.chroot

@@ -0,0 +1 @@
+/usr/share/live/build/hooks/normal/0130-remove-gnome-icon-cache.hook.chroot

PepDeb64/fusato/config/hooks/normal/0140-remove-log-files.hook.chroot

@@ -0,0 +1 @@
+/usr/share/live/build/hooks/normal/0140-remove-log-files.hook.chroot

PepDeb64/fusato/config/hooks/normal/0150-remove-mdadm-configuration.hook.chroot

@@ -0,0 +1 @@
+/usr/share/live/build/hooks/normal/0150-remove-mdadm-configuration.hook.chroot

PepDeb64/fusato/config/hooks/normal/0160-remove-openssh-server-host-keys.hook.chroot

@@ -0,0 +1 @@
+/usr/share/live/build/hooks/normal/0160-remove-openssh-server-host-keys.hook.chroot

PepDeb64/fusato/config/hooks/normal/0170-remove-python-py.hook.chroot

@@ -0,0 +1 @@
+/usr/share/live/build/hooks/normal/0170-remove-python-py.hook.chroot

PepDeb64/fusato/config/hooks/normal/0180-remove-systemd-machine-id.hook.chroot

@@ -0,0 +1 @@
+/usr/share/live/build/hooks/normal/0180-remove-systemd-machine-id.hook.chroot

PepDeb64/fusato/config/hooks/normal/0190-remove-temporary-files.hook.chroot

@@ -0,0 +1 @@
+/usr/share/live/build/hooks/normal/0190-remove-temporary-files.hook.chroot

PepDeb64/fusato/config/hooks/normal/0195-remove-ssl-cert-snakeoil.hook.chroot

@@ -0,0 +1 @@
+/usr/share/live/build/hooks/normal/0195-remove-ssl-cert-snakeoil.hook.chroot

PepDeb64/fusato/config/hooks/normal/0200-remove-udev-persistent-cd-rules.hook.chroot

@@ -0,0 +1 @@
+/usr/share/live/build/hooks/normal/0200-remove-udev-persistent-cd-rules.hook.chroot

PepDeb64/fusato/config/hooks/normal/0300-remove-udev-persistent-net-rules.hook.chroot

@@ -0,0 +1 @@
+/usr/share/live/build/hooks/normal/0300-remove-udev-persistent-net-rules.hook.chroot

PepDeb64/fusato/config/hooks/normal/0400-update-apt-file-cache.hook.chroot

@@ -0,0 +1 @@
+/usr/share/live/build/hooks/normal/0400-update-apt-file-cache.hook.chroot

PepDeb64/fusato/config/hooks/normal/0410-update-apt-xapian-index.hook.chroot

@@ -0,0 +1 @@
+/usr/share/live/build/hooks/normal/0410-update-apt-xapian-index.hook.chroot

PepDeb64/fusato/config/hooks/normal/0420-update-glx-alternative.hook.chroot

@@ -0,0 +1 @@
+/usr/share/live/build/hooks/normal/0420-update-glx-alternative.hook.chroot

PepDeb64/fusato/config/hooks/normal/0430-update-mlocate-database.hook.chroot

@@ -0,0 +1 @@
+/usr/share/live/build/hooks/normal/0430-update-mlocate-database.hook.chroot

PepDeb64/fusato/config/hooks/normal/0440-update-nvidia-alternative.hook.chroot

@@ -0,0 +1 @@
+/usr/share/live/build/hooks/normal/0440-update-nvidia-alternative.hook.chroot

PepDeb64/fusato/config/hooks/normal/0500-reproducible-glibc.hook.chroot

@@ -0,0 +1 @@
+/usr/share/live/build/hooks/normal/0500-reproducible-glibc.hook.chroot

PepDeb64/fusato/config/hooks/normal/0950-final-cleanup-hook.binary

@@ -0,0 +1,9 @@
+#!/bin/bash
+# SPDX-License-Identifier: GPL-3.0-or-later
+#
+# SPDX-FileCopyrightText:  2023 PeppemrintOS Team  (peppermintosteam@proton.me)
+
+## This script will remove unnecessary files and folders and reduce the size of the iso.
+# Remove live folder from binary.
+
+rm -r live

PepDeb64/fusato/config/includes.binary/boot/grub/grub.cfg

@@ -0,0 +1,96 @@
+if loadfont $prefix/font.pf2 ; then
+  set gfxmode=800x600
+  set gfxpayload=keep
+  insmod efi_gop
+  insmod efi_uga
+  insmod video_bochs
+  insmod video_cirrus
+  insmod gfxterm
+  insmod png
+  terminal_output gfxterm
+fi
+
+if background_image /isolinux/splash.png; then
+  set color_normal=light-gray/black
+  set color_highlight=white/black
+elif background_image /splash.png; then
+  set color_normal=light-gray/black
+  set color_highlight=white/black
+else
+  set menu_color_normal=cyan/blue
+  set menu_color_highlight=white/blue
+fi
+
+source /boot/grub/config.cfg
+
+insmod play
+play 960 440 1 0 4 440 1
+set theme=/boot/grub/live-theme/theme.txt
+menuentry --hotkey=g 'Graphical install' {
+    set background_color=black
+    linux    /install/vmlinuz vga=788 --- quiet 
+    initrd   /install/gtk/initrd.gz
+}
+menuentry --hotkey=i 'Install' {
+    set background_color=black
+    linux    /install/vmlinuz vga=788 --- quiet 
+    initrd   /install/initrd.gz
+}
+submenu --hotkey=a 'Advanced options ...' {
+    set menu_color_normal=cyan/blue
+    set menu_color_highlight=white/blue
+    set theme=/boot/grub/live-theme/theme.txt
+    set gfxpayload=keep
+    menuentry '... Graphical expert install' {
+        set background_color=black
+        linux    /install/vmlinuz priority=low vga=788 --- 
+        initrd   /install/gtk/initrd.gz
+    }
+    menuentry '... Graphical rescue mode' {
+        set background_color=black
+        linux    /install/vmlinuz vga=788 rescue/enable=true --- quiet  
+        initrd   /install/gtk/initrd.gz
+    }
+    menuentry '... Graphical automated install' {
+        set background_color=black
+        linux    /install/vmlinuz auto=true priority=critical vga=788 --- quiet 
+        initrd   /install/gtk/initrd.gz
+    }
+    menuentry --hotkey=x '... Expert install' {
+        set background_color=black
+        linux    /install/vmlinuz priority=low vga=788 --- 
+        initrd   /install/initrd.gz
+    }
+    menuentry --hotkey=r '... Rescue mode' {
+        set background_color=black
+        linux    /install/vmlinuz vga=788 rescue/enable=true --- quiet 
+        initrd   /install/initrd.gz
+    }
+    menuentry --hotkey=a '... Automated install' {
+        set background_color=black
+        linux    /install/vmlinuz auto=true priority=critical vga=788 --- quiet 
+        initrd   /install/initrd.gz
+    }
+    submenu --hotkey=s '... Speech-enabled advanced options ...' {
+        set menu_color_normal=cyan/blue
+        set menu_color_highlight=white/blue
+        set theme=/boot/grub/live-theme/theme.txt
+        set gfxpayload=keep
+        menuentry --hotkey=x '... Expert speech install' {
+            set background_color=black
+            linux    /install/vmlinuz priority=low vga=788 speakup.synth=soft --- 
+            initrd   /install/gtk/initrd.gz
+        }
+        menuentry --hotkey=r '... Rescue speech mode' {
+            set background_color=black
+            linux    /install/vmlinuz vga=788 rescue/enable=true speakup.synth=soft --- quiet  
+            initrd   /install/gtk/initrd.gz
+        }
+        menuentry --hotkey=a '... Automated speech install' {
+            set background_color=black
+            linux    /install/vmlinuz auto=true priority=critical vga=788 speakup.synth=soft --- quiet 
+            initrd   /install/gtk/initrd.gz
+        }
+    }
+}
+