update build files

PepDeb32.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# This is a helper script used to do the actual build.
+# By running this script , as "sudo" you can easily build a new PeppermintOS ISO from our CI|CD pipeline.
+
+
+[ -x ./PepDeb32/pepbld.sh ] && (cd PepDeb32 ; sudo ./pepbld.sh ; cd ../)
+

PepDeb32/BldHelper-release.sh

@@ -0,0 +1,78 @@
+ #!/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=PepMini	# Sets a unique final name of the ISO and checksum so <HouseKeeping> only removes 2 files .
+SUFFIX=i386		# Also used by <HouseKeeping>. 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=$(date -u +"%Y-%m-%d") && export TODAY 		# 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 <HouseKeeping>.
+LOCATION=/var/www/html/${BUILD}				# Tells <HouseKeeping> and the script which 2 files to remove and where to put them.
+LogDir=/var/log/Live-Build				# This folder contains a log for the last $[PREFIX]-$[SUFFIX] build.
+WorkingDir=~/pepadmin/PepMini/PepDeb32	#* If we change servers or locations T*H*I*S line is the O*N*L*Y line to change. *
+OutFile="/tmp/${PREFIX}${SUFFIX}.out"
+LogFile="${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log"
+_cache="./cache"
+_break=0 ; _wait=30	# Time (in seconds) to wait
+
+# Run the build script.
+ ./pepbld.sh 2>&1 | tee -a ${OutFile}
+
+
+# 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 fusato/*.iso ]
+      do ((++_break))
+	 [ $_break -gt $_wait ] && break || sleep 1
+done
+
+if [ ${_break} -lt ${_wait} ] ; then
+
+mv fusato/*.iso fusato/${FileName}.iso
+
+# Make the checksum file.
+cd fusato
+echo "# ${FileName} ${TODAY}" > ${FileName}-sha512.checksum
+sha512sum ${FileName}.iso >> ${FileName}-sha512.checksum
+
+### <HouseKeeping>
+# Remove the previous files in ${LOCATION} .
+rm -f ${LOCATION}/${FileName}*.iso
+rm -f ${LOCATION}/${FileName}*-sha512.checksum
+#rm -f ${LOCATION}/${FileName}*.torrent
+
+#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 ${OutFile} ${LogFile}
+
+# Remove old packages from the cache directory
+for i in $(grep "Del " ${LogFile} | sort -u | cut -f2,3 -d" " | tr " " "_" | tr ":" "*" | tr "+" "*" )
+           do for j in $_cache/packages.*/${i}*.deb
+                  do  [ -e $j ] && rm $j
+              done
+done
+
+### </HouseKeeping>
+
+else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append ${OutFile}
+     mv ${OutFile} ${LogFile}
+fi
+

PepDeb32/pepbld.sh

@@ -37,8 +37,8 @@ lb config  noauto \
 
      "${@}"
 
-
 # Setup the installer structure
+mkdir -p $uchinanchu/fusato/config/archives
 mkdir -p $uchinanchu/fusato/config/includes.installer
 mkdir -p $uchinanchu/fusato/config/includes.binary
 mkdir -p $uchinanchu/fusato/config/includes.binary/install
@@ -46,6 +46,7 @@ mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share
 
 #cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives
 cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer
+cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives
 
 # Copy recursive files and sub-directories, containing symlinks.
 cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary

PepDeb32/pepinstaller

@@ -0,0 +1 @@
+../pepinstaller

PepDeb32/peploadersplash

@@ -0,0 +1 @@
+../peploadersplash

PepDeb32/peprepo

@@ -0,0 +1 @@
+../peprepo

PepDeb64.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# This is a helper script used to do the actual build.
+# By running this script , as "sudo" you can easily build a new PeppermintOS ISO from our CI|CD pipeline.
+
+
+[ -x ./PepDeb64/pepbld.sh ] && (cd PepDeb64 ; sudo ./pepbld.sh ; cd ../)
+

PepDeb64/BldHelper-release.sh

@@ -0,0 +1,78 @@
+ #!/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=PepMini	# Sets a unique final name of the ISO and checksum so <HouseKeeping> only removes 2 files .
+SUFFIX=amd64		# Also used by <HouseKeeping>. 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=$(date -u +"%Y-%m-%d") && export TODAY 		# 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 <HouseKeeping>.
+LOCATION=/var/www/html/${BUILD}				# Tells <HouseKeeping> and the script which 2 files to remove and where to put them.
+LogDir=/var/log/Live-Build				# This folder contains a log for the last $[PREFIX]-$[SUFFIX] build.
+WorkingDir=~/pepadmin/PepMini/PepDeb64	# If we change servers or locations T*H*I*S line is the O*N*L*Y line to change. *
+OutFile="/tmp/${PREFIX}${SUFFIX}.out"
+LogFile="${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log"
+_cache="./cache"
+_break=0 ; _wait=30	# Time (in seconds) to wait
+
+# Run the build script.
+ ./pepbld.sh 2>&1 | tee -a ${OutFile}
+
+
+# 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 fusato/*.iso ]
+      do ((++_break))
+	 [ $_break -gt $_wait ] && break || sleep 1
+done
+
+if [ ${_break} -lt ${_wait} ] ; then
+
+mv fusato/*.iso fusato/${FileName}.iso
+
+# Make the checksum file.
+cd fusato
+echo "# ${FileName} ${TODAY}" > ${FileName}-sha512.checksum
+sha512sum ${FileName}.iso >> ${FileName}-sha512.checksum
+
+### <HouseKeeping>
+# Remove the previous files in ${LOCATION} .
+rm -f ${LOCATION}/${FileName}*.iso
+rm -f ${LOCATION}/${FileName}*-sha512.checksum
+#rm -f ${LOCATION}/${FileName}*.torrent
+
+#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 ${OutFile} ${LogFile}
+
+# Remove old packages from the cache directory
+for i in $(grep "Del " ${LogFile} | sort -u | cut -f2,3 -d" " | tr " " "_" | tr ":" "*" | tr "+" "*" )
+           do for j in $_cache/packages.*/${i}*.deb
+                  do  [ -e $j ] && rm $j
+              done
+done
+
+### </HouseKeeping>
+
+else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append ${OutFile}
+     mv ${OutFile} ${LogFile}
+fi
+

