From f9618e63dbed43f05af68c248af1a3a2eb42640e Mon Sep 17 00:00:00 2001 From: Manuel Date: Fri, 18 Nov 2022 10:53:53 -0100 Subject: [PATCH] update BldHelper files to build in the build server --- BldHelper-32-non-pae-release.sh | 73 ++++++++++++++++++++++++++++++++ BldHelper-32-release.sh | 73 ++++++++++++++++++++++++++++++++ BldHelper-64-release.sh | 74 +++++++++++++++++++++++++++++++++ build-64.sh | 1 - 4 files changed, 220 insertions(+), 1 deletion(-) create mode 100755 BldHelper-32-non-pae-release.sh create mode 100755 BldHelper-32-release.sh create mode 100755 BldHelper-64-release.sh diff --git a/BldHelper-32-non-pae-release.sh b/BldHelper-32-non-pae-release.sh new file mode 100755 index 00000000..364aeca0 --- /dev/null +++ b/BldHelper-32-non-pae-release.sh @@ -0,0 +1,73 @@ +#!/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-debian # 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/repos/${BUILD} # Tells and the script which 2 files to remove and where to put them. +LogDir=/repos/builds/logs/ # This folder contains a log for the last $[PREFIX]-$[SUFFIX] build. +WorkDir=/repos/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/ +d /My-distro-configs-debian && 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 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/BldHelper-32-release.sh b/BldHelper-32-release.sh new file mode 100755 index 00000000..405bf561 --- /dev/null +++ b/BldHelper-32-release.sh @@ -0,0 +1,73 @@ +#!/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-debian # 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/repos/${BUILD} # Tells and the script which 2 files to remove and where to put them. +LogDir=/repos/builds/logs/ # This folder contains a log for the last $[PREFIX]-$[SUFFIX] build. +WorkDir=/repos/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-debian && 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 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/BldHelper-64-release.sh b/BldHelper-64-release.sh new file mode 100755 index 00000000..e56fe987 --- /dev/null +++ b/BldHelper-64-release.sh @@ -0,0 +1,74 @@ +#!/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-debian # 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/repos/${BUILD} # Tells and the script which 2 files to remove and where to put them. +LogDir=/repos/builds/logs/ # This folder contains a log for the last $[PREFIX]-$[SUFFIX] build. +WorkDir=/repos/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-xfce-configs-ubuntu +cd /My-distro-configs-debian && 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/build-64.sh b/build-64.sh index 6eba029b..946f4659 100755 --- a/build-64.sh +++ b/build-64.sh @@ -231,7 +231,6 @@ 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