diff --git a/PepDeb64/pepbld.py b/PepDeb64/pepbld.py index 3cf75df..023a192 100644 --- a/PepDeb64/pepbld.py +++ b/PepDeb64/pepbld.py @@ -30,13 +30,27 @@ lb_command = [ "lb", "config", "noauto", "--binary-images", "iso-hybrid", "--architectures", "amd64", - "--distribution", "bookworm", - "--archive-areas", "main non-free-firmware", + "--distribution", "daedalus", + "--initsystem", "sysvinit", + "--archive-areas", "main non-free-firmware", + "--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", + "--security", "false", + "--updates", "false", + "--backports", "false", + "--uefi-secure-boot", "enable", "--firmware-chroot", "false", - "--debootstrap-options", "--include=zstd, locales, dialog", + "--debootstrap-options", "--include=zstd,locales,dialog", "--debian-installer", "cdrom", - "--debian-installer-distribution", "bookworm", + "--debian-installer-distribution", "daedalus", "--debian-installer-gui", "true", + "--parent-mirror-debian-installer", "http://deb.devuan.org/devuan", "--iso-preparer", "PeppermintOS-https://peppermintos.com/", "--iso-publisher", "Peppermint OS Team", "--iso-volume", "PeppermintOS", @@ -64,6 +78,7 @@ os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", " os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "polkit"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "conf"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "py"), exist_ok=True) +os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "info"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "lightdm"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "share"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "autostart"), exist_ok=True) @@ -79,7 +94,7 @@ shutil.copy(os.path.join(uchinanchu, "pepsources", "sources.list"), os.path.join shutil.copy(os.path.join(uchinanchu, "pepgrub", "grub"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "grub")) # Copy recursive files and sub-directories -shutil.copytree(os.path.join(uchinanchu, "pepscripts"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "lib", "finish-install.d"), dirs_exist_ok=True) +shutil.copytree(os.path.join(uchinanchu, "pepscriptsdev"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "lib", "finish-install.d"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pephooks", "normal"), os.path.join(uchinanchu, "fusato", "config", "hooks", "normal"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepkeyrings"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "keyrings"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "polkit"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "polkit"), dirs_exist_ok=True) @@ -89,10 +104,11 @@ shutil.copytree(os.path.join(uchinanchu, "PepProPixMaps"), os.path.join(uchinanc shutil.copytree(os.path.join(uchinanchu, "pepconf"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "conf"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "PepProTools"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "protools"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "peplightdm"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "lightdm"), 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, "peploadersplash", "devuan"), 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, "pepgrub", "devuan"), 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) +shutil.copytree(os.path.join(uchinanchu, "pepinfo"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "info"), dirs_exist_ok=True) subprocess.run("lb build", shell=True) diff --git a/PepDev32/pepbld.py b/PepDev32/pepbld.py index ae4e8c3..41ab8c1 100644 --- a/PepDev32/pepbld.py +++ b/PepDev32/pepbld.py @@ -33,20 +33,20 @@ lb_command = [ "--distribution", "daedalus", "--initsystem", "sysvinit", "--archive-areas", "main non-free-firmware", - "--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", - "--security" "false", - "--updates" "false", - "--backports" "false", + "--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", + "--security", "false", + "--updates", "false", + "--backports", "false", "--uefi-secure-boot", "enable", "--firmware-chroot", "false", - "--debootstrap-options", "--include=zstd, locales, dialog", + "--debootstrap-options", "--include=zstd,locales,dialog", "--debian-installer", "cdrom", "--debian-installer-distribution", "daedalus", "--debian-installer-gui", "true", @@ -62,7 +62,6 @@ lb_command = [ ] subprocess.run(lb_command + sys.argv[1:]) - # Setup the installer structure os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "lib", "finish-install.d"), exist_ok=True) os.makedirs(os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed"), exist_ok=True) @@ -94,7 +93,7 @@ shutil.copy(os.path.join(uchinanchu, "pepsources", "sources.list"), os.path.join shutil.copy(os.path.join(uchinanchu, "pepgrub", "grub"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "grub")) # Copy recursive files and sub-directories -shutil.copytree(os.path.join(uchinanchu, "pepscripts"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "lib", "finish-install.d"), dirs_exist_ok=True) +shutil.copytree(os.path.join(uchinanchu, "pepscriptsdev"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "lib", "finish-install.d"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pephooks", "normal"), os.path.join(uchinanchu, "fusato", "config", "hooks", "normal"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepkeyrings"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "keyrings"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "polkit"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "polkit"), dirs_exist_ok=True) diff --git a/PepDev64/pepbld.py b/PepDev64/pepbld.py index 157b9b1..023a192 100644 --- a/PepDev64/pepbld.py +++ b/PepDev64/pepbld.py @@ -33,20 +33,20 @@ lb_command = [ "--distribution", "daedalus", "--initsystem", "sysvinit", "--archive-areas", "main non-free-firmware", - "--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", - "--security" "false", - "--updates" "false", - "--backports" "false", + "--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", + "--security", "false", + "--updates", "false", + "--backports", "false", "--uefi-secure-boot", "enable", "--firmware-chroot", "false", - "--debootstrap-options", "--include=zstd, locales, dialog", + "--debootstrap-options", "--include=zstd,locales,dialog", "--debian-installer", "cdrom", "--debian-installer-distribution", "daedalus", "--debian-installer-gui", "true", @@ -59,6 +59,7 @@ lb_command = [ "--zsync", "false", "--win32-loader", "false", "--debian-installer-preseedfile", "preseed.cfg" +] subprocess.run(lb_command + sys.argv[1:]) @@ -90,10 +91,10 @@ shutil.copy(os.path.join(uchinanchu, "pepsources", "multimedia.list"), os.path.j shutil.copy(os.path.join(uchinanchu, "pepsources", "peppermint.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "repos")) shutil.copy(os.path.join(uchinanchu, "pepsources", "sources.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "sources-final")) shutil.copy(os.path.join(uchinanchu, "pepsources", "sources.list"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "repos")) -shutil.copy(os.path.join(uchinanchu, "pepgrub", "grub"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "grub"))) +shutil.copy(os.path.join(uchinanchu, "pepgrub", "grub"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "grub")) # Copy recursive files and sub-directories -shutil.copytree(os.path.join(uchinanchu, "pepscripts"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "lib", "finish-install.d"), dirs_exist_ok=True) +shutil.copytree(os.path.join(uchinanchu, "pepscriptsdev"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "usr", "lib", "finish-install.d"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pephooks", "normal"), os.path.join(uchinanchu, "fusato", "config", "hooks", "normal"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "pepkeyrings"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "keyrings"), dirs_exist_ok=True) shutil.copytree(os.path.join(uchinanchu, "polkit"), os.path.join(uchinanchu, "fusato", "config", "includes.installer", "preseed", "polkit"), dirs_exist_ok=True) diff --git a/PepDev_arm64/pepbld.py b/PepDev_arm64/pepbld.py index bdbecc7..abde4d7 100644 --- a/PepDev_arm64/pepbld.py +++ b/PepDev_arm64/pepbld.py @@ -33,23 +33,23 @@ lb_command = [ "--distribution", "daedalus", "--initsystem", "sysvinit", "--archive-areas", "main non-free-firmware", - "--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", - "--security" "false", - "--updates" "false", - "--backports" "false", - "--uefi-secure-boot" "enable", + "--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", + "--security", "false", + "--updates", "false", + "--backports", "false", + "--uefi-secure-boot", "enable", "--bootloaders", "grub-efi", "--bootstrap-qemu-arch", "arm64", "--bootstrap-qemu-static", "/usr/sbin/qemu-debootstrap", "--firmware-chroot", "false", - "--debootstrap-options", "--include=zstd, locales, dialog", + "--debootstrap-options", "--include=zstd,locales,dialog", "--debian-installer", "cdrom", "--debian-installer-distribution", "daedalus", "--debian-installer-gui", "true",