PepDeb64/pepbld.sh

@@ -38,6 +38,7 @@ lb config  noauto \
 
 
 # Setup the installer structure
+mkdir -p $uchinanchu/fusato/config/archives
 mkdir -p $uchinanchu/fusato/config/includes.installer
 mkdir -p $uchinanchu/fusato/config/includes.binary
 mkdir -p $uchinanchu/fusato/config/includes.binary/install
@@ -45,6 +46,7 @@ mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share
 
 #cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives
 cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer
+cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives
 
 # Copy recursive files and sub-directories, containing symlinks.
 cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary

PepDeb64/pepinstaller

@@ -0,0 +1 @@
+../pepinstaller

PepDeb64/peploadersplash

@@ -0,0 +1 @@
+../peploadersplash

PepDeb64/peprepo

@@ -0,0 +1 @@
+../peprepo

PepDeb_arm64.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+# This is a helper script used to do the actual build.
+# By running this script , as "sudo" you can easily build a new PeppermintOS ISO from our CI|CD pipeline.
+
+
+[ -x ./PepDeb_arm64/pepbld.sh ] && (cd PepDeb_arm64 ; sudo ./pepbld.sh ; cd ../)
+

PepDeb_arm64/BldHelper-release.sh

@@ -0,0 +1,78 @@
+ #!/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=PepMini	# Sets a unique final name of the ISO and checksum so <HouseKeeping> only removes 2 files .
+SUFFIX=arm64		# Also used by <HouseKeeping>. 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=$(date -u +"%Y-%m-%d") && export TODAY 		# 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 <HouseKeeping>.
+LOCATION=/var/www/html/${BUILD}				# Tells <HouseKeeping> and the script which 2 files to remove and where to put them.
+LogDir=/var/log/Live-Build				# This folder contains a log for the last $[PREFIX]-$[SUFFIX] build.
+WorkingDir=~/pepadmin/PepMini/PepDeb_arm64	# If we change servers or locations T*H*I*S line is the O*N*L*Y line to change. *
+OutFile="/tmp/${PREFIX}${SUFFIX}.out"
+LogFile="${LogDir}/${PREFIX}-${SUFFIX}-${BUILD}.log"
+_cache="./cache"
+_break=0 ; _wait=30	# Time (in seconds) to wait
+
+# Run the build script.
+ ./pepbld.sh 2>&1 | tee -a ${OutFile}
+
+
+# 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 fusato/*.iso ]
+      do ((++_break))
+	 [ $_break -gt $_wait ] && break || sleep 1
+done
+
+if [ ${_break} -lt ${_wait} ] ; then
+
+mv fusato/*.iso fusato/${FileName}.iso
+
+# Make the checksum file.
+cd fusato
+echo "# ${FileName} ${TODAY}" > ${FileName}-sha512.checksum
+sha512sum ${FileName}.iso >> ${FileName}-sha512.checksum
+
+### <HouseKeeping>
+# Remove the previous files in ${LOCATION} .
+rm -f ${LOCATION}/${FileName}*.iso
+rm -f ${LOCATION}/${FileName}*-sha512.checksum
+#rm -f ${LOCATION}/${FileName}*.torrent
+
+#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 ${OutFile} ${LogFile}
+
+# Remove old packages from the cache directory
+for i in $(grep "Del " ${LogFile} | sort -u | cut -f2,3 -d" " | tr " " "_" | tr ":" "*" | tr "+" "*" )
+           do for j in $_cache/packages.*/${i}*.deb
+                  do  [ -e $j ] && rm $j
+              done
+done
+
+### </HouseKeeping>
+
+else echo -e "\n\tAfter $_break seconds, ISO never appeared.\n" | tee --append ${OutFile}
+     mv ${OutFile} ${LogFile}
+fi
+

PepDeb_arm64/pepbld.sh

@@ -39,8 +39,8 @@ lb config  noauto \
 
      "${@}"
 
-
 # Setup the installer structure
+mkdir -p $uchinanchu/fusato/config/archives
 mkdir -p $uchinanchu/fusato/config/includes.installer
 mkdir -p $uchinanchu/fusato/config/includes.binary
 mkdir -p $uchinanchu/fusato/config/includes.binary/install
@@ -48,6 +48,7 @@ mkdir -p $uchinanchu/fusato/config/includes.installer/usr/share
 
 #cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives
 cp $uchinanchu/pepinstaller/preseed/preseed.cfg $uchinanchu/fusato/config/includes.installer
+cp $uchinanchu/peprepo/* $uchinanchu/fusato/config/archives
 
 # Copy recursive files and sub-directories, containing symlinks.
 cp -r $uchinanchu/peploadersplash/boot $uchinanchu/fusato/config/includes.binary

PepDeb_arm64/pepinstaller

@@ -0,0 +1 @@
+../pepinstaller

PepDeb_arm64/peploadersplash/boot/grub/grub.cfg

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