diff --git a/README.md b/README.md index aeb5bcf..3300867 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ This custom Mini ISO includes the following features: Installation of PeppermintOS using the Debian Installer. Option to install multiple desktops in addition to the Peppermint default desktop. - Compatibility with i386 and amd64 architectures. + Compatibility with i386, amd64 and arm64 architectures. Contribution diff --git a/pepbld-32.sh b/pepbld-deb-32.sh similarity index 90% rename from pepbld-32.sh rename to pepbld-deb-32.sh index f0079c3..a92d9a1 100755 --- a/pepbld-32.sh +++ b/pepbld-deb-32.sh @@ -4,6 +4,7 @@ PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" # Set the working folder variable uchinanchu="$(pwd)" +# This cleanup might be better served in the BldHelper*.sh script. # Create the build folder, move into it removing stale mountpoints and files there. [ -e fusato ] && [ ! -d fusato ] && rm -f fusato || [ ! -e fusato ] && mkdir fusato cd fusato @@ -11,7 +12,7 @@ umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null for i in ./* ./.build ; do [ $i = ./cache ] && continue || rm -rf $i ; done -#Defines Live Build settings +#Define as configurações do Live Build lb config noauto \ --binary-images iso-hybrid \ @@ -24,6 +25,7 @@ lb config noauto \ --debian-installer netinst \ --debian-installer-distribution bullseye \ --debian-installer-gui true \ + --uefi-secure-boot enable \ --iso-preparer "PeppermintOS-https://peppermintos.com/" \ --iso-publisher "Peppermint OS Team" \ --iso-volume "PepOS-mini-iso" \ @@ -43,6 +45,7 @@ mkdir -p $uchinanchu/fusato/config/includes.binary/install mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share # Copy single files and folder to the installer +#cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer # Copy recursive files and sub-directories, containing symlinks. diff --git a/pepbld-64.sh b/pepbld-deb-64.sh similarity index 91% rename from pepbld-64.sh rename to pepbld-deb-64.sh index fde1651..a5056a2 100755 --- a/pepbld-64.sh +++ b/pepbld-deb-64.sh @@ -4,6 +4,7 @@ PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" # Set the working folder variable uchinanchu="$(pwd)" +# This cleanup might be better served in the BldHelper*.sh script. # Create the build folder, move into it removing stale mountpoints and files there. [ -e fusato ] && [ ! -d fusato ] && rm -f fusato || [ ! -e fusato ] && mkdir fusato cd fusato @@ -11,7 +12,7 @@ umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null for i in ./* ./.build ; do [ $i = ./cache ] && continue || rm -rf $i ; done -# Defines Live Build settings +#Define as configurações do Live Build lb config noauto \ --binary-images iso-hybrid \ @@ -43,6 +44,7 @@ mkdir -p $uchinanchu/fusato/config/includes.binary/install mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share # Copy single files and folder to the installer +#cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer # Copy recursive files and sub-directories, containing symlinks. diff --git a/pepbld-deb-arm64.sh b/pepbld-deb-arm64.sh new file mode 100755 index 0000000..7f61731 --- /dev/null +++ b/pepbld-deb-arm64.sh @@ -0,0 +1,59 @@ +#!/bin/bash +PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" + +# Set the working folder variable +uchinanchu="$(pwd)" + +# This cleanup might be better served in the BldHelper*.sh script. +# Create the build folder, move into it removing stale mountpoints and files there. +[ -e fusato ] && [ ! -d fusato ] && rm -f fusato || [ ! -e fusato ] && mkdir fusato +cd fusato +umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null +for i in ./* ./.build ; do [ $i = ./cache ] && continue || rm -rf $i ; done + + +#Define as configurações do Live Build + +lb config noauto \ + --binary-images iso-hybrid \ + --architectures arm64 \ + --linux-flavours arm64 \ + --distribution bullseye \ + --archive-areas "main contrib non-free" \ + --firmware-binary true \ + --firmware-chroot false \ + --debian-installer netinst \ + --debian-installer-distribution bullseye \ + --debian-installer-gui true \ + --bootstrap-qemu-arch arm64 \ + --bootloaders grub-efi \ + --bootstrap-qemu-static /usr/sbin/qemu-debootstrap \ + --iso-preparer "PeppermintOS-https://peppermintos.com/" \ + --iso-publisher "Peppermint OS Team" \ + --iso-volume "PepOS-mini-iso" \ + --image-name "PepOS-mini-iso" \ + --checksums sha512 \ + --zsync false \ + --win32-loader false \ + --debian-installer-preseedfile preseed.cfg + + "${@}" + + +# Setup the installer structure +mkdir -p $uchinanchu/fusato/config/includes.installer +mkdir -p $uchinanchu/fusato/config/includes.binary +mkdir -p $uchinanchu/fusato/config/includes.binary/install +mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share + +# Copy single files and folder to the installer +#cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives +cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer + +# Copy recursive files and sub-directories, containing symlinks. +cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary +cp -r $uchinanchu/peploadersplash/isolinux $uchinanchu/fusato/config/includes.binary +cp -r $uchinanchu/pepinstaller/graphics $uchinanchu/fusato/config/includes.installer/usr/share +cp -r $uchinanchu/pepinstaller/themes $uchinanchu/fusato/config/includes.installer/usr/share + +lb build diff --git a/pepbld-dev-32.sh b/pepbld-dev-32.sh new file mode 100755 index 0000000..f9719bc --- /dev/null +++ b/pepbld-dev-32.sh @@ -0,0 +1,67 @@ +#!/bin/bash +PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" + +# Set the working folder variable +uchinanchu="$(pwd)" + +# This cleanup might be better served in the BldHelper*.sh script. +# Create the build folder, move into it removing stale mountpoints and files there. +[ -e fusato ] && [ ! -d fusato ] && rm -f fusato || [ ! -e fusato ] && mkdir fusato +cd fusato +umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null +for i in ./* ./.build ; do [ $i = ./cache ] && continue || rm -rf $i ; done + + +#Define as configurações do Live Build + +lb config noauto \ + --binary-images iso-hybrid \ + --architectures i386 \ + --linux-flavours 686 \ + --distribution chimaera \ + --initsystem sysvinit \ + --archive-areas "main contrib non-free" \ + --mirror-bootstrap http://pkgmaster.devuan.org/merged \ + --parent-mirror-bootstrap http://pkgmaster.devuan.org/merged \ + --parent-mirror-chroot http://pkgmaster.devuan.org/merged \ + --parent-mirror-chroot-security http://pkgmaster.devuan.org/merged \ + --parent-mirror-binary http://pkgmaster.devuan.org/merged \ + --parent-mirror-binary-security http://pkgmaster.devuan.org/merged \ + --mirror-chroot http://pkgmaster.devuan.org/merged \ + --mirror-chroot-security http://pkgmaster.devuan.org/merged \ + --parent-mirror-debian-installer http://pkgmaster.devuan.org/devuan \ + --uefi-secure-boot enable \ + --firmware-binary true \ + --firmware-chroot false \ + --debian-installer netinst \ + --debian-installer-distribution chimaera \ + --debian-installer-gui true \ + --iso-preparer "PeppermintOS-https://peppermintos.com/" \ + --iso-publisher "Peppermint OS Team" \ + --iso-volume "PepOS-mini-iso" \ + --image-name "PepOS-mini-iso" \ + --checksums sha512 \ + --zsync false \ + --win32-loader false \ + --debian-installer-preseedfile preseed.cfg \ + + "${@}" + + +# Setup the installer structure +mkdir -p $uchinanchu/fusato/config/includes.installer +mkdir -p $uchinanchu/fusato/config/includes.binary +mkdir -p $uchinanchu/fusato/config/includes.binary/install +mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share + +# Copy single files and folder to the installer +#cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives +cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer + +# Copy recursive files and sub-directories, containing symlinks. +cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary +cp -r $uchinanchu/peploadersplash/isolinux $uchinanchu/fusato/config/includes.binary +cp -r $uchinanchu/pepinstaller/graphics $uchinanchu/fusato/config/includes.installer/usr/share +cp -r $uchinanchu/pepinstaller/themes $uchinanchu/fusato/config/includes.installer/usr/share + +lb build diff --git a/pepbld-dev-64.sh b/pepbld-dev-64.sh new file mode 100755 index 0000000..4b29491 --- /dev/null +++ b/pepbld-dev-64.sh @@ -0,0 +1,69 @@ +#!/bin/bash +PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" + +# Set the working folder variable +uchinanchu="$(pwd)" + +# This cleanup might be better served in the BldHelper*.sh script. +# Create the build folder, move into it removing stale mountpoints and files there. +[ -e fusato ] && [ ! -d fusato ] && rm -f fusato || [ ! -e fusato ] && mkdir fusato +cd fusato +umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null +for i in ./* ./.build ; do [ $i = ./cache ] && continue || rm -rf $i ; done + + +#Define as configurações do Live Build + +lb config noauto \ + --binary-images iso-hybrid \ + --architectures amd64 \ + --linux-flavours amd64 \ + --distribution chimaera \ + --initsystem sysvinit \ + --archive-areas "main contrib non-free" \ + --mirror-bootstrap http://pkgmaster.devuan.org/merged \ + --parent-mirror-bootstrap http://pkgmaster.devuan.org/merged \ + --parent-mirror-chroot http://pkgmaster.devuan.org/merged \ + --parent-mirror-chroot-security http://pkgmaster.devuan.org/merged \ + --parent-mirror-binary http://pkgmaster.devuan.org/merged \ + --parent-mirror-binary-security http://pkgmaster.devuan.org/merged \ + --mirror-chroot http://pkgmaster.devuan.org/merged \ + --mirror-chroot-security http://pkgmaster.devuan.org/merged \ + --parent-mirror-debian-installer http://pkgmaster.devuan.org/devuan \ + --uefi-secure-boot enable \ + --firmware-binary true \ + --firmware-chroot false \ + --debian-installer netinst \ + --debian-installer-distribution chimaera \ + --debian-installer-gui true \ + --iso-preparer "PeppermintOS-https://peppermintos.com/" \ + --iso-publisher "Peppermint OS Team" \ + --iso-volume "PepOS-mini-iso" \ + --image-name "PepOS-mini-iso" \ + --checksums sha512 \ + --zsync false \ + --win32-loader false \ + --debian-installer-preseedfile preseed.cfg \ + --security true \ + --updates true \ + --backports true \ + "${@}" + + +# Setup the installer structure +mkdir -p $uchinanchu/fusato/config/includes.installer +mkdir -p $uchinanchu/fusato/config/includes.binary +mkdir -p $uchinanchu/fusato/config/includes.binary/install +mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share + +# Copy single files and folder to the installer +#cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives +cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer + +# Copy recursive files and sub-directories, containing symlinks. +cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary +cp -r $uchinanchu/peploadersplash/isolinux $uchinanchu/fusato/config/includes.binary +cp -r $uchinanchu/pepinstaller/graphics $uchinanchu/fusato/config/includes.installer/usr/share +cp -r $uchinanchu/pepinstaller/themes $uchinanchu/fusato/config/includes.installer/usr/share + +lb build diff --git a/pepbld-dev-arm64.sh b/pepbld-dev-arm64.sh new file mode 100755 index 0000000..65aa1b2 --- /dev/null +++ b/pepbld-dev-arm64.sh @@ -0,0 +1,72 @@ +#!/bin/bash +PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" + +# Set the working folder variable +uchinanchu="$(pwd)" + +# This cleanup might be better served in the BldHelper*.sh script. +# Create the build folder, move into it removing stale mountpoints and files there. +[ -e fusato ] && [ ! -d fusato ] && rm -f fusato || [ ! -e fusato ] && mkdir fusato +cd fusato +umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null +for i in ./* ./.build ; do [ $i = ./cache ] && continue || rm -rf $i ; done + + +#Define as configurações do Live Build + +lb config noauto \ + --binary-images iso-hybrid \ + --architectures arm64 \ + --linux-flavours arm64 \ + --distribution chimaera \ + --initsystem sysvinit \ + --archive-areas "main contrib non-free" \ + --mirror-bootstrap http://pkgmaster.devuan.org/merged \ + --parent-mirror-bootstrap http://pkgmaster.devuan.org/merged \ + --parent-mirror-chroot http://pkgmaster.devuan.org/merged \ + --parent-mirror-chroot-security http://pkgmaster.devuan.org/merged \ + --parent-mirror-binary http://pkgmaster.devuan.org/merged \ + --parent-mirror-binary-security http://pkgmaster.devuan.org/merged \ + --mirror-chroot http://pkgmaster.devuan.org/merged \ + --mirror-chroot-security http://pkgmaster.devuan.org/merged \ + --parent-mirror-debian-installer http://pkgmaster.devuan.org/devuan \ + --uefi-secure-boot enable \ + --firmware-binary true \ + --firmware-chroot false \ + --debian-installer netinst \ + --debian-installer-distribution chimaera \ + --debian-installer-gui true \ + --bootstrap-qemu-arch arm64 \ + --bootloaders grub-efi \ + --bootstrap-qemu-static /usr/sbin/qemu-debootstrap \ + --iso-preparer "PeppermintOS-https://peppermintos.com/" \ + --iso-publisher "Peppermint OS Team" \ + --iso-volume "PepOS-mini-iso" \ + --image-name "PepOS-mini-iso" \ + --checksums sha512 \ + --zsync false \ + --win32-loader false \ + --debian-installer-preseedfile preseed.cfg \ + --security true \ + --updates true \ + --backports true \ + "${@}" + + +# Setup the installer structure +mkdir -p $uchinanchu/fusato/config/includes.installer +mkdir -p $uchinanchu/fusato/config/includes.binary +mkdir -p $uchinanchu/fusato/config/includes.binary/install +mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share + +# Copy single files and folder to the installer +#cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives +cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer + +# Copy recursive files and sub-directories, containing symlinks. +cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary +cp -r $uchinanchu/peploadersplash/isolinux $uchinanchu/fusato/config/includes.binary +cp -r $uchinanchu/pepinstaller/graphics $uchinanchu/fusato/config/includes.installer/usr/share +cp -r $uchinanchu/pepinstaller/themes $uchinanchu/fusato/config/includes.installer/usr/share + +lb build diff --git a/peploadersplash/isolinux/menu.cfg b/peploadersplash/isolinux/menu.cfg index dce3eca..cf652c3 100644 --- a/peploadersplash/isolinux/menu.cfg +++ b/peploadersplash/isolinux/menu.cfg @@ -1,7 +1,7 @@ menu hshift 4 menu width 70 -menu title PeppermintOS Server Edition installer menu (BIOS mode) +menu title PeppermintOS net installer menu (BIOS mode) include stdmenu.cfg include gtk.cfg include txt.cfg