From 94ddf60e2da1d0c941de12790ee867ed0b360fcd Mon Sep 17 00:00:00 2001 From: manuel Date: Sun, 15 Oct 2023 17:39:10 +0000 Subject: [PATCH] update build scripts to add firmware packages to the iso --- PepDeb32/pepbld.py | 7 ++++--- PepDeb32/pepbld.sh | 5 +++-- PepDeb64/pepbld.py | 5 +++-- PepDeb64/pepbld.sh | 5 +++-- PepDeb_arm64/pepbld.py | 5 +++-- PepDeb_arm64/pepbld.sh | 6 ++++-- PepDev32/pepbld.py | 5 +++-- PepDev32/pepbld.sh | 5 +++-- PepDev64/pepbld.py | 7 ++++--- PepDev64/pepbld.sh | 7 ++++--- PepDev_arm64/pepbld.py | 5 +++-- PepDev_arm64/pepbld.sh | 5 +++-- pepinstaller/preseed/preseed.cfg | 4 ++++ 13 files changed, 44 insertions(+), 27 deletions(-) diff --git a/PepDeb32/pepbld.py b/PepDeb32/pepbld.py index f2f99c9..5374592 100644 --- a/PepDeb32/pepbld.py +++ b/PepDeb32/pepbld.py @@ -30,14 +30,15 @@ lb_command = [ "lb", "config", "noauto", "--binary-images", "iso-hybrid", "--architectures", "i386", + "--architectures", "amd64", "--distribution", "bookworm", - "--archive-areas", "main contrib non-free non-free-firmware", + "--archive-areas", "main non-free-firmware", "--firmware-chroot", "false", - "--debian-installer", "netinst", + "--debootstrap-options --include=zstd", + "--debian-installer", "cdrom", "--debian-installer-distribution", "bookworm", "--debian-installer-gui", "true", "--iso-preparer", "PeppermintOS-https://peppermintos.com/", - "--uefi-secure-boot", "enable", "--iso-publisher", "Peppermint OS Team", "--iso-volume", "PeppermintOS", "--image-name", "PepOS-mini-iso", diff --git a/PepDeb32/pepbld.sh b/PepDeb32/pepbld.sh index e008508..8b445ce 100755 --- a/PepDeb32/pepbld.sh +++ b/PepDeb32/pepbld.sh @@ -21,9 +21,10 @@ lb config noauto \ --binary-images iso-hybrid \ --architectures i386 \ --distribution bookworm \ - --archive-areas "main contrib non-free non-free-firmware" \ + --archive-areas "main non-free-firmware" \ + --debootstrap-options --include=zstd \ --firmware-chroot false \ - --debian-installer netinst \ + --debian-installer cdrom \ --debian-installer-distribution bookworm \ --debian-installer-gui true \ --iso-preparer "PeppermintOS-https://peppermintos.com/" \ diff --git a/PepDeb64/pepbld.py b/PepDeb64/pepbld.py index 851c39d..1a6a82a 100644 --- a/PepDeb64/pepbld.py +++ b/PepDeb64/pepbld.py @@ -31,9 +31,10 @@ lb_command = [ "--binary-images", "iso-hybrid", "--architectures", "amd64", "--distribution", "bookworm", - "--archive-areas", "main contrib non-free non-free-firmware", + "--archive-areas", "main non-free-firmware", "--firmware-chroot", "false", - "--debian-installer", "netinst", + "--debootstrap-options --include=zstd", + "--debian-installer", "cdrom", "--debian-installer-distribution", "bookworm", "--debian-installer-gui", "true", "--iso-preparer", "PeppermintOS-https://peppermintos.com/", diff --git a/PepDeb64/pepbld.sh b/PepDeb64/pepbld.sh index 43833be..7235924 100755 --- a/PepDeb64/pepbld.sh +++ b/PepDeb64/pepbld.sh @@ -21,9 +21,10 @@ lb config noauto \ --binary-images iso-hybrid \ --architectures amd64 \ --distribution bookworm \ - --archive-areas "main contrib non-free non-free-firmware" \ + --archive-areas "main non-free-firmware" \ + --debootstrap-options --include=zstd \ --firmware-chroot false \ - --debian-installer netinst \ + --debian-installer cdrom \ --debian-installer-distribution bookworm \ --debian-installer-gui true \ --iso-preparer "PeppermintOS-https://peppermintos.com/" \ diff --git a/PepDeb_arm64/pepbld.py b/PepDeb_arm64/pepbld.py index 34735b1..097f4f1 100644 --- a/PepDeb_arm64/pepbld.py +++ b/PepDeb_arm64/pepbld.py @@ -31,9 +31,10 @@ lb_command = [ "--binary-images", "iso-hybrid", "--architectures", "arm64", "--distribution", "bookworm", - "--archive-areas", "main contrib non-free non-free-firmware", + "--archive-areas", "main non-free-firmware", "--firmware-chroot", "false", - "--debian-installer", "netinst", + "--debootstrap-options --include=zstd", + "--debian-installer", "cdrom", "--bootloaders", "grub-efi", "--bootstrap-qemu-arch", "arm64", "--bootstrap-qemu-static", "/usr/sbin/qemu-debootstrap", diff --git a/PepDeb_arm64/pepbld.sh b/PepDeb_arm64/pepbld.sh index 65a7200..b3e2372 100755 --- a/PepDeb_arm64/pepbld.sh +++ b/PepDeb_arm64/pepbld.sh @@ -21,9 +21,10 @@ lb config noauto \ --binary-images iso-hybrid \ --architectures arm64 \ --distribution bookworm \ - --archive-areas "main contrib non-free non-free-firmware" \ + --archive-areas "main non-free-firmware" \ + --debootstrap-options --include=zstd \ --firmware-chroot false \ - --debian-installer netinst \ + --debian-installer cdrom \ --debian-installer-distribution bookworm \ --debian-installer-gui true \ --bootstrap-qemu-arch arm64 \ @@ -40,6 +41,7 @@ lb config noauto \ "${@}" + # Setup the installer structure mkdir -p $uchinanchu/fusato/config/includes.installer mkdir -p $uchinanchu/fusato/config/includes.installer/usr/lib/finish-install.d diff --git a/PepDev32/pepbld.py b/PepDev32/pepbld.py index bf1f05c..6b0fc73 100644 --- a/PepDev32/pepbld.py +++ b/PepDev32/pepbld.py @@ -32,7 +32,7 @@ lb_command = [ "--architectures", "i386", "--distribution", "daedalus", "--initsystem", "sysvinit", - "--archive-areas", "main contrib non-free non-free-firmware", + "--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", @@ -46,7 +46,8 @@ lb_command = [ "--backports" "false", "--uefi-secure-boot", "enable", "--firmware-chroot", "false", - "--debian-installer", "netinst", + "--debootstrap-options --include=zstd", + "--debian-installer", "cdrom", "--debian-installer-distribution", "daedalus", "--debian-installer-gui", "true", "--parent-mirror-debian-installer", "http://deb.devuan.org/devuan", diff --git a/PepDev32/pepbld.sh b/PepDev32/pepbld.sh index 0da4d50..1ffa943 100755 --- a/PepDev32/pepbld.sh +++ b/PepDev32/pepbld.sh @@ -22,7 +22,7 @@ lb config noauto \ --architectures i386 \ --distribution daedalus \ --initsystem sysvinit \ - --archive-areas "main contrib non-free non-free-firmware" \ + --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 \ @@ -36,7 +36,8 @@ lb config noauto \ --backports false \ --uefi-secure-boot enable \ --firmware-chroot false \ - --debian-installer netinst \ + --debootstrap-options --include=zstd \ + --debian-installer cdrom\ --debian-installer-distribution daedalus \ --debian-installer-gui true \ --parent-mirror-debian-installer http://deb.devuan.org/devuan \ diff --git a/PepDev64/pepbld.py b/PepDev64/pepbld.py index c8c0f66..0d2aab6 100644 --- a/PepDev64/pepbld.py +++ b/PepDev64/pepbld.py @@ -32,7 +32,7 @@ lb_command = [ "--architectures", "amd64", "--distribution", "daedalus", "--initsystem", "sysvinit", - "--archive-areas", "main contrib non-free non-free-firmware", + "--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", @@ -44,8 +44,10 @@ lb_command = [ "--security" "false", "--updates" "false", "--backports" "false", + "--uefi-secure-boot", "enable", "--firmware-chroot", "false", - "--debian-installer", "netinst", + "--debootstrap-options --include=zstd", + "--debian-installer", "cdrom", "--debian-installer-distribution", "daedalus", "--debian-installer-gui", "true", "--parent-mirror-debian-installer", "http://deb.devuan.org/devuan", @@ -57,7 +59,6 @@ lb_command = [ "--zsync", "false", "--win32-loader", "false", "--debian-installer-preseedfile", "preseed.cfg" -] subprocess.run(lb_command + sys.argv[1:]) diff --git a/PepDev64/pepbld.sh b/PepDev64/pepbld.sh index d9bcb04..4256544 100755 --- a/PepDev64/pepbld.sh +++ b/PepDev64/pepbld.sh @@ -22,7 +22,7 @@ lb config noauto \ --architectures amd64 \ --distribution daedalus \ --initsystem sysvinit \ - --archive-areas "main contrib non-free non-free-firmware" \ + --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 \ @@ -34,8 +34,9 @@ lb config noauto \ --security false \ --updates false \ --backports false \ - --firmware-chroot false \ - --debian-installer netinst \ + --firmware-chroot false + --debootstrap-options --include=zstd \ + --debian-installer cdrom \ --debian-installer-distribution daedalus \ --debian-installer-gui true \ --parent-mirror-debian-installer http://deb.devuan.org/devuan \ diff --git a/PepDev_arm64/pepbld.py b/PepDev_arm64/pepbld.py index 197a631..f91e5b7 100644 --- a/PepDev_arm64/pepbld.py +++ b/PepDev_arm64/pepbld.py @@ -32,7 +32,7 @@ lb_command = [ "--architectures", "arm64", "--distribution", "daedalus", "--initsystem", "sysvinit", - "--archive-areas", "main contrib non-free non-free-firmware", + "--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", @@ -49,7 +49,8 @@ lb_command = [ "--bootstrap-qemu-arch", "arm64", "--bootstrap-qemu-static", "/usr/sbin/qemu-debootstrap", "--firmware-chroot", "false", - "--debian-installer", "netinst", + "--debootstrap-options --include=zstd", + "--debian-installer", "cdrom", "--debian-installer-distribution", "daedalus", "--debian-installer-gui", "true", "--parent-mirror-debian-installer", "http://deb.devuan.org/devuan", diff --git a/PepDev_arm64/pepbld.sh b/PepDev_arm64/pepbld.sh index 6ac14f7..b7cc39f 100755 --- a/PepDev_arm64/pepbld.sh +++ b/PepDev_arm64/pepbld.sh @@ -22,7 +22,7 @@ lb config noauto \ --architectures arm64 \ --distribution daedalus \ --initsystem sysvinit \ - --archive-areas "main contrib non-free non-free-firmware" \ + --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 \ @@ -35,8 +35,9 @@ lb config noauto \ --updates false \ --backports false \ --uefi-secure-boot enable \ + --debootstrap-options --include=zstd \ --firmware-chroot false \ - --debian-installer netinst \ + --debian-installer cdrom \ --debian-installer-distribution daedalus \ --debian-installer-gui true \ --parent-mirror-debian-installer http://deb.devuan.org/devuan \ diff --git a/pepinstaller/preseed/preseed.cfg b/pepinstaller/preseed/preseed.cfg index 7434622..ca77d19 100644 --- a/pepinstaller/preseed/preseed.cfg +++ b/pepinstaller/preseed/preseed.cfg @@ -30,3 +30,7 @@ popularity-contest popularity-contest/participate boolean false # Skip creation of a root account (normal user account will be able to # use sudo). d-i passwd/root-login boolean false + +### Hostname setup +d-i netcfg/get_hostname string peppermint +