diff --git a/BldHelper-32-non-pae-release.sh b/BldHelper-32-non-pae-release.sh deleted file mode 100755 index 0bc1fca3..00000000 --- a/BldHelper-32-non-pae-release.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash - -# BldHelper-release.sh -# This script is meant to be run on the build server and expects to find and update itself from adjacent repos. -# From PepDistroConfigs, these repos are ../PepProPixMaps & ../PepProTools and are vital to having a working build. - -### ## # Set build working variables HERE # ## ### - -PREFIX=My-distro-devuan # Sets a unique final name of the ISO and checksum so only removes 2 files . -SUFFIX=i386 # Also used by . And to distinguish between amd64 and x86 or devuan and ubuntu . -BUILD=release # Sets which pepbld.sh to use and the location in /var/www/html/[release|rc|testing|nightly|unstable] - -################################################## -### ## # Make NO Edits Below This Line !! # ## ### -################################################## -[ $TODAY ! = " " ] || TODAY=$(date -u +"%Y-%m-%d") # If MasterBuilder.sh is used IT will set the date. If not used, we set it here. -FileName="${PREFIX}-${SUFFIX}" # This will give a uniquely named and dated ISO and checksum for . -LOCATION=/var/www/acoroslinux.tk/iso-builds/${BUILD} # Tells and the script which 2 files to remove and where to put them. -LogDir=/repos/builds/my-distro-builds/logs/ # This folder contains a log for the last $[PREFIX]-$[SUFFIX] build. -WorkDir=/repos/builds/my-distro-builds/ # * If we change servers or locations T*H*I*S line is the O*N*L*Y line to change. * -_break=0 ; _wait=30 # Time (in seconds) to wait - -# Move into the builder directory. -# Make sure the local repos are up to date. -cd /repos/builds/my-distro-builds/ -cd ./My-distro-configs-devuan && git pull --ff-only - -# Run the build script - expect 50 minutes, allow 60. - ./build-32-non-pae.sh 2>&1 | tee -a /tmp/${FileName}.out - - -# Timing matters, don't destroy the old one without a replacement. -# Check for the ISO to appear and wait for things to settle. -until [ -e build32/*.iso ] - do ((++_break)) - [ $_break -gt $_wait ] && break || sleep 1 -done - -if [ ${_break} -lt ${_wait} ] ; then -### 10 June, 2022 - After 17 June, this comment and the following line can be removed -echo -e "\n\tISO appeared after $_break seconds.\n" | tee --append /tmp/${FileName}.out - -mv build32/*.iso build32/${FileName}.iso - -# Make the checksum file. -cd build32 -echo "# ${FileName} ${TODAY}" > ${FileName}-sha512.checksum -sha512sum ${FileName}.iso >> ${FileName}-sha512.checksum - -### -# Remove the previous files in ${LOCATION} . -rm -f ${LOCATION}/${FileName}*.iso -rm -f ${LOCATION}/${FileName}*-sha512.checksum - -#mv $(FileName}* ${LOCATION}/ -mv ${FileName}.iso ${LOCATION}/${FileName}.iso -mv ${FileName}-sha512.checksum ${LOCATION}/${FileName}-sha512.checksum - -# touch -t ${_stamp} ${LOCATION} ${LOCATION}/${FileName}* -touch ${LOCATION}/${FileName}* - -lb clean & - -# Move the log file to the log directory. -[ ! -e ${LogDir} ] && mkdir -p ${LogDir} -mv /tmp/${FileName}.out ${LogDir}/${FileName}-${BUILD}.log -### - -else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append /tmp/${FileName}.out - mv /tmp/${FileName}.out ${LogDir}/${FileName}-${BUILD}.log -fi - diff --git a/BldHelper-32-release.sh b/BldHelper-32-release.sh deleted file mode 100755 index 7482eab4..00000000 --- a/BldHelper-32-release.sh +++ /dev/null @@ -1,72 +0,0 @@ -#!/bin/bash - -# BldHelper-release.sh -# This script is meant to be run on the build server and expects to find and update itself from adjacent repos. -# From PepDistroConfigs, these repos are ../PepProPixMaps & ../PepProTools and are vital to having a working build. - -### ## # Set build working variables HERE # ## ### - -PREFIX=My-distro-devuan # Sets a unique final name of the ISO and checksum so only removes 2 files . -SUFFIX=i386-pae # Also used by . And to distinguish between amd64 and x86 or devuan and ubuntu . -BUILD=release # Sets which pepbld.sh to use and the location in /var/www/html/[release|rc|testing|nightly|unstable] - -################################################## -### ## # Make NO Edits Below This Line !! # ## ### -################################################## -[ $TODAY ! = " " ] || TODAY=$(date -u +"%Y-%m-%d") # If MasterBuilder.sh is used IT will set the date. If not used, we set it here. -FileName="${PREFIX}-${SUFFIX}" # This will give a uniquely named and dated ISO and checksum for . -LOCATION=/var/www/acoroslinux.tk/iso-builds/${BUILD} # Tells and the script which 2 files to remove and where to put them. -LogDir=/repos/builds/my-distro-builds/logs/ # This folder contains a log for the last $[PREFIX]-$[SUFFIX] build. -WorkDir=/repos/builds/my-distro-builds/ # * If we change servers or locations T*H*I*S line is the O*N*L*Y line to change. * -_break=0 ; _wait=30 # Time (in seconds) to wait - -# Move into the builder directory. -# Make sure the local repos are up to date. -cd /repos/builds/my-distro-builds/ -cd ./My-distro-configs-devuan && git pull --ff-only - -# Run the build script - expect 50 minutes, allow 60. - ./build-32.sh 2>&1 | tee -a /tmp/${FileName}.out - - -# Timing matters, don't destroy the old one without a replacement. -# Check for the ISO to appear and wait for things to settle. -until [ -e build32pae/*.iso ] - do ((++_break)) - [ $_break -gt $_wait ] && break || sleep 1 -done - -if [ ${_break} -lt ${_wait} ] ; then -### 10 June, 2022 - After 17 June, this comment and the following line can be removed -echo -e "\n\tISO appeared after $_break seconds.\n" | tee --append /tmp/${FileName}.out - -mv build32pae/*.iso build32pae/${FileName}.iso - -# Make the checksum file. -cd build32pae -echo "# ${FileName} ${TODAY}" > ${FileName}-sha512.checksum -sha512sum ${FileName}.iso >> ${FileName}-sha512.checksum - -### -# Remove the previous files in ${LOCATION} . -rm -f ${LOCATION}/${FileName}*.iso -rm -f ${LOCATION}/${FileName}*-sha512.checksum - -#mv $(FileName}* ${LOCATION}/ -mv ${FileName}.iso ${LOCATION}/${FileName}.iso -mv ${FileName}-sha512.checksum ${LOCATION}/${FileName}-sha512.checksum - -# touch -t ${_stamp} ${LOCATION} ${LOCATION}/${FileName}* -touch ${LOCATION}/${FileName}* - -lb clean & - -# Move the log file to the log directory. -[ ! -e ${LogDir} ] && mkdir -p ${LogDir} -mv /tmp/${FileName}.out ${LogDir}/${FileName}-${BUILD}.log -### - -else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append /tmp/${FileName}.out - mv /tmp/${FileName}.out ${LogDir}/${FileName}-${BUILD}.log -fi - diff --git a/BldHelper-64-release.sh b/BldHelper-64-release.sh deleted file mode 100755 index 2cca966e..00000000 --- a/BldHelper-64-release.sh +++ /dev/null @@ -1,73 +0,0 @@ -#!/bin/bash - -# BldHelper-release.sh -# This script is meant to be run on the build server and expects to find and update itself from adjacent repos. -# From PepDistroConfigs, these repos are ../PepProPixMaps & ../PepProTools and are vital to having a working build. - -### ## # Set build working variables HERE # ## ### - -PREFIX=My-distro-devuan # Sets a unique final name of the ISO and checksum so only removes 2 files . -SUFFIX=amd64 # Also used by . And to distinguish between amd64 and x86 or devuan and ubuntu . -BUILD=release # Sets which pepbld.sh to use and the location in /var/www/html/[release|rc|testing|nightly|unstable] - -################################################## -### ## # Make NO Edits Below This Line !! # ## ### -################################################## - -[ $TODAY ! = " " ] || TODAY=$(date -u +"%Y-%m-%d") # If MasterBuilder.sh is used IT will set the date. If not used, we set it here. -FileName="${PREFIX}-${SUFFIX}" # This will give a uniquely named and dated ISO and checksum for . -LOCATION=/var/www/acoroslinux.tk/iso-builds/${BUILD} # Tells and the script which 2 files to remove and where to put them. -LogDir=/repos/builds/my-distro-builds/logs/ # This folder contains a log for the last $[PREFIX]-$[SUFFIX] build. -WorkDir=/repos/builds/my-distro-builds/ # * If we change servers or locations T*H*I*S line is the O*N*L*Y line to change. * -_break=0 ; _wait=30 # Time (in seconds) to wait - -# Move into the builder directory. -# Make sure the local repos are up to date. -cd /repos/builds/my-distro-builds/ -cd ./My-distro-configs-devuan && git pull --ff-only - -# Run the build script - expect 50 minutes, allow 60. - ./build-64.sh 2>&1 | tee -a /tmp/${FileName}.out - - -# Timing matters, don't destroy the old one without a replacement. -# Check for the ISO to appear and wait for things to settle. -until [ -e build/*.iso ] - do ((++_break)) - [ $_break -gt $_wait ] && break || sleep 1 -done - -if [ ${_break} -lt ${_wait} ] ; then -### 10 June, 2022 - After 17 June, this comment and the following line can be removed -echo -e "\n\tISO appeared after $_break seconds.\n" | tee --append /tmp/${FileName}.out - -mv build/*.iso build/${FileName}.iso - -# Make the checksum file. -cd build -echo "# ${FileName} ${TODAY}" > ${FileName}-sha512.checksum -sha512sum ${FileName}.iso >> ${FileName}-sha512.checksum - -### -# Remove the previous files in ${LOCATION} . -rm -f ${LOCATION}/${FileName}*.iso -rm -f ${LOCATION}/${FileName}*-sha512.checksum - -#mv $(FileName}* ${LOCATION}/ -mv ${FileName}.iso ${LOCATION}/${FileName}.iso -mv ${FileName}-sha512.checksum ${LOCATION}/${FileName}-sha512.checksum - -# touch -t ${_stamp} ${LOCATION} ${LOCATION}/${FileName}* -touch ${LOCATION}/${FileName}* - -lb clean & - -# Move the log file to the log directory. -[ ! -e ${LogDir} ] && mkdir -p ${LogDir} -mv /tmp/${FileName}.out ${LogDir}/${FileName}-${BUILD}.log -### - -else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append /tmp/${FileName}.out - mv /tmp/${FileName}.out ${LogDir}/${FileName}-${BUILD}.log -fi - diff --git a/bootloader-config-32bit/bootloader-config b/bootloader-config/bootloader-config similarity index 100% rename from bootloader-config-32bit/bootloader-config rename to bootloader-config/bootloader-config diff --git a/bootloaders/grub-pc/config.cfg b/bootloaders/boot/grub/config.cfg similarity index 100% rename from bootloaders/grub-pc/config.cfg rename to bootloaders/boot/grub/config.cfg diff --git a/bootloaders/grub-pc/dejavu-bold-14.pf2 b/bootloaders/boot/grub/dejavu-bold-14.pf2 similarity index 100% rename from bootloaders/grub-pc/dejavu-bold-14.pf2 rename to bootloaders/boot/grub/dejavu-bold-14.pf2 diff --git a/bootloaders/grub-pc/dejavu-bold-16.pf2 b/bootloaders/boot/grub/dejavu-bold-16.pf2 similarity index 100% rename from bootloaders/grub-pc/dejavu-bold-16.pf2 rename to bootloaders/boot/grub/dejavu-bold-16.pf2 diff --git a/bootloaders/grub-pc/font.pf2 b/bootloaders/boot/grub/font.pf2 similarity index 100% rename from bootloaders/grub-pc/font.pf2 rename to bootloaders/boot/grub/font.pf2 diff --git a/bootloaders/grub-pc/grub.cfg b/bootloaders/boot/grub/grub.cfg similarity index 91% rename from bootloaders/grub-pc/grub.cfg rename to bootloaders/boot/grub/grub.cfg index 37dcd573..e3b40030 100644 --- a/bootloaders/grub-pc/grub.cfg +++ b/bootloaders/boot/grub/grub.cfg @@ -1,7 +1,7 @@ source /boot/grub/config.cfg menuentry "My-distro Live" { - linux /live/vmlinuz boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores autologin "${loopback}" + linux /live/vmlinuz boot=live components splash quiet username=user hostname=My-distro autologin "${loopback}" initrd /live/initrd.img } menuentry "My-distro Live (fail-safe mode)" { diff --git a/bootloaders/grub-pc/live-theme/background.png b/bootloaders/boot/grub/live-theme/background.png similarity index 100% rename from bootloaders/grub-pc/live-theme/background.png rename to bootloaders/boot/grub/live-theme/background.png diff --git a/bootloaders/grub-pc/live-theme/icons/4MLinux.png b/bootloaders/boot/grub/live-theme/icons/4MLinux.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/4MLinux.png rename to bootloaders/boot/grub/live-theme/icons/4MLinux.png diff --git a/bootloaders/grub-pc/live-theme/icons/AlpineLinux.png b/bootloaders/boot/grub/live-theme/icons/AlpineLinux.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/AlpineLinux.png rename to bootloaders/boot/grub/live-theme/icons/AlpineLinux.png diff --git a/bootloaders/grub-pc/live-theme/icons/Manjaro.i686.png b/bootloaders/boot/grub/live-theme/icons/Manjaro.i686.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/Manjaro.i686.png rename to bootloaders/boot/grub/live-theme/icons/Manjaro.i686.png diff --git a/bootloaders/grub-pc/live-theme/icons/Manjaro.x86_64.png b/bootloaders/boot/grub/live-theme/icons/Manjaro.x86_64.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/Manjaro.x86_64.png rename to bootloaders/boot/grub/live-theme/icons/Manjaro.x86_64.png diff --git a/bootloaders/grub-pc/live-theme/icons/SystemRescueCD.png b/bootloaders/boot/grub/live-theme/icons/SystemRescueCD.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/SystemRescueCD.png rename to bootloaders/boot/grub/live-theme/icons/SystemRescueCD.png diff --git a/bootloaders/grub-pc/live-theme/icons/android.png b/bootloaders/boot/grub/live-theme/icons/android.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/android.png rename to bootloaders/boot/grub/live-theme/icons/android.png diff --git a/bootloaders/grub-pc/live-theme/icons/anonymous.png b/bootloaders/boot/grub/live-theme/icons/anonymous.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/anonymous.png rename to bootloaders/boot/grub/live-theme/icons/anonymous.png diff --git a/bootloaders/grub-pc/live-theme/icons/antergos.png b/bootloaders/boot/grub/live-theme/icons/antergos.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/antergos.png rename to bootloaders/boot/grub/live-theme/icons/antergos.png diff --git a/bootloaders/grub-pc/live-theme/icons/arch.png b/bootloaders/boot/grub/live-theme/icons/arch.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/arch.png rename to bootloaders/boot/grub/live-theme/icons/arch.png diff --git a/bootloaders/grub-pc/live-theme/icons/archlinux.png b/bootloaders/boot/grub/live-theme/icons/archlinux.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/archlinux.png rename to bootloaders/boot/grub/live-theme/icons/archlinux.png diff --git a/bootloaders/grub-pc/live-theme/icons/arcolinux.png b/bootloaders/boot/grub/live-theme/icons/arcolinux.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/arcolinux.png rename to bootloaders/boot/grub/live-theme/icons/arcolinux.png diff --git a/bootloaders/grub-pc/live-theme/icons/artix.png b/bootloaders/boot/grub/live-theme/icons/artix.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/artix.png rename to bootloaders/boot/grub/live-theme/icons/artix.png diff --git a/bootloaders/grub-pc/live-theme/icons/bedrock.png b/bootloaders/boot/grub/live-theme/icons/bedrock.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/bedrock.png rename to bootloaders/boot/grub/live-theme/icons/bedrock.png diff --git a/bootloaders/grub-pc/live-theme/icons/cancel.png b/bootloaders/boot/grub/live-theme/icons/cancel.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/cancel.png rename to bootloaders/boot/grub/live-theme/icons/cancel.png diff --git a/bootloaders/grub-pc/live-theme/icons/centos.png b/bootloaders/boot/grub/live-theme/icons/centos.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/centos.png rename to bootloaders/boot/grub/live-theme/icons/centos.png diff --git a/bootloaders/grub-pc/live-theme/icons/chakra.png b/bootloaders/boot/grub/live-theme/icons/chakra.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/chakra.png rename to bootloaders/boot/grub/live-theme/icons/chakra.png diff --git a/bootloaders/grub-pc/live-theme/icons/debian.png b/bootloaders/boot/grub/live-theme/icons/debian.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/debian.png rename to bootloaders/boot/grub/live-theme/icons/debian.png diff --git a/bootloaders/grub-pc/live-theme/icons/deepin.png b/bootloaders/boot/grub/live-theme/icons/deepin.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/deepin.png rename to bootloaders/boot/grub/live-theme/icons/deepin.png diff --git a/bootloaders/grub-pc/live-theme/icons/devuan.png b/bootloaders/boot/grub/live-theme/icons/devuan.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/devuan.png rename to bootloaders/boot/grub/live-theme/icons/devuan.png diff --git a/bootloaders/grub-pc/live-theme/icons/driver.png b/bootloaders/boot/grub/live-theme/icons/driver.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/driver.png rename to bootloaders/boot/grub/live-theme/icons/driver.png diff --git a/bootloaders/grub-pc/live-theme/icons/edit.png b/bootloaders/boot/grub/live-theme/icons/edit.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/edit.png rename to bootloaders/boot/grub/live-theme/icons/edit.png diff --git a/bootloaders/grub-pc/live-theme/icons/efi.png b/bootloaders/boot/grub/live-theme/icons/efi.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/efi.png rename to bootloaders/boot/grub/live-theme/icons/efi.png diff --git a/bootloaders/grub-pc/live-theme/icons/elementary.png b/bootloaders/boot/grub/live-theme/icons/elementary.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/elementary.png rename to bootloaders/boot/grub/live-theme/icons/elementary.png diff --git a/bootloaders/grub-pc/live-theme/icons/endeavouros.png b/bootloaders/boot/grub/live-theme/icons/endeavouros.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/endeavouros.png rename to bootloaders/boot/grub/live-theme/icons/endeavouros.png diff --git a/bootloaders/grub-pc/live-theme/icons/fedora.png b/bootloaders/boot/grub/live-theme/icons/fedora.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/fedora.png rename to bootloaders/boot/grub/live-theme/icons/fedora.png diff --git a/bootloaders/grub-pc/live-theme/icons/find.efi.png b/bootloaders/boot/grub/live-theme/icons/find.efi.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/find.efi.png rename to bootloaders/boot/grub/live-theme/icons/find.efi.png diff --git a/bootloaders/grub-pc/live-theme/icons/find.none.png b/bootloaders/boot/grub/live-theme/icons/find.none.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/find.none.png rename to bootloaders/boot/grub/live-theme/icons/find.none.png diff --git a/bootloaders/grub-pc/live-theme/icons/freebsd.png b/bootloaders/boot/grub/live-theme/icons/freebsd.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/freebsd.png rename to bootloaders/boot/grub/live-theme/icons/freebsd.png diff --git a/bootloaders/grub-pc/live-theme/icons/garuda.png b/bootloaders/boot/grub/live-theme/icons/garuda.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/garuda.png rename to bootloaders/boot/grub/live-theme/icons/garuda.png diff --git a/bootloaders/grub-pc/live-theme/icons/gentoo.png b/bootloaders/boot/grub/live-theme/icons/gentoo.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/gentoo.png rename to bootloaders/boot/grub/live-theme/icons/gentoo.png diff --git a/bootloaders/grub-pc/live-theme/icons/gnu-linux.png b/bootloaders/boot/grub/live-theme/icons/gnu-linux.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/gnu-linux.png rename to bootloaders/boot/grub/live-theme/icons/gnu-linux.png diff --git a/bootloaders/grub-pc/live-theme/icons/haiku.png b/bootloaders/boot/grub/live-theme/icons/haiku.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/haiku.png rename to bootloaders/boot/grub/live-theme/icons/haiku.png diff --git a/bootloaders/grub-pc/live-theme/icons/help.png b/bootloaders/boot/grub/live-theme/icons/help.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/help.png rename to bootloaders/boot/grub/live-theme/icons/help.png diff --git a/bootloaders/grub-pc/live-theme/icons/kali.png b/bootloaders/boot/grub/live-theme/icons/kali.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/kali.png rename to bootloaders/boot/grub/live-theme/icons/kali.png diff --git a/bootloaders/grub-pc/live-theme/icons/kaos.png b/bootloaders/boot/grub/live-theme/icons/kaos.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/kaos.png rename to bootloaders/boot/grub/live-theme/icons/kaos.png diff --git a/bootloaders/grub-pc/live-theme/icons/kbd.png b/bootloaders/boot/grub/live-theme/icons/kbd.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/kbd.png rename to bootloaders/boot/grub/live-theme/icons/kbd.png diff --git a/bootloaders/grub-pc/live-theme/icons/korora.png b/bootloaders/boot/grub/live-theme/icons/korora.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/korora.png rename to bootloaders/boot/grub/live-theme/icons/korora.png diff --git a/bootloaders/grub-pc/live-theme/icons/kubuntu.png b/bootloaders/boot/grub/live-theme/icons/kubuntu.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/kubuntu.png rename to bootloaders/boot/grub/live-theme/icons/kubuntu.png diff --git a/bootloaders/grub-pc/live-theme/icons/lang.png b/bootloaders/boot/grub/live-theme/icons/lang.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/lang.png rename to bootloaders/boot/grub/live-theme/icons/lang.png diff --git a/bootloaders/grub-pc/live-theme/icons/lfs.png b/bootloaders/boot/grub/live-theme/icons/lfs.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/lfs.png rename to bootloaders/boot/grub/live-theme/icons/lfs.png diff --git a/bootloaders/grub-pc/live-theme/icons/linux.png b/bootloaders/boot/grub/live-theme/icons/linux.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/linux.png rename to bootloaders/boot/grub/live-theme/icons/linux.png diff --git a/bootloaders/grub-pc/live-theme/icons/linuxmint.png b/bootloaders/boot/grub/live-theme/icons/linuxmint.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/linuxmint.png rename to bootloaders/boot/grub/live-theme/icons/linuxmint.png diff --git a/bootloaders/grub-pc/live-theme/icons/lubuntu.png b/bootloaders/boot/grub/live-theme/icons/lubuntu.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/lubuntu.png rename to bootloaders/boot/grub/live-theme/icons/lubuntu.png diff --git a/bootloaders/grub-pc/live-theme/icons/macosx.png b/bootloaders/boot/grub/live-theme/icons/macosx.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/macosx.png rename to bootloaders/boot/grub/live-theme/icons/macosx.png diff --git a/bootloaders/grub-pc/live-theme/icons/mageia.png b/bootloaders/boot/grub/live-theme/icons/mageia.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/mageia.png rename to bootloaders/boot/grub/live-theme/icons/mageia.png diff --git a/bootloaders/grub-pc/live-theme/icons/manjaro.png b/bootloaders/boot/grub/live-theme/icons/manjaro.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/manjaro.png rename to bootloaders/boot/grub/live-theme/icons/manjaro.png diff --git a/bootloaders/grub-pc/live-theme/icons/mate.png b/bootloaders/boot/grub/live-theme/icons/mate.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/mate.png rename to bootloaders/boot/grub/live-theme/icons/mate.png diff --git a/bootloaders/grub-pc/live-theme/icons/memtest.png b/bootloaders/boot/grub/live-theme/icons/memtest.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/memtest.png rename to bootloaders/boot/grub/live-theme/icons/memtest.png diff --git a/bootloaders/grub-pc/live-theme/icons/mx-linux.png b/bootloaders/boot/grub/live-theme/icons/mx-linux.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/mx-linux.png rename to bootloaders/boot/grub/live-theme/icons/mx-linux.png diff --git a/bootloaders/grub-pc/live-theme/icons/neon.png b/bootloaders/boot/grub/live-theme/icons/neon.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/neon.png rename to bootloaders/boot/grub/live-theme/icons/neon.png diff --git a/bootloaders/grub-pc/live-theme/icons/opensuse.png b/bootloaders/boot/grub/live-theme/icons/opensuse.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/opensuse.png rename to bootloaders/boot/grub/live-theme/icons/opensuse.png diff --git a/bootloaders/grub-pc/live-theme/icons/parrot.png b/bootloaders/boot/grub/live-theme/icons/parrot.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/parrot.png rename to bootloaders/boot/grub/live-theme/icons/parrot.png diff --git a/bootloaders/grub-pc/live-theme/icons/pop-os.png b/bootloaders/boot/grub/live-theme/icons/pop-os.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/pop-os.png rename to bootloaders/boot/grub/live-theme/icons/pop-os.png diff --git a/bootloaders/grub-pc/live-theme/icons/pop.png b/bootloaders/boot/grub/live-theme/icons/pop.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/pop.png rename to bootloaders/boot/grub/live-theme/icons/pop.png diff --git a/bootloaders/grub-pc/live-theme/icons/recovery.png b/bootloaders/boot/grub/live-theme/icons/recovery.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/recovery.png rename to bootloaders/boot/grub/live-theme/icons/recovery.png diff --git a/bootloaders/grub-pc/live-theme/icons/regolith.png b/bootloaders/boot/grub/live-theme/icons/regolith.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/regolith.png rename to bootloaders/boot/grub/live-theme/icons/regolith.png diff --git a/bootloaders/grub-pc/live-theme/icons/restart.png b/bootloaders/boot/grub/live-theme/icons/restart.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/restart.png rename to bootloaders/boot/grub/live-theme/icons/restart.png diff --git a/bootloaders/grub-pc/live-theme/icons/rocky.png b/bootloaders/boot/grub/live-theme/icons/rocky.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/rocky.png rename to bootloaders/boot/grub/live-theme/icons/rocky.png diff --git a/bootloaders/grub-pc/live-theme/icons/shutdown.png b/bootloaders/boot/grub/live-theme/icons/shutdown.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/shutdown.png rename to bootloaders/boot/grub/live-theme/icons/shutdown.png diff --git a/bootloaders/grub-pc/live-theme/icons/siduction.png b/bootloaders/boot/grub/live-theme/icons/siduction.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/siduction.png rename to bootloaders/boot/grub/live-theme/icons/siduction.png diff --git a/bootloaders/grub-pc/live-theme/icons/slackware.png b/bootloaders/boot/grub/live-theme/icons/slackware.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/slackware.png rename to bootloaders/boot/grub/live-theme/icons/slackware.png diff --git a/bootloaders/grub-pc/live-theme/icons/solus.png b/bootloaders/boot/grub/live-theme/icons/solus.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/solus.png rename to bootloaders/boot/grub/live-theme/icons/solus.png diff --git a/bootloaders/grub-pc/live-theme/icons/steamos.png b/bootloaders/boot/grub/live-theme/icons/steamos.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/steamos.png rename to bootloaders/boot/grub/live-theme/icons/steamos.png diff --git a/bootloaders/grub-pc/live-theme/icons/type.png b/bootloaders/boot/grub/live-theme/icons/type.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/type.png rename to bootloaders/boot/grub/live-theme/icons/type.png diff --git a/bootloaders/grub-pc/live-theme/icons/tz.png b/bootloaders/boot/grub/live-theme/icons/tz.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/tz.png rename to bootloaders/boot/grub/live-theme/icons/tz.png diff --git a/bootloaders/grub-pc/live-theme/icons/ubuntu.png b/bootloaders/boot/grub/live-theme/icons/ubuntu.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/ubuntu.png rename to bootloaders/boot/grub/live-theme/icons/ubuntu.png diff --git a/bootloaders/grub-pc/live-theme/icons/unknown.png b/bootloaders/boot/grub/live-theme/icons/unknown.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/unknown.png rename to bootloaders/boot/grub/live-theme/icons/unknown.png diff --git a/bootloaders/grub-pc/live-theme/icons/unset.png b/bootloaders/boot/grub/live-theme/icons/unset.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/unset.png rename to bootloaders/boot/grub/live-theme/icons/unset.png diff --git a/bootloaders/grub-pc/live-theme/icons/ventoy.png b/bootloaders/boot/grub/live-theme/icons/ventoy.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/ventoy.png rename to bootloaders/boot/grub/live-theme/icons/ventoy.png diff --git a/bootloaders/grub-pc/live-theme/icons/void.png b/bootloaders/boot/grub/live-theme/icons/void.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/void.png rename to bootloaders/boot/grub/live-theme/icons/void.png diff --git a/bootloaders/grub-pc/live-theme/icons/windows.png b/bootloaders/boot/grub/live-theme/icons/windows.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/windows.png rename to bootloaders/boot/grub/live-theme/icons/windows.png diff --git a/bootloaders/grub-pc/live-theme/icons/windows11.png b/bootloaders/boot/grub/live-theme/icons/windows11.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/windows11.png rename to bootloaders/boot/grub/live-theme/icons/windows11.png diff --git a/bootloaders/grub-pc/live-theme/icons/xero.png b/bootloaders/boot/grub/live-theme/icons/xero.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/xero.png rename to bootloaders/boot/grub/live-theme/icons/xero.png diff --git a/bootloaders/grub-pc/live-theme/icons/xerolinux.png b/bootloaders/boot/grub/live-theme/icons/xerolinux.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/xerolinux.png rename to bootloaders/boot/grub/live-theme/icons/xerolinux.png diff --git a/bootloaders/grub-pc/live-theme/icons/xubuntu.png b/bootloaders/boot/grub/live-theme/icons/xubuntu.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/xubuntu.png rename to bootloaders/boot/grub/live-theme/icons/xubuntu.png diff --git a/bootloaders/grub-pc/live-theme/icons/zorin.png b/bootloaders/boot/grub/live-theme/icons/zorin.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/zorin.png rename to bootloaders/boot/grub/live-theme/icons/zorin.png diff --git a/bootloaders/grub-pc/live-theme/select_c.png b/bootloaders/boot/grub/live-theme/select_c.png similarity index 100% rename from bootloaders/grub-pc/live-theme/select_c.png rename to bootloaders/boot/grub/live-theme/select_c.png diff --git a/bootloaders/grub-pc/live-theme/select_e.png b/bootloaders/boot/grub/live-theme/select_e.png similarity index 100% rename from bootloaders/grub-pc/live-theme/select_e.png rename to bootloaders/boot/grub/live-theme/select_e.png diff --git a/bootloaders/grub-pc/live-theme/select_w.png b/bootloaders/boot/grub/live-theme/select_w.png similarity index 100% rename from bootloaders/grub-pc/live-theme/select_w.png rename to bootloaders/boot/grub/live-theme/select_w.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_c.png b/bootloaders/boot/grub/live-theme/terminal_box_c.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_c.png rename to bootloaders/boot/grub/live-theme/terminal_box_c.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_e.png b/bootloaders/boot/grub/live-theme/terminal_box_e.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_e.png rename to bootloaders/boot/grub/live-theme/terminal_box_e.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_n.png b/bootloaders/boot/grub/live-theme/terminal_box_n.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_n.png rename to bootloaders/boot/grub/live-theme/terminal_box_n.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_ne.png b/bootloaders/boot/grub/live-theme/terminal_box_ne.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_ne.png rename to bootloaders/boot/grub/live-theme/terminal_box_ne.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_nw.png b/bootloaders/boot/grub/live-theme/terminal_box_nw.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_nw.png rename to bootloaders/boot/grub/live-theme/terminal_box_nw.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_s.png b/bootloaders/boot/grub/live-theme/terminal_box_s.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_s.png rename to bootloaders/boot/grub/live-theme/terminal_box_s.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_se.png b/bootloaders/boot/grub/live-theme/terminal_box_se.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_se.png rename to bootloaders/boot/grub/live-theme/terminal_box_se.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_sw.png b/bootloaders/boot/grub/live-theme/terminal_box_sw.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_sw.png rename to bootloaders/boot/grub/live-theme/terminal_box_sw.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_w.png b/bootloaders/boot/grub/live-theme/terminal_box_w.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_w.png rename to bootloaders/boot/grub/live-theme/terminal_box_w.png diff --git a/bootloaders/grub-pc/live-theme/terminus-12.pf2 b/bootloaders/boot/grub/live-theme/terminus-12.pf2 similarity index 100% rename from bootloaders/grub-pc/live-theme/terminus-12.pf2 rename to bootloaders/boot/grub/live-theme/terminus-12.pf2 diff --git a/bootloaders/grub-pc/live-theme/terminus-14.pf2 b/bootloaders/boot/grub/live-theme/terminus-14.pf2 similarity index 100% rename from bootloaders/grub-pc/live-theme/terminus-14.pf2 rename to bootloaders/boot/grub/live-theme/terminus-14.pf2 diff --git a/bootloaders/grub-pc/live-theme/terminus-16.pf2 b/bootloaders/boot/grub/live-theme/terminus-16.pf2 similarity index 100% rename from bootloaders/grub-pc/live-theme/terminus-16.pf2 rename to bootloaders/boot/grub/live-theme/terminus-16.pf2 diff --git a/bootloaders/grub-pc/live-theme/terminus-18.pf2 b/bootloaders/boot/grub/live-theme/terminus-18.pf2 similarity index 100% rename from bootloaders/grub-pc/live-theme/terminus-18.pf2 rename to bootloaders/boot/grub/live-theme/terminus-18.pf2 diff --git a/bootloaders/grub-pc/live-theme/theme.txt b/bootloaders/boot/grub/live-theme/theme.txt similarity index 100% rename from bootloaders/grub-pc/live-theme/theme.txt rename to bootloaders/boot/grub/live-theme/theme.txt diff --git a/bootloaders/grub-pc/live-theme/ubuntu_regular_17.pf2 b/bootloaders/boot/grub/live-theme/ubuntu_regular_17.pf2 similarity index 100% rename from bootloaders/grub-pc/live-theme/ubuntu_regular_17.pf2 rename to bootloaders/boot/grub/live-theme/ubuntu_regular_17.pf2 diff --git a/bootloaders/grub-pc/live-theme/ubuntu_regular_20.pf2 b/bootloaders/boot/grub/live-theme/ubuntu_regular_20.pf2 similarity index 100% rename from bootloaders/grub-pc/live-theme/ubuntu_regular_20.pf2 rename to bootloaders/boot/grub/live-theme/ubuntu_regular_20.pf2 diff --git a/bootloaders/grub-pc/loopback.cfg b/bootloaders/boot/grub/loopback.cfg similarity index 100% rename from bootloaders/grub-pc/loopback.cfg rename to bootloaders/boot/grub/loopback.cfg diff --git a/bootloaders/grub-pc/splash.png b/bootloaders/boot/grub/splash.png similarity index 100% rename from bootloaders/grub-pc/splash.png rename to bootloaders/boot/grub/splash.png diff --git a/bootloaders/grub-pc/theme.cfg b/bootloaders/boot/grub/theme.cfg similarity index 100% rename from bootloaders/grub-pc/theme.cfg rename to bootloaders/boot/grub/theme.cfg diff --git a/bootloaders/isolinux/menu.cfg b/bootloaders/isolinux/menu.cfg index 72845759..7126c2cc 100644 --- a/bootloaders/isolinux/menu.cfg +++ b/bootloaders/isolinux/menu.cfg @@ -4,7 +4,7 @@ DEFAULT My-distro Live LABEL My-distro Live SAY "Booting My-distro Live..." linux /live/vmlinuz - APPEND initrd=/live/initrd.img boot=live components splash quiet locales=pt_PT.UTF-8 keyboard-layouts=pt username=user hostname=My-distro timezone=atlantic/azores + APPEND initrd=/live/initrd.img boot=live components splash quiet username=user hostname=My-distro LABEL My-distro live failsafe menu label My-distro Live failsafe diff --git a/build-32-non-pae.sh b/build-32-non-pae.sh deleted file mode 100755 index 1da38242..00000000 --- a/build-32-non-pae.sh +++ /dev/null @@ -1,278 +0,0 @@ -#!/bin/bash -PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" - -# Set the working folder variable -build32="$(pwd)" - - -# Create the build32 folder, move into it removing stale mountpoints and files there. -[ -e build32 ] && [ ! -d build32 ] && rm -f build32 || [ ! -e build32 ] && mkdir build32 -cd build32 -umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null -for i in ./* ./.build ./cache/bootstrap ; do [ $i = ./cache ] && continue || rm -rf $i ; done - - -# Set of the structure to be used for the ISO and Live system. -# See /usr/lib/live/build32/config for a full list of examples. -# Up above is the manual description of what options I used so far. - -lb config noauto \ - --binary-images iso-hybrid \ - --mode debian \ - --architectures i386 \ - --linux-flavours 686 \ - --distribution chimaera \ - --archive-areas "main contrib non-free" \ - --initsystem sysvinit \ - --mirror-bootstrap http://deb.devuan.org/merged \ - --mirror-chroot http://deb.devuan.org/merged \ - --mirror-chroot-security http://deb.devuan.org/merged \ - --parent-mirror-bootstrap http://deb.devuan.org/merged \ - --parent-mirror-binary http://deb.devuan.org/merged \ - --parent-mirror-binary-security http://deb.devuan.org/merged \ - --parent-mirror-chroot http://deb.devuan.org/merged \ - --parent-mirror-chroot-security http://deb.devuan.org/merged \ - --uefi-secure-boot enable \ - --updates true \ - --security true \ - --backports false \ - --cache true \ - --apt-recommends true \ - --firmware-binary true \ - --firmware-chroot true \ - --iso-application "My-distro" \ - --win32-loader false \ - --iso-volume "My-distro-i386_${TODAY}" \ - --iso-publisher "Manuel rosa" \ - --image-name "My-distro" \ - --win32-loader false \ - --checksums sha512 \ - --zsync false \ - "${@}" - - -# Install the Xfce Desktop -mkdir -p $build32/build32/config/package-lists -echo xfce4 xfce4-goodies > $build32/build32/config/package-lists/desktop.list.chroot - -# Install software -echo "# Install software to the squashfs for calamares to unpack to the OS. -linux-headers-686 -locales -dkms -dbus-x11 -ntp -deb-multimedia-keyring -xorg -xserver-xorg -xserver-xorg-input-synaptics -xserver-xorg-input-all -xserver-xorg-video-vmware -xserver-xorg-video-all -w32codecs -ffmpeg -sox -twolame -lame -faad -gstreamer1.0-plugins-good -gstreamer1.0-plugins-ugly -gstreamer1.0-plugins-bad -gstreamer1.0-pulseaudio -unrar -rar -p7zip-full -p7zip-rar -zip -unzip -pulseaudio -pavucontrol -alsa-utils -aptitude -synaptic -gparted -apt-config-auto-update -libelf-dev -htop -package-update-indicator -gnome-packagekit -gvfs-backends -samba -gnome-packagekit -network-manager -network-manager-gnome -bluez -blueman -gufw -gtk2-engines -plymouth -plymouth-themes -cups -system-config-printer -lightdm -lightdm-gtk-greeter -lightdm-gtk-greeter-settings -menulibre -mugshot -xscreensaver -xscreensaver-data -xscreensaver-data-extra -xscreensaver-gl -xscreensaver-gl-extra -gnome-system-tools -gnome-disk-utility -gnome-calculator -neofetch -accountsservice -catfish -fuseiso -timeshift -gnome-software -gnome-software-plugin-flatpak -fwupd -bleachbit -dconf-editor -gimp -gimp-data-extras -evince -xsane -transmission-gtk -thunderbird -thunderbird-l10n-pt-br -thunderbird-l10n-pt-pt -thunderbird-l10n-de -thunderbird-l10n-en-gb -thunderbird-l10n-es-es -thunderbird-l10n-fr -thunderbird-l10n-it -firefox-esr -firefox-esr-l10n-de -firefox-esr-l10n-en-gb -firefox-esr-l10n-es-es -firefox-esr-l10n-it -firefox-esr-l10n-pt-br -firefox-esr-l10n-pt-pt -libreoffice -libreoffice-gtk3 -libreoffice-l10n-pt -libreoffice-l10n-pt-br -libreoffice-l10n-de -libreoffice-l10n-en-gb -libreoffice-l10n-es -libreoffice-l10n-fr -libreoffice-l10n-it -printer-driver-cups-pdf -gnome-2048 -gnome-chess -gnome-mahjongg -gnome-sudoku -guvcview -vlc -qt5-style-plugins -qt5ct -calamares-settings-debian -firmware-linux -firmware-linux-free -firmware-linux-nonfree -firmware-misc-nonfree -firmware-realtek -firmware-atheros -firmware-bnx2 -firmware-bnx2x -firmware-brcm80211 -firmware-intelwimax -firmware-iwlwifi -firmware-libertas -firmware-netxen -firmware-zd1211 -gdebi -f2fs-tools -xfsprogs -xfsdump -tumbler -tumbler-plugins-extra -ffmpegthumbnailer -xterm -grub-pc - -" > $build32/build32/config/package-lists/packages.list.chroot - - -# Packages to be stored in /pool but not installed in the OS . -echo "# These packages are available to the installer, for offline use. -efibootmgr -grub2-common -grub-efi-ia32 -grub-efi-ia32-bin -grub-efi-ia32-signed -libefiboot1 -libefivar1 -mokutil -os-prober -shim-helpers-i386-signed -shim-signed -shim-signed-common -shim-unsigned - -" > $build32/build32/config/package-lists/installer.list.binary - - -# Setup the chroot structure -mkdir -p $build32/build32/config/archives -mkdir -p $build32/build32/config/includes.binary -mkdir -p $build32/build32/config/hooks/live -mkdir -p $build32/build32/config/hooks/normal -mkdir -p $build32/build32/config/bootloaders -mkdir -p $build32/build32/config/packages.chroot -mkdir -p $build32/build32/config/includes.chroot/etc -mkdir -p $build32/build32/config/includes.chroot/usr/share/applications -mkdir -p $build32/build32/config/includes.chroot/usr/share/backgrounds -mkdir -p $build32/build32/config/includes.chroot/etc/calamares -mkdir -p $build32/build32/config/includes.chroot/usr/share/icons -mkdir -p $build32/build32/config/includes.chroot/usr/share/themes -mkdir -p $build32/build32/config/includes.chroot/etc/live/config.conf.d -mkdir -p $build32/build32/config/includes.chroot/etc/dpkg/origins -mkdir -p $build32/build32/config/includes.chroot/usr/sbin -mkdir -p $build32/build32/config/includes.chroot/etc/lightdm -mkdir -p $build32/build32/config/includes.chroot/usr/share/pixmaps -mkdir -p $build32/build32/config/includes.chroot/usr/share/plymouth -mkdir -p $build32/build32/config/includes.chroot/usr/share/desktop-base -mkdir -p $build32/build32/config/includes.chroot/etc/skel/Desktop -mkdir -p $build32/build32/config/includes.chroot/etc/default -mkdir -p $build32/build/config/includes.chroot/boot/grub/themes - -# Copy Configs to the chroot -cp $build32/userconfig/* $build32/build32/config/includes.chroot/etc/live/config.conf.d -cp $build32/applications/* $build32/build32/config/includes.chroot/usr/share/applications -cp $build32/hooks/live/* $build32/build32/config/hooks/live -cp $build32/hooks/normal/* $build32/build32/config/hooks/normal -cp $build32/install-debian/* $build32/build32/config/includes.chroot/usr/share/pixmaps -cp $build32/sources-final/* $build32/build32/config/includes.chroot/usr/sbin -cp $build32/bootloader-config-32bit/* $build32/build32/config/includes.chroot/usr/sbin -cp $build32/grub/grub $build32/build32/config/includes.chroot/etc/default - -cp -r $build32/lightdm/* $build32/build32/config/includes.chroot/etc/lightdm -cp -r $build32/bootloaders/* $build32/build32/config/bootloaders -cp -r $build32/repos/* $build32/build32/config/archives -cp -r $build32/backgrounds/* $build32/build32/config/includes.chroot/usr/share/backgrounds -cp -r $build32/calamares/* $build32/build32/config/includes.chroot/etc/calamares -cp -r $build32/configs/* $build32/build32/config/includes.chroot/etc/ -cp -r $build32/icons/* $build32/build32/config/includes.chroot/usr/share/icons -cp -r $build32/themes/* $build32/build32/config/includes.chroot/usr/share/themes -cp -r $build32/desktop-base/* $build32/build32/config/includes.chroot/usr/share/desktop-base -cp -r $build32/plymouth/* $build32/build32/config/includes.chroot/usr/share/plymouth -cp -r $build32/packages32/* $build32/build32/config/packages.chroot -cp -r $build32/grub/themes/* $build32/build32/config/includes.chroot/boot/grub/themes - -# Resolves Synaptics issue. Might be better in a conf hook. -mkdir -p $build32/build32/config/includes.chroot/usr/share/distro-info -mkdir -p $build32/build32/config/includes.chroot/usr/share/python-apt/templates -cp -r $build32/devuan/* $build32/build32/config/includes.chroot/usr/share/python-apt/templates -ln -s Devuan.info $build32/build32/config/includes.chroot/usr/share/python-apt/templates/My-distro.info -ln -s Devuan.mirrors $build32/build32/config/includes.chroot/usr/share/python-apt/templates/My-distro.mirrors -ln -s devuan.csv $build32/build32/config/includes.chroot/usr/share/distro-info/my-distro.csv - -# build the ISO # -lb build #--debug --verbose - - diff --git a/build-32.sh b/build-32.sh deleted file mode 100755 index 8bf92631..00000000 --- a/build-32.sh +++ /dev/null @@ -1,279 +0,0 @@ -#!/bin/bash -PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" - -# Set the working folder variable -build32pae="$(pwd)" - - -# Create the build32pae folder, move into it removing stale mountpoints and files there. -[ -e build32pae ] && [ ! -d build32pae ] && rm -f build32pae || [ ! -e build32pae ] && mkdir build32pae -cd build32pae -umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null -for i in ./* ./..build ./cache/bootstrap ; do [ $i = ./cache ] && continue || rm -rf $i ; done - - -# Set of the structure to be used for the ISO and Live system. -# See /usr/lib/live/build32pae/config for a full list of examples. -# Up above is the manual description of what options I used so far. - -lb config noauto \ - --binary-images iso-hybrid \ - --mode debian \ - --architectures i386 \ - --linux-flavours 686-pae \ - --distribution chimaera \ - --archive-areas "main contrib non-free" \ - --initsystem sysvinit \ - --mirror-bootstrap http://deb.devuan.org/merged \ - --mirror-chroot http://deb.devuan.org/merged \ - --mirror-chroot-security http://deb.devuan.org/merged \ - --parent-mirror-bootstrap http://deb.devuan.org/merged \ - --parent-mirror-binary http://deb.devuan.org/merged \ - --parent-mirror-binary-security http://deb.devuan.org/merged \ - --parent-mirror-chroot http://deb.devuan.org/merged \ - --parent-mirror-chroot-security http://deb.devuan.org/merged \ - --uefi-secure-boot enable \ - --updates true \ - --security true \ - --backports false \ - --cache true \ - --apt-recommends true \ - --firmware-binary true \ - --firmware-chroot true \ - --iso-application "My-distro" \ - --win32-loader false \ - --iso-volume "My-distro-i386_${TODAY}" \ - --iso-publisher "Manuel rosa" \ - --image-name "My-distro" \ - --win32-loader false \ - --checksums sha512 \ - --zsync false \ - "${@}" - - -# Install the Xfce Desktop -mkdir -p $build32pae/build32pae/config/package-lists -echo xfce4 xfce4-goodies > $build32pae/build32pae/config/package-lists/desktop.list.chroot - -# Install software -echo "# Install software to the squashfs for calamares to unpack to the OS. -linux-headers-686-pae -locales -dkms -dbus-x11 -ntp -deb-multimedia-keyring -xorg -xserver-xorg -xserver-xorg-input-synaptics -xserver-xorg-input-all -xserver-xorg-video-vmware -xserver-xorg-video-all -w32codecs -ffmpeg -sox -twolame -lame -faad -gstreamer1.0-plugins-good -gstreamer1.0-plugins-ugly -gstreamer1.0-plugins-bad -gstreamer1.0-pulseaudio -unrar -rar -p7zip-full -p7zip-rar -zip -unzip -pulseaudio -pavucontrol -alsa-utils -aptitude -synaptic -gparted -apt-config-auto-update -libelf-dev -htop -package-update-indicator -gnome-packagekit -gvfs-backends -samba -gnome-packagekit -network-manager -network-manager-gnome -bluez -blueman -gufw -gtk2-engines -plymouth -plymouth-themes -cups -system-config-printer -lightdm -lightdm-gtk-greeter -lightdm-gtk-greeter-settings -menulibre -mugshot -xscreensaver -xscreensaver-data -xscreensaver-data-extra -xscreensaver-gl -xscreensaver-gl-extra -gnome-system-tools -gnome-disk-utility -gnome-calculator -neofetch -accountsservice -catfish -fuseiso -timeshift -gnome-software -gnome-software-plugin-flatpak -fwupd -bleachbit -dconf-editor -gimp -gimp-data-extras -evince -xsane -transmission-gtk -thunderbird -thunderbird-l10n-pt-br -thunderbird-l10n-pt-pt -thunderbird-l10n-de -thunderbird-l10n-en-gb -thunderbird-l10n-es-es -thunderbird-l10n-fr -thunderbird-l10n-it -firefox-esr -firefox-esr-l10n-de -firefox-esr-l10n-en-gb -firefox-esr-l10n-es-es -firefox-esr-l10n-it -firefox-esr-l10n-pt-br -firefox-esr-l10n-pt-pt -libreoffice -libreoffice-gtk3 -libreoffice-l10n-pt -libreoffice-l10n-pt-br -libreoffice-l10n-de -libreoffice-l10n-en-gb -libreoffice-l10n-es -libreoffice-l10n-fr -libreoffice-l10n-it -printer-driver-cups-pdf -gnome-2048 -gnome-chess -gnome-mahjongg -gnome-sudoku -guvcview -vlc -qt5-style-plugins -qt5ct -calamares-settings-debian -firmware-linux -firmware-linux-free -firmware-linux-nonfree -firmware-misc-nonfree -firmware-realtek -firmware-atheros -firmware-bnx2 -firmware-bnx2x -firmware-brcm80211 -firmware-intelwimax -firmware-iwlwifi -firmware-libertas -firmware-netxen -firmware-zd1211 -gdebi -f2fs-tools -xfsprogs -xfsdump -tumbler -tumbler-plugins-extra -ffmpegthumbnailer -xterm -grub-pc - -" > $build32pae/build32pae/config/package-lists/packages.list.chroot - - -# Packages to be stored in /pool but not installed in the OS . -echo "# These packages are available to the installer, for offline use. -efibootmgr -grub2-common -grub-efi-ia32 -grub-efi-ia32-bin -grub-efi-ia32-signed -libefiboot1 -libefivar1 -mokutil -os-prober -shim-helpers-i386-signed -shim-signed -shim-signed-common -shim-unsigned -" > $build32pae/build32pae/config/package-lists/installer.list.binary - - -# Setup the chroot structure -mkdir -p $build32pae/build32pae/config/archives -mkdir -p $build32pae/build32pae/config/includes.binary -mkdir -p $build32pae/build32pae/config/hooks/live -mkdir -p $build32pae/build32pae/config/hooks/normal -mkdir -p $build32pae/build32pae/config/bootloaders -mkdir -p $build32pae/build32pae/config/packages.chroot -mkdir -p $build32pae/build32pae/config/includes.chroot/etc -mkdir -p $build32pae/build32pae/config/includes.chroot/usr/share/applications -mkdir -p $build32pae/build32pae/config/includes.chroot/usr/share/backgrounds -mkdir -p $build32pae/build32pae/config/includes.chroot/etc/calamares -mkdir -p $build32pae/build32pae/config/includes.chroot/usr/share/icons -mkdir -p $build32pae/build32pae/config/includes.chroot/usr/share/themes -mkdir -p $build32pae/build32pae/config/includes.chroot/etc/live/config.conf.d -mkdir -p $build32pae/build32pae/config/includes.chroot/etc/dpkg/origins -mkdir -p $build32pae/build32pae/config/includes.chroot/usr/sbin -mkdir -p $build32pae/build32pae/config/includes.chroot/etc/lightdm -mkdir -p $build32pae/build32pae/config/includes.chroot/usr/share/pixmaps -mkdir -p $build32pae/build32pae/config/includes.chroot/usr/share/plymouth -mkdir -p $build32pae/build32pae/config/includes.chroot/usr/share/desktop-base -mkdir -p $build32pae/build32pae/config/includes.chroot/etc/skel/Desktop -mkdir -p $build32pae/build32pae/config/includes.chroot/etc/default -mkdir -p $build32pae/build/config/includes.chroot/boot/grub/themes - -# Copy Configs to the chroot -cp $build32pae/userconfig/* $build32pae/build32pae/config/includes.chroot/etc/live/config.conf.d -cp $build32pae/applications/* $build32pae/build32pae/config/includes.chroot/usr/share/applications -cp $build32pae/hooks/live/* $build32pae/build32pae/config/hooks/live -cp $build32pae/hooks/normal/* $build32pae/build32pae/config/hooks/normal -cp $build32pae/install-debian/* $build32pae/build32pae/config/includes.chroot/usr/share/pixmaps -cp $build32pae/sources-final/* $build32pae/build32pae/config/includes.chroot/usr/sbin -cp $build32pae/bootloader-config-32bit/* $build32pae/build32pae/config/includes.chroot/usr/sbin -cp $build32pae/grub/grub $build32pae/build32pae/config/includes.chroot/etc/default - -cp -r $build32pae/lightdm/* $build32pae/build32pae/config/includes.chroot/etc/lightdm -cp -r $build32pae/bootloaders/* $build32pae/build32pae/config/bootloaders -cp -r $build32pae/repos/* $build32pae/build32pae/config/archives -cp -r $build32pae/backgrounds/* $build32pae/build32pae/config/includes.chroot/usr/share/backgrounds -cp -r $build32pae/calamares/* $build32pae/build32pae/config/includes.chroot/etc/calamares -cp -r $build32pae/configs/* $build32pae/build32pae/config/includes.chroot/etc/ -cp -r $build32pae/icons/* $build32pae/build32pae/config/includes.chroot/usr/share/icons -cp -r $build32pae/themes/* $build32pae/build32pae/config/includes.chroot/usr/share/themes -cp -r $build32pae/desktop-base/* $build32pae/build32pae/config/includes.chroot/usr/share/desktop-base -cp -r $build32pae/plymouth/* $build32pae/build32pae/config/includes.chroot/usr/share/plymouth -cp -r $build32pae/packages32/* $build32pae/build32pae/config/packages.chroot -cp -r $build32pae/grub/themes/* $build32pae/build32pae/config/includes.chroot/boot/grub/themes - -# Resolves Synaptics issue. Might be better in a conf hook. -mkdir -p $build32pae/build32pae/config/includes.chroot/usr/share/distro-info -mkdir -p $build32pae/build32pae/config/includes.chroot/usr/share/python-apt/templates -cp -r $build32pae/devuan/* $build32pae/build32pae/config/includes.chroot/usr/share/python-apt/templates -ln -s Devuan.info $build32pae/build32pae/config/includes.chroot/usr/share/python-apt/templates/My-distro.info -ln -s Devuan.mirrors $build32pae/build32pae/config/includes.chroot/usr/share/python-apt/templates/My-distro.mirrors -ln -s devuan.csv $build32pae/build32pae/config/includes.chroot/usr/share/distro-info/my-distro.csv - - - -# .build the ISO # -lb .build #--debug --verbose - - diff --git a/build-all.sh b/build-all.sh new file mode 100755 index 00000000..2b681675 --- /dev/null +++ b/build-all.sh @@ -0,0 +1,19 @@ +#!/bin/bash + +################################################################################ +# Title: build-all.sh +# Description: Script to build My-distro Devuan ISO images +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ + +# update files + +git pull --ff + +# this script will build the 7 isos sequencialy + +./my-distro-devuan-32/BldHelper.sh +./my-distro-devuan-32-pae/BldHelper.sh +./my-distro-devuan-64/BldHelper.sh diff --git a/buildtools/debootstrap_1.0.127+acoros2_all.deb b/buildtools/debootstrap_1.0.127+acoros2_all.deb deleted file mode 100644 index 38270344..00000000 Binary files a/buildtools/debootstrap_1.0.127+acoros2_all.deb and /dev/null differ diff --git a/buildtools/debootstrap_1.0.152acoros1_all.deb b/buildtools/debootstrap_1.0.152acoros1_all.deb new file mode 100644 index 00000000..deec99b0 Binary files /dev/null and b/buildtools/debootstrap_1.0.152acoros1_all.deb differ diff --git a/buildtools/devuan-keyring_2022.10.03_all.deb b/buildtools/devuan-keyring_2022.10.03_all.deb deleted file mode 100644 index 7914e8e5..00000000 Binary files a/buildtools/devuan-keyring_2022.10.03_all.deb and /dev/null differ diff --git a/buildtools/devuan-keyring_2023.10.07_all.deb b/buildtools/devuan-keyring_2023.10.07_all.deb new file mode 100644 index 00000000..3d345895 Binary files /dev/null and b/buildtools/devuan-keyring_2023.10.07_all.deb differ diff --git a/buildtools/live-build_20210407acoros1_all.deb b/buildtools/live-build_20210407acoros1_all.deb deleted file mode 100644 index 98105f10..00000000 Binary files a/buildtools/live-build_20210407acoros1_all.deb and /dev/null differ diff --git a/buildtools/live-build_20230502acoros1_all.deb b/buildtools/live-build_20230502acoros1_all.deb new file mode 100644 index 00000000..af83f211 Binary files /dev/null and b/buildtools/live-build_20230502acoros1_all.deb differ diff --git a/calamares/modules/bootloader.conf b/calamares/modules/bootloader.conf index b6d8448f..04367518 100644 --- a/calamares/modules/bootloader.conf +++ b/calamares/modules/bootloader.conf @@ -43,7 +43,7 @@ efiBootMgr: "efibootmgr" # setting the option here, keep in mind that the name is sanitized # (problematic characters, see above, are replaced). # -# efiBootloaderId: "dirname" +efiBootloaderId: "debian" # Optionally install a copy of the GRUB EFI bootloader as the EFI # fallback loader (either bootia32.efi or bootx64.efi depending on @@ -51,4 +51,4 @@ efiBootMgr: "efibootmgr" # seems to be the only one). If you set this to false, take care # to add another module to optionally install the fallback on those # boards that need it. -installEFIFallback: false +installEFIFallback: true diff --git a/calamares/modules/finished.conf b/calamares/modules/finished.conf index 4b0f909d..188edf09 100644 --- a/calamares/modules/finished.conf +++ b/calamares/modules/finished.conf @@ -1,4 +1,4 @@ --- restartNowEnabled: true restartNowChecked: true -restartNowCommand: "reboot" +restartNowCommand: "systemctl -i reboot" diff --git a/calamares/modules/fstab.conf b/calamares/modules/fstab.conf index 29907170..8da60df0 100644 --- a/calamares/modules/fstab.conf +++ b/calamares/modules/fstab.conf @@ -1,11 +1,27 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +# Configure fstab options +# --- mountOptions: - default: defaults,noatime - btrfs: defaults,noatime,space_cache,autodefrag -ssdExtraMountOptions: - ext4: discard - jfs: discard - xfs: discard - swap: discard - btrfs: discard,compress=lzo + default: defaults,noatime,nodiscard + btrfs: defaults,noatime,noautodefrag,nodiscard + btrfs_swap: defaults + swap: defaults + crypttabOptions: luks,keyscript=/bin/cat + +efiMountOptions: umask=0077 + +ssdExtraMountOptions: + btrfs: ssd + +tmpOptions: + default: + tmpfs: false + options: "" + ssd: + tmpfs: true + options: "defaults,noatime,mode=1777" + diff --git a/calamares/modules/machineid.conf b/calamares/modules/machineid.conf index 453b9765..fa3527fc 100644 --- a/calamares/modules/machineid.conf +++ b/calamares/modules/machineid.conf @@ -1,6 +1,6 @@ --- # Whether to create /etc/machine-id for systemd. -systemd: false +systemd: true # Whether to create /var/lib/dbus/machine-id for D-Bus. dbus: true # Whether /var/lib/dbus/machine-id should be a symlink to /etc/machine-id diff --git a/calamares/modules/mount.conf b/calamares/modules/mount.conf index bb28eed6..b22676f1 100644 --- a/calamares/modules/mount.conf +++ b/calamares/modules/mount.conf @@ -1,18 +1,10 @@ -# Mount filesystems in the target (generally, before treating the -# target as a usable chroot / "live" system). Filesystems are -# automatically mounted from the partitioning module. Filesystems -# listed here are **extra**. The filesystems listed in *extraMounts* -# are mounted in all target systems. The filesystems listed in -# *extraMountsEfi* are mounted in the target system **only** if -# the host machine uses UEFI. ---- -# Extra filesystems to mount. The key's value is a list of entries; each -# entry has four keys: -# - device The device node to mount -# - fs The filesystem type to use -# - mountPoint Where to mount the filesystem -# - options (optional) Extra options to pass to mount(8) +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 # +# Mount filesystems in the target (generally, before treating the +# target as a usable chroot / "live" system). +--- + extraMounts: - device: proc fs: proc @@ -29,8 +21,18 @@ extraMounts: - device: /run/udev mountPoint: /run/udev options: bind - -extraMountsEfi: - device: efivarfs fs: efivarfs mountPoint: /sys/firmware/efi/efivars + +btrfsSwapSubvol: /@swap + +btrfsSubvolumes: + - mountPoint: / + subvolume: /@ + - mountPoint: /home + subvolume: /@home + - mountPoint: /var/cache + subvolume: /@cache + - mountPoint: /var/log + subvolume: /@log diff --git a/calamares/modules/openrcdmcryptcfg.conf b/calamares/modules/openrcdmcryptcfg.conf new file mode 100644 index 00000000..0dbd0782 --- /dev/null +++ b/calamares/modules/openrcdmcryptcfg.conf @@ -0,0 +1,7 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +# Configuration file for opendmcryptcfg module +# +--- +configFilePath: /etc/conf.d/dmcrypt diff --git a/calamares/modules/packages.conf b/calamares/modules/packages.conf index 3098973f..d41c24d9 100644 --- a/calamares/modules/packages.conf +++ b/calamares/modules/packages.conf @@ -7,6 +7,7 @@ operations: - 'live-config' - 'live-config-doc' - 'live-config-systemd' + - 'live-config-systemd' - 'live-tools' - 'live-task-localisation' - 'live-task-recommended' diff --git a/calamares/modules/partition.conf b/calamares/modules/partition.conf index a0423714..68d182d8 100644 --- a/calamares/modules/partition.conf +++ b/calamares/modules/partition.conf @@ -1,10 +1,15 @@ efiSystemPartition: "/boot/efi" +efiSystemPartitionSize: 800M +efiSystemPartitionName: EFI userSwapChoices: - none # Create no swap, use no swap - small # Up to 4GB - suspend # At least main memory size - file # To swap file instead of partition +swapPartitionName: SWAP +drawNestedPartitions: false alwaysShowPartitionLabels: true +allowManualPartitioning: true initialPartitioningChoice: erase initialSwapChoice: none defaultFileSystemType: "ext4" diff --git a/calamares/modules/services-systemd.conf b/calamares/modules/services-systemd.conf new file mode 100644 index 00000000..ed4608b2 --- /dev/null +++ b/calamares/modules/services-systemd.conf @@ -0,0 +1,13 @@ +# SPDX-FileCopyrightText: no +# SPDX-License-Identifier: CC0-1.0 +# +# Systemd services manipulation. +# +# This module can enable services, timers and targets for systemd +# (if packaging doesn't already do that). It can also +# disable services and targets as well as mask units. + +timers: + - name: "fstrim" + mandatory: false + diff --git a/calamares/modules/users.conf b/calamares/modules/users.conf index a0ba0821..37c0a687 100644 --- a/calamares/modules/users.conf +++ b/calamares/modules/users.conf @@ -14,5 +14,10 @@ defaultGroups: - bluetooth - sambashare autologinGroup: autologin +doAutologin: false sudoersGroup: sudo setRootPassword: true +doReusePassword: true +allowWeakPasswords: true +allowWeakPasswordsDefault: true +userShell: /bin/bash diff --git a/configs/skel/.config/Thunar/uca.xml b/configs/skel/.config/Thunar/uca.xml index 7a7405d3..8b3c9417 100644 --- a/configs/skel/.config/Thunar/uca.xml +++ b/configs/skel/.config/Thunar/uca.xml @@ -14,7 +14,7 @@ org.xfce.thunar Abrir como root 1616353956436746-1 - pkexec thunar + pkexec thunar %f Abrir como root * diff --git a/desktop-base/futureprototype-theme/grub/grub-16x9.png b/desktop-base/emerald-theme/grub/grub-16x9.png similarity index 100% rename from desktop-base/futureprototype-theme/grub/grub-16x9.png rename to desktop-base/emerald-theme/grub/grub-16x9.png diff --git a/desktop-base/futureprototype-theme/grub/grub-4x3.png b/desktop-base/emerald-theme/grub/grub-4x3.png similarity index 100% rename from desktop-base/futureprototype-theme/grub/grub-4x3.png rename to desktop-base/emerald-theme/grub/grub-4x3.png diff --git a/desktop-base/futureprototype-theme/grub/grub_background.sh b/desktop-base/emerald-theme/grub/grub_background.sh similarity index 100% rename from desktop-base/futureprototype-theme/grub/grub_background.sh rename to desktop-base/emerald-theme/grub/grub_background.sh diff --git a/desktop-base/futureprototype-theme/plymouth b/desktop-base/futureprototype-theme/plymouth deleted file mode 120000 index c814a5d4..00000000 --- a/desktop-base/futureprototype-theme/plymouth +++ /dev/null @@ -1 +0,0 @@ -../../plymouth/themes/futureprototype \ No newline at end of file diff --git a/desktop-base/homeworld-theme/grub/grub-16x9.png b/desktop-base/homeworld-theme/grub/grub-16x9.png deleted file mode 100644 index c90d81de..00000000 Binary files a/desktop-base/homeworld-theme/grub/grub-16x9.png and /dev/null differ diff --git a/desktop-base/homeworld-theme/grub/grub-4x3.png b/desktop-base/homeworld-theme/grub/grub-4x3.png deleted file mode 100644 index f342bd95..00000000 Binary files a/desktop-base/homeworld-theme/grub/grub-4x3.png and /dev/null differ diff --git a/desktop-base/homeworld-theme/grub/grub_background.sh b/desktop-base/homeworld-theme/grub/grub_background.sh deleted file mode 100644 index c7ba469d..00000000 --- a/desktop-base/homeworld-theme/grub/grub_background.sh +++ /dev/null @@ -1,3 +0,0 @@ -WALLPAPER=/usr/share/images/desktop-base/desktop-grub.png -COLOR_NORMAL=white/black -COLOR_HIGHLIGHT=black/white diff --git a/desktop-base/homeworld-theme/plymouth b/desktop-base/homeworld-theme/plymouth deleted file mode 120000 index cc824273..00000000 --- a/desktop-base/homeworld-theme/plymouth +++ /dev/null @@ -1 +0,0 @@ -../../plymouth/themes/homeworld \ No newline at end of file diff --git a/hooks/normal/0520-applications.hook.chroot b/hooks/normal/0520-applications.hook.chroot index 4e60d0f2..5f8956e4 100755 --- a/hooks/normal/0520-applications.hook.chroot +++ b/hooks/normal/0520-applications.hook.chroot @@ -1,15 +1,34 @@ #!/bin/bash -### Error checking added to "lint-trap" section. -### Missing files no longer cause builds to fail. +################################################################################ +# Title: 0520-applications.hook.chroot +# Description: Script to remove packages and other things +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ # Remove software -# apt remove -y firefox-esr -# apt remove -y termit -apt --purge --yes autoremove vim vim-tiny nautilus hv3 mpv murrine-themes konsole malcontent termit nvidia-tesla-470-alternative +apt --purge --yes autoremove \ + vim \ + vim-tiny \ + nautilus \ + hv3 \ + mpv \ + murrine-themes \ + konsole \ + malcontent \ + termit \ + nvidia-tesla-470-alternative \ + systemsettings \ + raspi-firmware + +# Remove /boot/firmware folder +rm -r /boot/firmware # Lowers the footprint in RAM at the small expense of added size to the ISO. -update-icon-caches /usr/share/icons/* +#update-icon-caches /usr/share/icons/* +find /usr/share/icons -type d -exec gtk-update-icon-cache -f {} \; #add flatpak repo to gnome-software flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo diff --git a/my-distro-devuan-32-pae/BldHelper.sh b/my-distro-devuan-32-pae/BldHelper.sh new file mode 100755 index 00000000..49f80453 --- /dev/null +++ b/my-distro-devuan-32-pae/BldHelper.sh @@ -0,0 +1,50 @@ +#!/bin/bash + +################################################################################ +# Title: Bldhelper.sh +# Description: Script to build My-distro ISO image +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ + +# Set environment variables +PREFIX=My-distro-devuan +SUFFIX=i386-pae +BUILD=dev-32-pae +FileName="${PREFIX}-${SUFFIX}" +LOCATION=$HOME/out/${BUILD} +LogDir=$HOME/logs +WorkingDir=$HOME/My-distro-configs-devuan/my-distro-devuan-32-pae + +# Execute the ISO building script +cd ${WorkingDir} +./build.sh + +# Move and rename the ISO file +cd build +mv *.iso ${FileName}-${TODAY}.iso + +# Create the checksum file for the ISO +sha512sum ${FileName}-${TODAY}.iso > ${FileName}-${TODAY}-sha512.checksum + +# Remove old ISO and checksum files from the desired location +rm -f ${LOCATION}/${FileName}*.iso +rm -f ${LOCATION}/${FileName}*-sha512.checksum + +# Move the ISO and checksum files to the desired location +mkdir -p ${LOCATION} +mv ${FileName}-${TODAY}.iso ${LOCATION} +mv ${FileName}-${TODAY}-sha512.checksum ${LOCATION} + +# Move the log file to the log directory (if it exists) +if [ -f /tmp/${PREFIX}${SUFFIX}.out ]; then + mv /tmp/${PREFIX}${SUFFIX}.out ${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log +fi + +# Clean the build folder +lb clean + +# Remove the "fusato" directory and its contents +cd .. +rm -rf build diff --git a/my-distro-devuan-32-pae/applications b/my-distro-devuan-32-pae/applications new file mode 120000 index 00000000..32c37e2d --- /dev/null +++ b/my-distro-devuan-32-pae/applications @@ -0,0 +1 @@ +../applications \ No newline at end of file diff --git a/my-distro-devuan-32-pae/backgrounds b/my-distro-devuan-32-pae/backgrounds new file mode 120000 index 00000000..bddeeb98 --- /dev/null +++ b/my-distro-devuan-32-pae/backgrounds @@ -0,0 +1 @@ +../backgrounds \ No newline at end of file diff --git a/my-distro-devuan-32-pae/bootloader-config/bootloader-config b/my-distro-devuan-32-pae/bootloader-config/bootloader-config new file mode 100755 index 00000000..0dbae957 --- /dev/null +++ b/my-distro-devuan-32-pae/bootloader-config/bootloader-config @@ -0,0 +1,21 @@ +#!/bin/bash + +CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") + +# Set secure permissions for the initramfs if we're configuring +# full-disk-encryption. The initramfs is re-generated later in the +# installation process so we only set the permissions snippet without +# regenerating the initramfs right now: +if [ "$(mount | grep $CHROOT" " | cut -c -16)" = "/dev/mapper/luks" ]; then + echo "UMASK=0077" > $CHROOT/etc/initramfs-tools/conf.d/initramfs-permissions +fi + +echo "Running bootloader-config..." + +if [ -d /sys/firmware/efi/efivars ]; then + echo " * Installing grub-efi (uefi)..." + DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-ia32 cryptsetup keyutils +else + echo " * install grub... (bios)" + DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc cryptsetup keyutils +fi diff --git a/my-distro-devuan-32-pae/bootloaders b/my-distro-devuan-32-pae/bootloaders new file mode 120000 index 00000000..20e5e5b1 --- /dev/null +++ b/my-distro-devuan-32-pae/bootloaders @@ -0,0 +1 @@ +../bootloaders \ No newline at end of file diff --git a/my-distro-devuan-32-pae/build.sh b/my-distro-devuan-32-pae/build.sh new file mode 100755 index 00000000..5a756664 --- /dev/null +++ b/my-distro-devuan-32-pae/build.sh @@ -0,0 +1,281 @@ +#!/bin/bash + +################################################################################ +# Title: build.sh +# Description: Script to build My-distro ISO image +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ + +PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" + +# Set the working folder variable +build="$(pwd)" + + +# Create the build folder, move into it removing stale mountpoints and files there. +[ -e build ] && [ ! -d build ] && rm -f build || [ ! -e build ] && mkdir build +cd build +umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null +for i in * .build ; do [ $i = cache ] && continue || rm -rf $i ; done + + +# Set of the structure to be used for the ISO and Live system. +# See /usr/lib/live/build/config for a full list of examples. +# Up above is the manual description of what options I used so far. + +lb config noauto \ + --binary-images iso-hybrid \ + --mode debian \ + --architectures i386 \ + --linux-flavours 686-pae \ + --distribution daedalus \ + --archive-areas "main contrib non-free non-free-firmware" \ + --initsystem sysvinit \ + --mirror-bootstrap http://deb.devuan.org/merged \ + --mirror-chroot http://deb.devuan.org/merged \ + --mirror-chroot-security http://deb.devuan.org/merged \ + --parent-mirror-bootstrap http://deb.devuan.org/merged \ + --parent-mirror-binary http://deb.devuan.org/merged \ + --parent-mirror-binary-security http://deb.devuan.org/merged \ + --parent-mirror-chroot http://deb.devuan.org/merged \ + --parent-mirror-chroot-security http://deb.devuan.org/merged \ + --uefi-secure-boot enable \ + --updates true \ + --security true \ + --backports false \ + --cache true \ + --apt-recommends true \ + --firmware-binary true \ + --firmware-chroot true \ + --iso-application "My-distro" \ + --win32-loader false \ + --iso-volume "My-distro-i386_${TODAY}" \ + --iso-publisher "Manuel rosa" \ + --image-name "My-distro" \ + --win32-loader false \ + --checksums sha512 \ + --zsync false \ + "${@}" + + +# Install the Xfce Desktop +mkdir -p $build/build/config/package-lists +echo xfce4 xfce4-goodies > $build/build/config/package-lists/desktop.list.chroot + +# Install software +echo "# Install software to the squashfs for calamares to unpack to the OS. +linux-headers-686-pae +locales +dkms +dbus-x11 +ntp +deb-multimedia-keyring +xorg +xserver-xorg +xserver-xorg-input-synaptics +xserver-xorg-input-all +xserver-xorg-video-vmware +xserver-xorg-video-all +w32codecs +ffmpeg +sox +twolame +lame +faad +gstreamer1.0-plugins-good +gstreamer1.0-plugins-ugly +gstreamer1.0-plugins-bad +gstreamer1.0-pulseaudio +unrar +rar +p7zip-full +p7zip-rar +zip +unzip +pulseaudio +pavucontrol +alsa-utils +aptitude +synaptic +gparted +apt-config-auto-update +libelf-dev +htop +package-update-indicator +gnome-packagekit +gvfs-backends +samba +gnome-packagekit +network-manager +network-manager-gnome +bluez +blueman +gufw +gtk2-engines +plymouth +plymouth-themes +cups +system-config-printer +lightdm +lightdm-gtk-greeter +lightdm-gtk-greeter-settings +menulibre +mugshot +xscreensaver +xscreensaver-data +xscreensaver-data-extra +xscreensaver-gl +xscreensaver-gl-extra +gnome-system-tools +gnome-disk-utility +gnome-calculator +neofetch +accountsservice +catfish +fuseiso +timeshift +gnome-software +gnome-software-plugin-flatpak +fwupd +bleachbit +dconf-editor +gimp +gimp-data-extras +evince +xsane +transmission-gtk +thunderbird +thunderbird-l10n-pt-br +thunderbird-l10n-pt-pt +thunderbird-l10n-de +thunderbird-l10n-en-gb +thunderbird-l10n-es-es +thunderbird-l10n-fr +thunderbird-l10n-it +firefox-esr +firefox-esr-l10n-de +firefox-esr-l10n-en-gb +firefox-esr-l10n-es-es +firefox-esr-l10n-it +firefox-esr-l10n-pt-br +firefox-esr-l10n-pt-pt +libreoffice +libreoffice-gtk3 +libreoffice-l10n-pt +libreoffice-l10n-pt-br +libreoffice-l10n-de +libreoffice-l10n-en-gb +libreoffice-l10n-es +libreoffice-l10n-fr +libreoffice-l10n-it +printer-driver-cups-pdf +gnome-2048 +gnome-chess +gnome-mahjongg +gnome-sudoku +guvcview +vlc +qt5-style-plugins +qt5ct +calamares-settings-debian +firmware-linux +firmware-linux-free +firmware-linux-nonfree +firmware-misc-nonfree +firmware-realtek +firmware-atheros +firmware-bnx2 +firmware-bnx2x +firmware-brcm80211 +firmware-iwlwifi +firmware-libertas +firmware-netxen +firmware-zd1211 +gdebi +f2fs-tools +xfsprogs +xfsdump +tumbler +tumbler-plugins-extra +ffmpegthumbnailer +xterm +grub-pc +spice-vdagent +console-setup + +" > $build/build/config/package-lists/packages.list.chroot + + +# Packages to be stored in /pool but not installed in the OS . +echo "# These packages are available to the installer, for offline use. +efibootmgr +grub2-common +grub-efi-ia32 +grub-efi-ia32-bin +grub-efi-ia32-signed +libefiboot1 +libefivar1 +mokutil +os-prober +shim-helpers-i386-signed +shim-signed +shim-signed-common +shim-unsigned +" > $build/build/config/package-lists/installer.list.binary + + +# Setup the chroot structure +mkdir -p $build/build/config/archives +mkdir -p $build/build/config/includes.binary +mkdir -p $build/build/config/hooks/live +mkdir -p $build/build/config/hooks/normal +mkdir -p $build/build/config/bootloaders +mkdir -p $build/build/config/packages.chroot +mkdir -p $build/build/config/includes.chroot/etc +mkdir -p $build/build/config/includes.chroot/usr/share/applications +mkdir -p $build/build/config/includes.chroot/usr/share/backgrounds +mkdir -p $build/build/config/includes.chroot/etc/calamares +mkdir -p $build/build/config/includes.chroot/usr/share/icons +mkdir -p $build/build/config/includes.chroot/usr/share/themes +mkdir -p $build/build/config/includes.chroot/etc/live/config.conf.d +mkdir -p $build/build/config/includes.chroot/etc/dpkg/origins +mkdir -p $build/build/config/includes.chroot/usr/sbin +mkdir -p $build/build/config/includes.chroot/etc/lightdm +mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps +mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes +mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base +mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop +mkdir -p $build/build/config/includes.chroot/etc/default +mkdir -p $build/build/config/includes.chroot/boot/grub/themes +mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates + +# Copy Configs to the chroot +cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d +cp $build/applications/* $build/build/config/includes.chroot/usr/share/applications +cp $build/hooks/live/* $build/build/config/hooks/live +cp $build/hooks/normal/* $build/build/config/hooks/normal +cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps +cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin +cp $build/bootloader-config/* $build/build/config/includes.chroot/usr/sbin +cp $build/grub/grub $build/build/config/includes.chroot/etc/default + +cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm +cp -r $build/bootloaders/* $build/build/config/includes.binary +cp -r $build/repos/* $build/build/config/archives +cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds +cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares +cp -r $build/configs/* $build/build/config/includes.chroot/etc/ +cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons +cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes +#cp -r $build/desktop-base/* $build/build/config/includes.chroot/usr/share/desktop-base +#cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth/themes +cp -r $build/packages/* $build/build/config/packages.chroot +cp -r $build/grub/themes/* $build/build/config/includes.chroot/boot/grub/themes +cp -r $build/devuan/* $build/build/config/includes.chroot/usr/share/python-apt/templates + +# build the ISO # +lb build #--debug --verbose + + diff --git a/my-distro-devuan-32-pae/calamares b/my-distro-devuan-32-pae/calamares new file mode 120000 index 00000000..5ad393d3 --- /dev/null +++ b/my-distro-devuan-32-pae/calamares @@ -0,0 +1 @@ +../calamares \ No newline at end of file diff --git a/my-distro-devuan-32-pae/configs b/my-distro-devuan-32-pae/configs new file mode 120000 index 00000000..271eaab3 --- /dev/null +++ b/my-distro-devuan-32-pae/configs @@ -0,0 +1 @@ +../configs \ No newline at end of file diff --git a/my-distro-devuan-32-pae/desktop-base b/my-distro-devuan-32-pae/desktop-base new file mode 120000 index 00000000..71eca1c1 --- /dev/null +++ b/my-distro-devuan-32-pae/desktop-base @@ -0,0 +1 @@ +../desktop-base \ No newline at end of file diff --git a/my-distro-devuan-32-pae/devuan b/my-distro-devuan-32-pae/devuan new file mode 120000 index 00000000..4108b002 --- /dev/null +++ b/my-distro-devuan-32-pae/devuan @@ -0,0 +1 @@ +../devuan \ No newline at end of file diff --git a/my-distro-devuan-32-pae/grub b/my-distro-devuan-32-pae/grub new file mode 120000 index 00000000..c807ca0d --- /dev/null +++ b/my-distro-devuan-32-pae/grub @@ -0,0 +1 @@ +../grub \ No newline at end of file diff --git a/my-distro-devuan-32-pae/hooks b/my-distro-devuan-32-pae/hooks new file mode 120000 index 00000000..f631275e --- /dev/null +++ b/my-distro-devuan-32-pae/hooks @@ -0,0 +1 @@ +../hooks \ No newline at end of file diff --git a/my-distro-devuan-32-pae/icons b/my-distro-devuan-32-pae/icons new file mode 120000 index 00000000..3cfd4cb1 --- /dev/null +++ b/my-distro-devuan-32-pae/icons @@ -0,0 +1 @@ +../icons \ No newline at end of file diff --git a/my-distro-devuan-32-pae/install-debian b/my-distro-devuan-32-pae/install-debian new file mode 120000 index 00000000..f4895317 --- /dev/null +++ b/my-distro-devuan-32-pae/install-debian @@ -0,0 +1 @@ +../install-debian \ No newline at end of file diff --git a/my-distro-devuan-32-pae/lightdm b/my-distro-devuan-32-pae/lightdm new file mode 120000 index 00000000..b55b63f5 --- /dev/null +++ b/my-distro-devuan-32-pae/lightdm @@ -0,0 +1 @@ +../lightdm \ No newline at end of file diff --git a/my-distro-devuan-32-pae/packages/desktop-base_12.0.6+custom1_all.deb b/my-distro-devuan-32-pae/packages/desktop-base_12.0.6+custom1_all.deb new file mode 100644 index 00000000..b244c14c Binary files /dev/null and b/my-distro-devuan-32-pae/packages/desktop-base_12.0.6+custom1_all.deb differ diff --git a/my-distro-devuan-32-pae/plymouth b/my-distro-devuan-32-pae/plymouth new file mode 120000 index 00000000..27244642 --- /dev/null +++ b/my-distro-devuan-32-pae/plymouth @@ -0,0 +1 @@ +../plymouth \ No newline at end of file diff --git a/my-distro-devuan-32-pae/repos b/my-distro-devuan-32-pae/repos new file mode 120000 index 00000000..1071213d --- /dev/null +++ b/my-distro-devuan-32-pae/repos @@ -0,0 +1 @@ +../repos \ No newline at end of file diff --git a/my-distro-devuan-32-pae/sources-final b/my-distro-devuan-32-pae/sources-final new file mode 120000 index 00000000..376ebcf3 --- /dev/null +++ b/my-distro-devuan-32-pae/sources-final @@ -0,0 +1 @@ +../sources-final \ No newline at end of file diff --git a/my-distro-devuan-32-pae/themes b/my-distro-devuan-32-pae/themes new file mode 120000 index 00000000..de900312 --- /dev/null +++ b/my-distro-devuan-32-pae/themes @@ -0,0 +1 @@ +../themes \ No newline at end of file diff --git a/my-distro-devuan-32-pae/userconfig b/my-distro-devuan-32-pae/userconfig new file mode 120000 index 00000000..8d7a939b --- /dev/null +++ b/my-distro-devuan-32-pae/userconfig @@ -0,0 +1 @@ +../userconfig \ No newline at end of file diff --git a/my-distro-devuan-32/BldHelper.sh b/my-distro-devuan-32/BldHelper.sh new file mode 100755 index 00000000..1b30f938 --- /dev/null +++ b/my-distro-devuan-32/BldHelper.sh @@ -0,0 +1,50 @@ +#!/bin/bash + +################################################################################ +# Title: Bldhelper.sh +# Description: Script to build My-distro ISO image +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ + +# Set environment variables +PREFIX=My-distro-devuan +SUFFIX=i386 +BUILD=dev-32 +FileName="${PREFIX}-${SUFFIX}" +LOCATION=$HOME/out/${BUILD} +LogDir=$HOME/logs +WorkingDir=$HOME/My-distro-configs-devuan/my-distro-devuan-32 + +# Execute the ISO building script +cd ${WorkingDir} +./build.sh + +# Move and rename the ISO file +cd build +mv *.iso ${FileName}-${TODAY}.iso + +# Create the checksum file for the ISO +sha512sum ${FileName}-${TODAY}.iso > ${FileName}-${TODAY}-sha512.checksum + +# Remove old ISO and checksum files from the desired location +rm -f ${LOCATION}/${FileName}*.iso +rm -f ${LOCATION}/${FileName}*-sha512.checksum + +# Move the ISO and checksum files to the desired location +mkdir -p ${LOCATION} +mv ${FileName}-${TODAY}.iso ${LOCATION} +mv ${FileName}-${TODAY}-sha512.checksum ${LOCATION} + +# Move the log file to the log directory (if it exists) +if [ -f /tmp/${PREFIX}${SUFFIX}.out ]; then + mv /tmp/${PREFIX}${SUFFIX}.out ${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log +fi + +# Clean the build folder +lb clean + +# Remove the "fusato" directory and its contents +cd .. +rm -rf build diff --git a/my-distro-devuan-32/applications b/my-distro-devuan-32/applications new file mode 120000 index 00000000..32c37e2d --- /dev/null +++ b/my-distro-devuan-32/applications @@ -0,0 +1 @@ +../applications \ No newline at end of file diff --git a/my-distro-devuan-32/backgrounds b/my-distro-devuan-32/backgrounds new file mode 120000 index 00000000..bddeeb98 --- /dev/null +++ b/my-distro-devuan-32/backgrounds @@ -0,0 +1 @@ +../backgrounds \ No newline at end of file diff --git a/my-distro-devuan-32/bootloader-config/bootloader-config b/my-distro-devuan-32/bootloader-config/bootloader-config new file mode 100755 index 00000000..0dbae957 --- /dev/null +++ b/my-distro-devuan-32/bootloader-config/bootloader-config @@ -0,0 +1,21 @@ +#!/bin/bash + +CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") + +# Set secure permissions for the initramfs if we're configuring +# full-disk-encryption. The initramfs is re-generated later in the +# installation process so we only set the permissions snippet without +# regenerating the initramfs right now: +if [ "$(mount | grep $CHROOT" " | cut -c -16)" = "/dev/mapper/luks" ]; then + echo "UMASK=0077" > $CHROOT/etc/initramfs-tools/conf.d/initramfs-permissions +fi + +echo "Running bootloader-config..." + +if [ -d /sys/firmware/efi/efivars ]; then + echo " * Installing grub-efi (uefi)..." + DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-efi-ia32 cryptsetup keyutils +else + echo " * install grub... (bios)" + DEBIAN_FRONTEND=noninteractive chroot $CHROOT apt-get -y install grub-pc cryptsetup keyutils +fi diff --git a/my-distro-devuan-32/bootloaders b/my-distro-devuan-32/bootloaders new file mode 120000 index 00000000..20e5e5b1 --- /dev/null +++ b/my-distro-devuan-32/bootloaders @@ -0,0 +1 @@ +../bootloaders \ No newline at end of file diff --git a/my-distro-devuan-32/build.sh b/my-distro-devuan-32/build.sh new file mode 100755 index 00000000..6f1aff15 --- /dev/null +++ b/my-distro-devuan-32/build.sh @@ -0,0 +1,282 @@ +#!/bin/bash + +################################################################################ +# Title: build.sh +# Description: Script to build My-distro ISO image +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ + +PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" + +# Set the working folder variable +build="$(pwd)" + + +# Create the build folder, move into it removing stale mountpoints and files there. +[ -e build ] && [ ! -d build ] && rm -f build || [ ! -e build ] && mkdir build +cd build +umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null +for i in * .build ; do [ $i = cache ] && continue || rm -rf $i ; done + + +# Set of the structure to be used for the ISO and Live system. +# See /usr/lib/live/build/config for a full list of examples. +# Up above is the manual description of what options I used so far. + +lb config noauto \ + --binary-images iso-hybrid \ + --mode debian \ + --architectures i386 \ + --linux-flavours 686 \ + --distribution daedalus \ + --archive-areas "main contrib non-free non-free-firmware" \ + --initsystem sysvinit \ + --mirror-bootstrap http://deb.devuan.org/merged \ + --mirror-chroot http://deb.devuan.org/merged \ + --mirror-chroot-security http://deb.devuan.org/merged \ + --parent-mirror-bootstrap http://deb.devuan.org/merged \ + --parent-mirror-binary http://deb.devuan.org/merged \ + --parent-mirror-binary-security http://deb.devuan.org/merged \ + --parent-mirror-chroot http://deb.devuan.org/merged \ + --parent-mirror-chroot-security http://deb.devuan.org/merged \ + --uefi-secure-boot enable \ + --updates true \ + --security true \ + --backports false \ + --cache true \ + --apt-recommends true \ + --firmware-binary true \ + --firmware-chroot true \ + --iso-application "My-distro" \ + --win32-loader false \ + --iso-volume "My-distro-i386_${TODAY}" \ + --iso-publisher "Manuel rosa" \ + --image-name "My-distro" \ + --win32-loader false \ + --checksums sha512 \ + --zsync false \ + "${@}" + + +# Install the Xfce Desktop +mkdir -p $build/build/config/package-lists +echo xfce4 xfce4-goodies > $build/build/config/package-lists/desktop.list.chroot + +# Install software +echo "# Install software to the squashfs for calamares to unpack to the OS. +linux-headers-686 +locales +dkms +dbus-x11 +ntp +deb-multimedia-keyring +xorg +xserver-xorg +xserver-xorg-input-synaptics +xserver-xorg-input-all +xserver-xorg-video-vmware +xserver-xorg-video-all +w32codecs +ffmpeg +sox +twolame +lame +faad +gstreamer1.0-plugins-good +gstreamer1.0-plugins-ugly +gstreamer1.0-plugins-bad +gstreamer1.0-pulseaudio +unrar +rar +p7zip-full +p7zip-rar +zip +unzip +pulseaudio +pavucontrol +alsa-utils +aptitude +synaptic +gparted +apt-config-auto-update +libelf-dev +htop +package-update-indicator +gnome-packagekit +gvfs-backends +samba +gnome-packagekit +network-manager +network-manager-gnome +bluez +blueman +gufw +gtk2-engines +plymouth +plymouth-themes +cups +system-config-printer +lightdm +lightdm-gtk-greeter +lightdm-gtk-greeter-settings +menulibre +mugshot +xscreensaver +xscreensaver-data +xscreensaver-data-extra +xscreensaver-gl +xscreensaver-gl-extra +gnome-system-tools +gnome-disk-utility +gnome-calculator +neofetch +accountsservice +catfish +fuseiso +timeshift +gnome-software +gnome-software-plugin-flatpak +fwupd +bleachbit +dconf-editor +gimp +gimp-data-extras +evince +xsane +transmission-gtk +thunderbird +thunderbird-l10n-pt-br +thunderbird-l10n-pt-pt +thunderbird-l10n-de +thunderbird-l10n-en-gb +thunderbird-l10n-es-es +thunderbird-l10n-fr +thunderbird-l10n-it +firefox-esr +firefox-esr-l10n-de +firefox-esr-l10n-en-gb +firefox-esr-l10n-es-es +firefox-esr-l10n-it +firefox-esr-l10n-pt-br +firefox-esr-l10n-pt-pt +libreoffice +libreoffice-gtk3 +libreoffice-l10n-pt +libreoffice-l10n-pt-br +libreoffice-l10n-de +libreoffice-l10n-en-gb +libreoffice-l10n-es +libreoffice-l10n-fr +libreoffice-l10n-it +printer-driver-cups-pdf +gnome-2048 +gnome-chess +gnome-mahjongg +gnome-sudoku +guvcview +vlc +qt5-style-plugins +qt5ct +calamares-settings-debian +firmware-linux +firmware-linux-free +firmware-linux-nonfree +firmware-misc-nonfree +firmware-realtek +firmware-atheros +firmware-bnx2 +firmware-bnx2x +firmware-brcm80211 +firmware-iwlwifi +firmware-libertas +firmware-netxen +firmware-zd1211 +gdebi +f2fs-tools +xfsprogs +xfsdump +tumbler +tumbler-plugins-extra +ffmpegthumbnailer +xterm +grub-pc +spice-vdagent +console-setup + +" > $build/build/config/package-lists/packages.list.chroot + + +# Packages to be stored in /pool but not installed in the OS . +echo "# These packages are available to the installer, for offline use. +efibootmgr +grub2-common +grub-efi-ia32 +grub-efi-ia32-bin +grub-efi-ia32-signed +libefiboot1 +libefivar1 +mokutil +os-prober +shim-helpers-i386-signed +shim-signed +shim-signed-common +shim-unsigned + +" > $build/build/config/package-lists/installer.list.binary + + +# Setup the chroot structure +mkdir -p $build/build/config/archives +mkdir -p $build/build/config/includes.binary +mkdir -p $build/build/config/hooks/live +mkdir -p $build/build/config/hooks/normal +mkdir -p $build/build/config/bootloaders +mkdir -p $build/build/config/packages.chroot +mkdir -p $build/build/config/includes.chroot/etc +mkdir -p $build/build/config/includes.chroot/usr/share/applications +mkdir -p $build/build/config/includes.chroot/usr/share/backgrounds +mkdir -p $build/build/config/includes.chroot/etc/calamares +mkdir -p $build/build/config/includes.chroot/usr/share/icons +mkdir -p $build/build/config/includes.chroot/usr/share/themes +mkdir -p $build/build/config/includes.chroot/etc/live/config.conf.d +mkdir -p $build/build/config/includes.chroot/etc/dpkg/origins +mkdir -p $build/build/config/includes.chroot/usr/sbin +mkdir -p $build/build/config/includes.chroot/etc/lightdm +mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps +mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes +mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base +mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop +mkdir -p $build/build/config/includes.chroot/etc/default +mkdir -p $build/build/config/includes.chroot/boot/grub/themes +mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates + +# Copy Configs to the chroot +cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d +cp $build/applications/* $build/build/config/includes.chroot/usr/share/applications +cp $build/hooks/live/* $build/build/config/hooks/live +cp $build/hooks/normal/* $build/build/config/hooks/normal +cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps +cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin +cp $build/bootloader-config/* $build/build/config/includes.chroot/usr/sbin +cp $build/grub/grub $build/build/config/includes.chroot/etc/default + +cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm +cp -r $build/bootloaders/* $build/build/config/includes.binary +cp -r $build/repos/* $build/build/config/archives +cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds +cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares +cp -r $build/configs/* $build/build/config/includes.chroot/etc/ +cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons +cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes +#cp -r $build/desktop-base/* $build/build/config/includes.chroot/usr/share/desktop-base +#cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth/themes +cp -r $build/packages/* $build/build/config/packages.chroot +cp -r $build/grub/themes/* $build/build/config/includes.chroot/boot/grub/themes +cp -r $build/devuan/* $build/build/config/includes.chroot/usr/share/python-apt/templates + +# build the ISO # +lb build #--debug --verbose + + diff --git a/my-distro-devuan-32/calamares b/my-distro-devuan-32/calamares new file mode 120000 index 00000000..5ad393d3 --- /dev/null +++ b/my-distro-devuan-32/calamares @@ -0,0 +1 @@ +../calamares \ No newline at end of file diff --git a/my-distro-devuan-32/configs b/my-distro-devuan-32/configs new file mode 120000 index 00000000..271eaab3 --- /dev/null +++ b/my-distro-devuan-32/configs @@ -0,0 +1 @@ +../configs \ No newline at end of file diff --git a/my-distro-devuan-32/desktop-base b/my-distro-devuan-32/desktop-base new file mode 120000 index 00000000..71eca1c1 --- /dev/null +++ b/my-distro-devuan-32/desktop-base @@ -0,0 +1 @@ +../desktop-base \ No newline at end of file diff --git a/my-distro-devuan-32/devuan b/my-distro-devuan-32/devuan new file mode 120000 index 00000000..4108b002 --- /dev/null +++ b/my-distro-devuan-32/devuan @@ -0,0 +1 @@ +../devuan \ No newline at end of file diff --git a/my-distro-devuan-32/grub b/my-distro-devuan-32/grub new file mode 120000 index 00000000..c807ca0d --- /dev/null +++ b/my-distro-devuan-32/grub @@ -0,0 +1 @@ +../grub \ No newline at end of file diff --git a/my-distro-devuan-32/hooks b/my-distro-devuan-32/hooks new file mode 120000 index 00000000..f631275e --- /dev/null +++ b/my-distro-devuan-32/hooks @@ -0,0 +1 @@ +../hooks \ No newline at end of file diff --git a/my-distro-devuan-32/icons b/my-distro-devuan-32/icons new file mode 120000 index 00000000..3cfd4cb1 --- /dev/null +++ b/my-distro-devuan-32/icons @@ -0,0 +1 @@ +../icons \ No newline at end of file diff --git a/my-distro-devuan-32/install-debian b/my-distro-devuan-32/install-debian new file mode 120000 index 00000000..f4895317 --- /dev/null +++ b/my-distro-devuan-32/install-debian @@ -0,0 +1 @@ +../install-debian \ No newline at end of file diff --git a/my-distro-devuan-32/lightdm b/my-distro-devuan-32/lightdm new file mode 120000 index 00000000..b55b63f5 --- /dev/null +++ b/my-distro-devuan-32/lightdm @@ -0,0 +1 @@ +../lightdm \ No newline at end of file diff --git a/my-distro-devuan-32/packages/desktop-base_12.0.6+custom1_all.deb b/my-distro-devuan-32/packages/desktop-base_12.0.6+custom1_all.deb new file mode 100644 index 00000000..b244c14c Binary files /dev/null and b/my-distro-devuan-32/packages/desktop-base_12.0.6+custom1_all.deb differ diff --git a/my-distro-devuan-32/plymouth b/my-distro-devuan-32/plymouth new file mode 120000 index 00000000..27244642 --- /dev/null +++ b/my-distro-devuan-32/plymouth @@ -0,0 +1 @@ +../plymouth \ No newline at end of file diff --git a/my-distro-devuan-32/repos b/my-distro-devuan-32/repos new file mode 120000 index 00000000..1071213d --- /dev/null +++ b/my-distro-devuan-32/repos @@ -0,0 +1 @@ +../repos \ No newline at end of file diff --git a/my-distro-devuan-32/sources-final b/my-distro-devuan-32/sources-final new file mode 120000 index 00000000..376ebcf3 --- /dev/null +++ b/my-distro-devuan-32/sources-final @@ -0,0 +1 @@ +../sources-final \ No newline at end of file diff --git a/my-distro-devuan-32/themes b/my-distro-devuan-32/themes new file mode 120000 index 00000000..de900312 --- /dev/null +++ b/my-distro-devuan-32/themes @@ -0,0 +1 @@ +../themes \ No newline at end of file diff --git a/my-distro-devuan-32/userconfig b/my-distro-devuan-32/userconfig new file mode 120000 index 00000000..8d7a939b --- /dev/null +++ b/my-distro-devuan-32/userconfig @@ -0,0 +1 @@ +../userconfig \ No newline at end of file diff --git a/my-distro-devuan-64/BldHelper.sh b/my-distro-devuan-64/BldHelper.sh new file mode 100755 index 00000000..83d4886f --- /dev/null +++ b/my-distro-devuan-64/BldHelper.sh @@ -0,0 +1,50 @@ +#!/bin/bash + +################################################################################ +# Title: Bldhelper.sh +# Description: Script to build My-distro ISO image +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ + +# Set environment variables +PREFIX=My-distro-devuan +SUFFIX=amd64 +BUILD=dev-64 +FileName="${PREFIX}-${SUFFIX}" +LOCATION=$HOME/out/${BUILD} +LogDir=$HOME/logs +WorkingDir=$HOME/My-distro-configs-devuan/my-distro-devuan-64 + +# Execute the ISO building script +cd ${WorkingDir} +./build.sh + +# Move and rename the ISO file +cd build +mv *.iso ${FileName}-${TODAY}.iso + +# Create the checksum file for the ISO +sha512sum ${FileName}-${TODAY}.iso > ${FileName}-${TODAY}-sha512.checksum + +# Remove old ISO and checksum files from the desired location +rm -f ${LOCATION}/${FileName}*.iso +rm -f ${LOCATION}/${FileName}*-sha512.checksum + +# Move the ISO and checksum files to the desired location +mkdir -p ${LOCATION} +mv ${FileName}-${TODAY}.iso ${LOCATION} +mv ${FileName}-${TODAY}-sha512.checksum ${LOCATION} + +# Move the log file to the log directory (if it exists) +if [ -f /tmp/${PREFIX}${SUFFIX}.out ]; then + mv /tmp/${PREFIX}${SUFFIX}.out ${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log +fi + +# Clean the build folder +lb clean + +# Remove the "fusato" directory and its contents +cd .. +rm -rf build diff --git a/my-distro-devuan-64/applications b/my-distro-devuan-64/applications new file mode 120000 index 00000000..32c37e2d --- /dev/null +++ b/my-distro-devuan-64/applications @@ -0,0 +1 @@ +../applications \ No newline at end of file diff --git a/my-distro-devuan-64/backgrounds b/my-distro-devuan-64/backgrounds new file mode 120000 index 00000000..bddeeb98 --- /dev/null +++ b/my-distro-devuan-64/backgrounds @@ -0,0 +1 @@ +../backgrounds \ No newline at end of file diff --git a/my-distro-devuan-64/bootloaders b/my-distro-devuan-64/bootloaders new file mode 120000 index 00000000..20e5e5b1 --- /dev/null +++ b/my-distro-devuan-64/bootloaders @@ -0,0 +1 @@ +../bootloaders \ No newline at end of file diff --git a/build-64.sh b/my-distro-devuan-64/build.sh similarity index 86% rename from build-64.sh rename to my-distro-devuan-64/build.sh index a548911c..ca185c01 100755 --- a/build-64.sh +++ b/my-distro-devuan-64/build.sh @@ -1,4 +1,13 @@ #!/bin/bash + +################################################################################ +# Title: build.sh +# Description: Script to build My-distro ISO image +# Author: manuel rosa +# Date: Outubro 29, 2023 +# License: GPL-3.0-or-later +################################################################################ + PATH="/sbin:/usr/sbin:/usr/local/sbin:$PATH" # Set the working folder variable @@ -9,7 +18,7 @@ build="$(pwd)" [ -e build ] && [ ! -d build ] && rm -f build || [ ! -e build ] && mkdir build cd build umount $(mount | grep "${PWD}/chroot" | tac | cut -f3 -d" ") 2>/dev/null -for i in ./* ./.build ./cache/bootstrap ; do [ $i = ./cache ] && continue || rm -rf $i ; done +for i in * .build ; do [ $i = cache ] && continue || rm -rf $i ; done # Set of the structure to be used for the ISO and Live system. @@ -21,8 +30,8 @@ lb config noauto \ --mode debian \ --architectures amd64 \ --linux-flavours amd64 \ - --distribution chimaera \ - --archive-areas "main contrib non-free" \ + --distribution daedalus \ + --archive-areas "main contrib non-free non-free-firmware" \ --initsystem sysvinit \ --mirror-bootstrap http://deb.devuan.org/merged \ --mirror-chroot http://deb.devuan.org/merged \ @@ -179,7 +188,6 @@ firmware-atheros firmware-bnx2 firmware-bnx2x firmware-brcm80211 -firmware-intelwimax firmware-iwlwifi firmware-libertas firmware-netxen @@ -193,6 +201,8 @@ tumbler-plugins-extra ffmpegthumbnailer xterm grub-pc +spice-vdagent +console-setup " > $build/build/config/package-lists/packages.list.chroot @@ -235,11 +245,13 @@ mkdir -p $build/build/config/includes.chroot/etc/dpkg/origins mkdir -p $build/build/config/includes.chroot/usr/sbin mkdir -p $build/build/config/includes.chroot/etc/lightdm mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps -mkdir -p $build/build/config/includes.chroot/usr/share/plymouth +mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop mkdir -p $build/build/config/includes.chroot/etc/default +mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates mkdir -p $build/build/config/includes.chroot/boot/grub/themes +mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates # Copy Configs to the chroot cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d @@ -248,28 +260,22 @@ cp $build/hooks/live/* $build/build/config/hooks/live cp $build/hooks/normal/* $build/build/config/hooks/normal cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin +cp $build/bootloader-config/* $build/build/config/includes.chroot/usr/sbin cp $build/grub/grub $build/build/config/includes.chroot/etc/default cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm -cp -r $build/bootloaders/* $build/build/config/bootloaders +cp -r $build/bootloaders/* $build/build/config/includes.binary cp -r $build/repos/* $build/build/config/archives cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares cp -r $build/configs/* $build/build/config/includes.chroot/etc/ cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes -cp -r $build/desktop-base/* $build/build/config/includes.chroot/usr/share/desktop-base -cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth -cp -r $build/packages64/* $build/build/config/packages.chroot +#cp -r $build/desktop-base/* $build/build/config/includes.chroot/usr/share/desktop-base +#cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth/themes +cp -r $build/packages/* $build/build/config/packages.chroot cp -r $build/grub/themes/* $build/build/config/includes.chroot/boot/grub/themes - -# Resolves Synaptics issue. Might be better in a conf hook. -mkdir -p $build/build/config/includes.chroot/usr/share/distro-info -mkdir -p $build/build/config/includes.chroot/usr/share/python-apt/templates cp -r $build/devuan/* $build/build/config/includes.chroot/usr/share/python-apt/templates -ln -s Devuan.info $build/build/config/includes.chroot/usr/share/python-apt/templates/My-distro.info -ln -s Devuan.mirrors $build/build/config/includes.chroot/usr/share/python-apt/templates/My-distro.mirrors -ln -s devuan.csv $build/build/config/includes.chroot/usr/share/distro-info/my-distro.csv # Build the ISO # lb build #--debug --verbose diff --git a/my-distro-devuan-64/calamares b/my-distro-devuan-64/calamares new file mode 120000 index 00000000..5ad393d3 --- /dev/null +++ b/my-distro-devuan-64/calamares @@ -0,0 +1 @@ +../calamares \ No newline at end of file diff --git a/my-distro-devuan-64/configs b/my-distro-devuan-64/configs new file mode 120000 index 00000000..271eaab3 --- /dev/null +++ b/my-distro-devuan-64/configs @@ -0,0 +1 @@ +../configs \ No newline at end of file diff --git a/my-distro-devuan-64/desktop-base b/my-distro-devuan-64/desktop-base new file mode 120000 index 00000000..71eca1c1 --- /dev/null +++ b/my-distro-devuan-64/desktop-base @@ -0,0 +1 @@ +../desktop-base \ No newline at end of file diff --git a/my-distro-devuan-64/devuan b/my-distro-devuan-64/devuan new file mode 120000 index 00000000..4108b002 --- /dev/null +++ b/my-distro-devuan-64/devuan @@ -0,0 +1 @@ +../devuan \ No newline at end of file diff --git a/my-distro-devuan-64/grub b/my-distro-devuan-64/grub new file mode 120000 index 00000000..c807ca0d --- /dev/null +++ b/my-distro-devuan-64/grub @@ -0,0 +1 @@ +../grub \ No newline at end of file diff --git a/my-distro-devuan-64/hooks b/my-distro-devuan-64/hooks new file mode 120000 index 00000000..f631275e --- /dev/null +++ b/my-distro-devuan-64/hooks @@ -0,0 +1 @@ +../hooks \ No newline at end of file diff --git a/my-distro-devuan-64/icons b/my-distro-devuan-64/icons new file mode 120000 index 00000000..3cfd4cb1 --- /dev/null +++ b/my-distro-devuan-64/icons @@ -0,0 +1 @@ +../icons \ No newline at end of file diff --git a/my-distro-devuan-64/install-debian b/my-distro-devuan-64/install-debian new file mode 120000 index 00000000..f4895317 --- /dev/null +++ b/my-distro-devuan-64/install-debian @@ -0,0 +1 @@ +../install-debian \ No newline at end of file diff --git a/my-distro-devuan-64/lightdm b/my-distro-devuan-64/lightdm new file mode 120000 index 00000000..b55b63f5 --- /dev/null +++ b/my-distro-devuan-64/lightdm @@ -0,0 +1 @@ +../lightdm \ No newline at end of file diff --git a/my-distro-devuan-64/packages/desktop-base_12.0.6+custom1_all.deb b/my-distro-devuan-64/packages/desktop-base_12.0.6+custom1_all.deb new file mode 100644 index 00000000..b244c14c Binary files /dev/null and b/my-distro-devuan-64/packages/desktop-base_12.0.6+custom1_all.deb differ diff --git a/packages64/vivaldi-stable_5.5.2805.44-1_amd64.deb b/my-distro-devuan-64/packages/vivaldi-stable_6.4.3160.34-1_amd64.deb similarity index 84% rename from packages64/vivaldi-stable_5.5.2805.44-1_amd64.deb rename to my-distro-devuan-64/packages/vivaldi-stable_6.4.3160.34-1_amd64.deb index 49e3b574..da9133c7 100644 Binary files a/packages64/vivaldi-stable_5.5.2805.44-1_amd64.deb and b/my-distro-devuan-64/packages/vivaldi-stable_6.4.3160.34-1_amd64.deb differ diff --git a/my-distro-devuan-64/plymouth b/my-distro-devuan-64/plymouth new file mode 120000 index 00000000..27244642 --- /dev/null +++ b/my-distro-devuan-64/plymouth @@ -0,0 +1 @@ +../plymouth \ No newline at end of file diff --git a/my-distro-devuan-64/repos b/my-distro-devuan-64/repos new file mode 120000 index 00000000..1071213d --- /dev/null +++ b/my-distro-devuan-64/repos @@ -0,0 +1 @@ +../repos \ No newline at end of file diff --git a/my-distro-devuan-64/sources-final b/my-distro-devuan-64/sources-final new file mode 120000 index 00000000..376ebcf3 --- /dev/null +++ b/my-distro-devuan-64/sources-final @@ -0,0 +1 @@ +../sources-final \ No newline at end of file diff --git a/my-distro-devuan-64/themes b/my-distro-devuan-64/themes new file mode 120000 index 00000000..de900312 --- /dev/null +++ b/my-distro-devuan-64/themes @@ -0,0 +1 @@ +../themes \ No newline at end of file diff --git a/my-distro-devuan-64/userconfig b/my-distro-devuan-64/userconfig new file mode 120000 index 00000000..8d7a939b --- /dev/null +++ b/my-distro-devuan-64/userconfig @@ -0,0 +1 @@ +../userconfig \ No newline at end of file diff --git a/packages32/calamares_3.2.61-1_i386.deb b/packages32/calamares_3.2.61-1_i386.deb deleted file mode 100644 index bbfc8b92..00000000 Binary files a/packages32/calamares_3.2.61-1_i386.deb and /dev/null differ diff --git a/packages32/desktop-base_45.0.4_all.deb b/packages32/desktop-base_45.0.4_all.deb deleted file mode 100644 index ffb05984..00000000 Binary files a/packages32/desktop-base_45.0.4_all.deb and /dev/null differ diff --git a/packages64/calamares_3.2.61-1.1_amd64.deb b/packages64/calamares_3.2.61-1.1_amd64.deb deleted file mode 100644 index 5486e1fb..00000000 Binary files a/packages64/calamares_3.2.61-1.1_amd64.deb and /dev/null differ diff --git a/packages64/desktop-base_45.0.4_all.deb b/packages64/desktop-base_45.0.4_all.deb deleted file mode 100644 index ffb05984..00000000 Binary files a/packages64/desktop-base_45.0.4_all.deb and /dev/null differ diff --git a/repos/multimedia.list.binary b/repos/multimedia.list.binary index a829be22..0100fb43 100644 --- a/repos/multimedia.list.binary +++ b/repos/multimedia.list.binary @@ -1,2 +1,2 @@ -deb http://www.deb-multimedia.org bullseye main non-free -deb-src http://www.deb-multimedia.org bullseye main non-free +deb https://www.deb-multimedia.org bookworm main non-free +deb-src https://www.deb-multimedia.org bookworm main non-free diff --git a/repos/multimedia.list.chroot b/repos/multimedia.list.chroot index a829be22..0100fb43 100644 --- a/repos/multimedia.list.chroot +++ b/repos/multimedia.list.chroot @@ -1,2 +1,2 @@ -deb http://www.deb-multimedia.org bullseye main non-free -deb-src http://www.deb-multimedia.org bullseye main non-free +deb https://www.deb-multimedia.org bookworm main non-free +deb-src https://www.deb-multimedia.org bookworm main non-free diff --git a/sources-final/sources-final b/sources-final/sources-final index c5a15fbc..b9c9429d 100755 --- a/sources-final/sources-final +++ b/sources-final/sources-final @@ -4,26 +4,26 @@ # CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") -RELEASE="chimaera" +RELEASE="daedalus" cat << EOF > $CHROOT/etc/apt/sources.list # See https://wiki.debian.org/SourcesList for more information. -# Main Repo - main contrib non-free -deb http://deb.devuan.org/merged chimaera main contrib non-free -#deb-src http://deb.devuan.org/merged chimaera main contrib non-free +# Main Repo - main contrib non-free non-free-firmware +deb http://deb.devuan.org/merged daedalus main contrib non-free non-free-firmware +#deb-src http://deb.devuan.org/merged daedalus main contrib non-free non-free-firmware -# Security Repo - main contrib non-free -deb http://deb.devuan.org/merged chimaera-security main contrib non-free -#deb-src http://deb.devuan.org/merged chimaera-security main contrib non-free +# Security Repo - main contrib non-free non-free-firmware +deb http://deb.devuan.org/merged daedalus-security main contrib non-free non-free-firmware +#deb-src http://deb.devuan.org/merged daedalus-security main contrib non-free non-free-firmware -# Updates Repo - main contrib non-free -deb http://deb.devuan.org/merged chimaera-updates main contrib non-free -#deb-src http://deb.devuan.org/merged chimaera-updates main contrib non-free +# Updates Repo - main contrib non-free non-free-firmware +deb http://deb.devuan.org/merged daedalus-updates main contrib non-free non-free-firmware +#deb-src http://deb.devuan.org/merged daedalus-updates main contrib non-free non-free-firmware -# chimaera-backports, previously on backports.debian.org -deb http://deb.devuan.org/merged chimaera-backports main contrib non-free -#deb-src http://deb.devuan.org/merged chimaera-backports main contrib non-free +# daedalus-backports, previously on backports.debian.org +deb http://deb.devuan.org/merged daedalus-backports main contrib non-free non-free-firmware +#deb-src http://deb.devuan.org/merged daedalus-backports main contrib non-free non-free-firmware EOF diff --git a/sources-final/sources-media b/sources-final/sources-media new file mode 100755 index 00000000..4bbe529d --- /dev/null +++ b/sources-final/sources-media @@ -0,0 +1,25 @@ +#!/bin/sh + +CHROOT=$(mount | grep proc | grep calamares | awk '{print $3}' | sed -e "s#/proc##g") +MEDIUM_PATH="/run/live/medium" +RELEASE="daedalus" + +if [ "$1" = "-u" ]; then + umount $CHROOT/$MEDIUM_PATH + rm $CHROOT/etc/apt/sources.list.d/debian-live-media.list + chroot $CHROOT apt-get update + exit 0 +fi + +# Remove the base sources, we will configure sources in a later phase +rm -f $CHROOT/etc/apt/sources.list.d/base.list + +mkdir -p $CHROOT/$MEDIUM_PATH +mount --bind $MEDIUM_PATH $CHROOT/$MEDIUM_PATH +echo "deb [trusted=yes] file:$MEDIUM_PATH $RELEASE main" > $CHROOT/etc/apt/sources.list.d/debian-live-media.list +chroot $CHROOT apt-get update +# Attempt safest way to remove cruft +rmdir $CHROOT/run/live/medium +rmdir $CHROOT/run/live + +exit 0