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

Changes to bldpkg:

Browse source 
* Added missing "$" in srcdirpath.SMBuild line
* Removed code that outputs an error in case the extension check fails.
* Added code to warn user when old package build and staging directories not belonging to current packge
  exist inside the tmpfs directory
* Fixed sccachepath typos in code that validates sccache binary and hardlinks
* Added code to export RUSTC_WRAPPER variable when sccache is enabled
This commit is contained in:
PktSurf 2022-02-28 10:47:13 +05:30
parent 887b96a3e3
commit 6acad40352
1 changed files with 23 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
bldpkg
View file

@ -49,7 +49,7 @@ srcdirpath="$(basename $srcdir)"
# Generate sha512sums in the build file
genchecksum() {
echo "Discarding old sha512sums from srcdirpath.SMBuild"
echo "Discarding old sha512sums from $srcdirpath.SMBuild"
sed -E -i \
-e '/^sha512sums=".*"$/d' \
-e '/^sha512sums="/,/"$/d' \
@ -84,15 +84,7 @@ genchecksum() {
if [ -n "$1" ] && [ "$1" = "genchecksum" ] ; then
genchecksum
elif [ -n "$1" ] ; then
extension="${1##*.}"
if [ -f "$1" ] && [ "$extension" == "SMBuild" ] ; then
source "$1"
else
echo "[ERROR] Invalid file!"
exit 1
fi
source "$1"
elif [ -z $1 ] && [ -f "$srcdirpath".SMBuild ]; then
source "$srcdirpath".SMBuild
else
@ -357,9 +349,20 @@ if [ "$usetmpfs" = "1" ] && [ -n "$tmpfsdir" ] && [ -z "$tmpfscheckfailed" ] ; t
preservebuilddir=0
preservepackagedir=0
# Get the directory from the tmpfsdir variable for extracting the source
# Get the directory from the tmpfsdir variable for extracting the source and set it as our build and staging directory
tmp="$tmpfsdir/$app.src"
pkg=${pkg:-$tmpfsdir/package-$app}
# If number of directories exceeds 0, further check if the build directory and staging directory belonging to the
# current build exists. If it doesn't, it means there were remnants of previous incomplete compilations belonging to other
# package builds inside tmpfs. Warn the user that they are eating up precious RAM.
if [ "$(ls $tmpfsdir | wc -l)" -gt 0 ] ; then
if [ ! -d "$tmpfdir/app.src" ] && [ ! -d "$tmpfsdir/package-$app" ] ; then
echo "[WARNING] Directories from previous potentially incomplete compiles exist in your tmpfs directory"
echo "Kindly consider deleting them to prevent current package or any future package from running out of RAM."
sleep 5
fi
fi
fi
else
# If usetmpfs is disabled, we compile in the non-TMPFS directory
@ -532,7 +535,7 @@ fi
# Validate everything related to sccache if globalccache is set
if [ "$globalsccache" = "1" ]; then
if [ ! -x "$scacchebinpath" ] ; then
if [ ! -x "$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 buildvars.conf. buildvars.conf"
@ -540,11 +543,11 @@ if [ "$globalsccache" = "1" ]; then
exit 1
fi
if [ ! "$(echo $PATH | grep "$scacchepath")" ] ; then
echo "[ERROR] $scacchepath not found in "'$PATH!'" Fix it please."
if [ ! "$(echo $PATH | grep "$sccachepath")" ] ; then
echo "[ERROR] $sccachepath not found in "'$PATH!'" Fix it please."
exit 1
elif [ ! -d "$scacchepath" ] ; then
echo "[ERROR] $scacchepath directory containing symlinks to ccache"
elif [ ! -d "$sccachepath" ] ; then
echo "[ERROR] $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!"
exit 1
@ -593,6 +596,10 @@ if [ "$globalsccache" = "1" ]; then
# rm $parenttmp/sccachecheck-"$f"{,.c}
# exit 1
#fi
# Useful for rust-specific builds. Rust does not listen to MAKEFLAGS
RUSTC_WRAPPER="$sccachebinpath"
export RUSTC_WRAPPER
done