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

Changes to bldpkg:

Browse source 
* "subshelled" the entire script and discarded code to unset variables
* Moved up code that displays application name and version at the start
  of the build a few lines up
* Fixed typos
This commit is contained in:
SMLinux 2022-02-15 15:18:30 +05:30
parent 16246f3ef9
commit a418675a82
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
bldpkg
View file

@ -22,10 +22,13 @@
# "catting" important build info into a unique build file and then # "catting" important build info into a unique build file and then
# the build monitor sources from that file # the build monitor sources from that file
# Begin subshell
(
# Exit on any error # Exit on any error
set -e set -e
# All variable names are to be in upper-case, function names in lower-xase. # All variable names are to be in upper-case, function names in lower-case.
# Time when the build commenced. Note: elapsed time is logged by the runtime function way below. This output goes # Time when the build commenced. Note: elapsed time is logged by the runtime function way below. This output goes
# into package build summary. # into package build summary.
@ -67,9 +70,6 @@ genchecksum() {
exit 0 exit 0
} }
# Unset standard variables before sourcing from the build file
unset app version build homepage download requires desc arch CFLAGS CXXFLAGS
# If the first argument is "genchecksum", invoke the genchecksum function. # 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 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. # Else if no argument is given, get the basename of the directory and look for a matching package build file name.
@ -102,13 +102,16 @@ for buildvariables in app version build homepage desc requires ; do
fi fi
done done
# Display the package and its version we are building
echo "[INFO] Building package $app version $version ..."
sleep 0.5
# Check if build() function exists in the build file # Check if build() function exists in the build file
if [[ ! "$(grep '^build()' "$srcdirpath".SMBuild)" ]] ; then if [[ ! "$(grep '^build()' "$srcdirpath".SMBuild)" ]] ; then
echo "build() function does not exist in your build file. Aborting!" echo "build() function does not exist in your build file. Aborting!"
exit 1 exit 1
fi fi
# Only verify source checksums if skipchecksum is not set in the build file # Only verify source checksums if skipchecksum is not set in the build file
if [ -z "$skipchecksum" ] ; then if [ -z "$skipchecksum" ] ; then
if [ -z "$sha512sums" ] ; then if [ -z "$sha512sums" ] ; then
@ -172,10 +175,6 @@ inarray() {
return 1 return 1
} }
# Display the package and its version we are building
echo "[INFO] Building package $app version $version ..."
sleep 0.5
# Check if $parenttmp is set and is a directory # Check if $parenttmp is set and is a directory
if [ -z "$parenttmp" ] ; then if [ -z "$parenttmp" ] ; then
echo "parenttmp variable not set in /etc/bldpkg.conf. Aborting!" echo "parenttmp variable not set in /etc/bldpkg.conf. Aborting!"
@ -1213,3 +1212,6 @@ trap "prepbuildsummary" EXIT
trap "interruptsummary" INT trap "interruptsummary" INT
build build
)
# End subshell and script