pktsurf/smlinux
1
1
Fork 0
Code Issues 1 Pull requests Wiki Activity

Moved genchecksum function in bldpkg to its own new file and made miscellaneous changes to bldpkg

Browse source
This commit is contained in:
SMLinux 2022-01-29 22:40:15 +05:30
parent 15b97de190
commit a04f324663
7 changed files with 245 additions and 269 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

105
bldpkg
View file

@ -1,53 +1,33 @@
#!/bin/bash
# Part of the SMLinux distribution
# pktsurf.in
# http://git.pktsurf.in
# Exit on any error
set -e
# Store the source directory the build file was initiated from inside $SRCDIR
# Store the source directory path the build was initiated from
SRCDIR="$PWD"
# get relative directory name from SRCDIR
# Get relative directory name from SRCDIR
SRCDIRRPATH="$(basename $SRCDIR)"
# Generate sha512sums in the build file
genchecksum() {
echo "Discarding old SHA512SUMS from $SRCDIRRPATH.SMBuild"
sed -E -i \
-e '/^SHA512SUMS=".*"$/d' \
-e '/^SHA512SUMS="/,/"$/d' \
-e "/^SHA512SUMS='.*'\$/d" \
-e "/^SHA512sums='/,/'\$/d" \
"$SRCDIRRPATH".SMBuild
echo "Adding new SHA512SUMS in $SRCDIRRPATH.SMBuild..."
printf 'SHA512SUMS="\n' >> "$SRCDIRRPATH".SMBuild
# File types
FILES=( *.tar.* *.zip *.t?z *.patch *.diff *.c *.h )
# Checksum digest to be used along with arguments
CHECKSUMBINARY="sha512sum"
for FILE in ${FILES[@]} ; do
if [ -f "$FILE" ] ; then
$CHECKSUMBINARY $FILE >> "$SRCDIRRPATH".SMBuild
fi
# Load all functions from files inside /etc/bldpkg.d
for f in /etc/bldpkg.d/* ; do
source $f
done
printf '"' >> "$SRCDIRRPATH".SMBuild
echo "You may now run bldpkg again without any arguments"
exit 0
}
# If the first argument is "genchecksum", invoke the genchecksum function.
# Else if the first argument is filename, then get the build extension of that file and source it, else throw an error
# Else if no argument is given, get the basename of the directory and look for a matching package build file name.
# If a package build file is found, source that file and that will initiate the build.
if [ -n "$1" ] && [ "$1" = "genchecksum" ] ; then
genchecksum
elif [ -n "$1" ] ; then
if [ -f "$1" ]; then
EXTENSION="${1##*.}"
if [ -f "$1" ] && [ "$EXTENSION" == "SMBuild" ] ; then
source "$1"
else
echo "File not found!"
echo "Invalid file!"
exit 1
fi
elif [ -z $1 ] && [ -f "$SRCDIRRPATH".SMBuild ]; then
@ -57,21 +37,23 @@ else
exit 1
fi
#type -t prepbdir
# Then source the conf file holding all values
. ${BUILDVARS:-/etc/bldpkg.conf}
# This file is executed by bldpkg.conf and assists in preparing a complete build environment.
# Execute everything inside this condition so that stuff isn't executed and put into the build environment
# unnecessarily when the section build file runs. This happens mostly during autobuilds.
# Get APP and VERSION from the build file
if [ -n "$APP" ] && [ -n "$VERSION" ]; then
# If any of the following variables are not set, abort.
if [ -z "$APP" ] || [ -z "$VERSION" ] || [ -z "$BUILD" ] || [ -z "$DESC" ] || [ -z "$REQUIRES" ] ; then
echo "One or more required variables not set. Aborting."
exit 1
fi
# Display the package and its version we are building
echo "[INFO] Building package $APP version $VERSION ..."
sleep 0.5
# Then source the configuration file holding all values
if [ -f /etc/bldpkg.conf ] ; then
. /etc/bldpkg.conf
else
echo "/etc/bldpkg.conf not found! Aborting!"
fi
# Create the $SM_PARENTTEMP directory. This directory is used for everything related to the build process outside
#the source directory $SRCDIR
mkdir -p $SM_PARENTTMP
@ -85,10 +67,7 @@ if [ -n "$APP" ] && [ -n "$VERSION" ]; then
echo $BUILD > $SM_PARENTTMP/$APP.BUILD
fi
# Store the source directory the build file was initiated from inside $SRCDIR
#SRCDIR="$PWD"
# Function to match specifically match arrays inside a value. This function will be used later on to perform package
# Function to specifically match arrays inside a value. This function will be used later on to perform package
# and directory matches using certain conditions. Note: "${ARRAY[@]}" =~ "${VARIABLE}" isn't fool-proof.
inarray() {
local n=$1 h
@ -100,10 +79,6 @@ if [ -n "$APP" ] && [ -n "$VERSION" ]; then
return 1
}
for f in /etc/bldpkg.d/* ; do
source $f
done
# Time when the build commenced. Note: elapsed time is logged by the runtime function way below. This output goes
# into package build summary.
SM_COMMENCEDATE="$(date '+%a, %d %b %Y, %T')"
@ -240,24 +215,6 @@ EOF
fi
fi
# Check if SM_VERIFYCHECKSUMS is set and enabled to 1 and determine whether to continue building or abort if checksums fail
if [ -n "$SM_VERIFYCHECKSUMS" ] && [ "$SM_VERIFYCHECKSUMS" = "1" ] ; then
echo "[INFO] Verifying source checksums..."
if [ -f "$SRCDIR/$APP.CHKSUM512" ] && \
[ -f "$SRCDIR/$APP.CHKSUM512.sig" ] ; then
# Verify the checksum file using our tool mkchecksums
if [ -x /bin/mkchecksums ] ; then
/bin/mkchecksums -vv
else
echo "/bin/mkchecksums script not found! Aborting!"
exit 1
fi
else
echo "[ERROR] Checksum files not found! Exiting!"
exit 1
fi
fi
# Condition to reuse the AUTOBUILDTEMP file if set from autobuild or make a new temporary file
if [ -n "$SM_AUTOBUILDTEMP" ]; then
SM_TEMPFILE="$SM_AUTOBUILDTEMP"
@ -275,16 +232,6 @@ EOF
trap "prepbuildsummary" EXIT
trap "interruptsummary" INT
fi
#if [ -z $1 ] ; then
# echo "Please provide a build file or an argument."
# exit 1
#else
# source $1
#fi
verifychecksums
#build 2>&1 | tee -a "$APP".SMBuild.log.txt
build

29
bldpkg.d/genchecksum Executable file
View file

@ -0,0 +1,29 @@
# Generate sha512sums in the build file
genchecksum() {
echo "Discarding old SHA512SUMS from $SRCDIRRPATH.SMBuild"
sed -E -i \
-e '/^SHA512SUMS=".*"$/d' \
-e '/^SHA512SUMS="/,/"$/d' \
-e "/^SHA512SUMS='.*'\$/d" \
-e "/^SHA512sums='/,/'\$/d" \
"$SRCDIRRPATH".SMBuild
echo "Adding new SHA512SUMS in $SRCDIRRPATH.SMBuild..."
printf 'SHA512SUMS="\n' >> "$SRCDIRRPATH".SMBuild
# File types
FILES=( *.tar.* *.zip *.t?z *.patch *.diff *.c *.h )
# Checksum digest to be used along with arguments
CHECKSUMBINARY="sha512sum"
for FILE in ${FILES[@]} ; do
if [ -f "$FILE" ] ; then
$CHECKSUMBINARY $FILE >> "$SRCDIRRPATH".SMBuild
fi
done
printf '"' >> "$SRCDIRRPATH".SMBuild
echo "You may now run bldpkg again without any arguments"
exit 0
}

2
bldpkg.d/mkandenterbuilddir
View file

@ -1,7 +1,7 @@
# Function to remove old package directories and make new ones.
# To be invoked inside a package build file.
mkandenterbuilddir() {
# $TMP, $PKG and $PKGDEST are set in bldpkg.conf.
# $TMP, $PKG and $PKGDEST are set in buildvars.conf.
PKGDOCS="$PKG/doc/$APP-$VERSION"
# Remove any old $PKG staging directory left by any previous build.
# We are about to rm -rf something, so trying a bit hard not to delete

4
bldpkg.d/promptuser
View file

@ -7,7 +7,7 @@ promptuser() {
while true ; do
echo
echo "[NOTIFY] '"$APP"' has been built and SM_EXTRACTPROMPT is enabled in"
echo "[NOTIFY] bldpkg.conf file. Would you like to extract and examine contents"
echo "[NOTIFY] buildvars.conf file. Would you like to extract and examine contents"
echo "[NOTIFY] of its package installer in a 'test' directory within the"
echo "[NOTIFY] current source directory"
echo "[NOTIFY] ($SRCDIR) ?"
@ -37,7 +37,7 @@ be overwritten. (y/N) " yn
echo
echo "[NOTIFY] '"$APP"' successfully built and SM_INSTALLPROMPT is \
enabled in the bldpkg.conf file."
enabled in the buildvars.conf file."
read -r -p "[NOTIFY] Would you like to install/upgrade it? (y/N) " yn
case $yn in

12
bldpkg.d/validatecompilers
View file

@ -6,7 +6,7 @@ validatecompilers() {
if [ ! -x "$SM_DISTCCBINPATH" ]; then
echo "[ERROR] Oops! Distcc binary was not found but building with it"
echo "[ERROR] was requested! Either ensure distcc is in your "'$PATH'" or"
echo "[ERROR] disable this option in bldpkg file. bldpkg file"
echo "[ERROR] disable this option in buildvars file. buildvars file"
echo "[ERROR] is located in $BUILDVARS ! Aborting!"
exit 1
fi
@ -18,7 +18,7 @@ validatecompilers() {
elif [ ! -d "$SM_DISTCCSYMPATH" ] ; then
echo "[ERROR] $SM_DISTCCSYMPATH directory containing symlinks to distcc"
echo "[ERROR] does not exist! Kindly create it and create symlinks"
echo "[ERROR] based on instructions in bldpkg.conf! Aborting!"
echo "[ERROR] based on instructions in buildvars.conf! Aborting!"
exit 1
fi
@ -83,7 +83,7 @@ validatecompilers() {
if [ ! -x "$SM_CCACHEBINPATH" ] ; then
echo "[ERROR] Oops! ccache binary was not found but building with it"
echo "[ERROR] was requested! Either ensure ccache is in your "'$PATH'" or"
echo "[ERROR] disable this option in bldpkg.conf. bldpkg.conf"
echo "[ERROR] disable this option in buildvars.conf. buildvars.conf"
echo "[ERROR] file is located in $BUILDVARS . Aborting!"
exit 1
fi
@ -94,7 +94,7 @@ validatecompilers() {
elif [ ! -d "$SM_CCACHESYMPATH" ] ; then
echo "[ERROR] $SM_CCACHESYMPATH directory containing symlinks to ccache"
echo "[ERROR] does not exist! Kindly create it and create symlinks"
echo "[ERROR] based on instructions in bldpkg.conf. Aborting!"
echo "[ERROR] based on instructions in buildvars.conf. Aborting!"
exit 1
fi
@ -157,7 +157,7 @@ validatecompilers() {
if [ ! -x "$SM_SCCACHEBINPATH" ] ; then
echo "[ERROR] Oops! sccache binary was not found but building with it"
echo "[ERROR] was requested! Either ensure sccache is in your "'$PATH'" or"
echo "[ERROR] disable this option in bldpkg.conf. bldpkg.conf"
echo "[ERROR] disable this option in buildvars.conf. buildvars.conf"
echo "[ERROR] file is located in $BUILDVARS . Aborting!"
exit 1
fi
@ -168,7 +168,7 @@ validatecompilers() {
elif [ ! -d "$SM_SCCACHEPATH" ] ; then
echo "[ERROR] $SM_SCCACHEPATH directory containing symlinks to ccache"
echo "[ERROR] does not exist! Kindly create it and create symlinks"
echo "[ERROR] based on instructions in bldpkg.conf. Aborting!"
echo "[ERROR] based on instructions in buildvars.conf. Aborting!"
exit 1
fi

4
bldpkg.d/validatecompressors
View file

@ -1,5 +1,5 @@
validatecompressors() {
# Validate package extension set in bldpkg.conf
# Validate package extension set in buildvars.conf
SM_VALIDPKGEXTENSIONS=( "tgz" "tbz" "tlz" "txz" )
if ! inarray "${PKGEXT}" "${SM_VALIDPKGEXTENSIONS[@]}" ; then
echo "[ERROR] $PKGEXT is not a valid package extension for an SMLinux"
@ -7,7 +7,7 @@ validatecompressors() {
exit 1
fi
# Figure out the compression tool to be used based on the $PKGEXT variable set in bldpkg.conf. At the same time,
# Figure out the compression tool to be used based on the $PKGEXT variable set in buildvars.conf. At the same time,
# export the compressor options set for makepkg to import from the build environment.
case "$PKGEXT" in
tgz) COMPRESSOR=gzip

2
bldpkg.d/validateswap
View file

@ -4,7 +4,7 @@ validateswap() {
if inarray "${APP}" "${SM_PACKAGESREQUIRINGSWAP[@]}" ; then
# Here we determine available system swap size needed to compile exceptional packages that pull in a lot of RAM.
# Those packages are listed under the SM_PACKAGESREQUIRINGSWAP array in /etc/bldpkg.conf. Check whether swap
# Those packages are listed under the SM_PACKAGESREQUIRINGSWAP array in /etc/buildvars.conf. Check whether swap
#is available on the system and if it is, determine its size. If its size is >= SM_SWAPSIZE, we are all good.
#If it's less than SM_SWAPSIZE, we exit with a status 1.