Discarded obsolete stuff in main and section build files

This commit is contained in:
SMLinux 2022-02-14 13:18:24 +05:30
parent 8b68c42d89
commit 1dd82276d1
7 changed files with 3 additions and 19 deletions

View file

@ -221,7 +221,6 @@ mkdir -p $pkgdest $logsdir/$section
unset currentpkgnumber
mv $logsdir/$section/$package-$section-$HOSTTYPE.log.txt \
$logsdir/$section/$package-$version-$build-$section-$HOSTTYPE.log.txt
rm -f $parenttmp/$package.{app,version,build}
fi
else
echo "*********************************************************************"

16
bldpkg
View file

@ -3,10 +3,9 @@
# http://git.pktsurf.in
# TODO
# *Get rid of $app{app,build,version} files, find a better way to communicate to the
# build monitor, by for example, using a "catting" those three above variables
# into a unique build file and then the build monitor sources from that file
# *Improve the way configsite is validated
# Find a better way to communicate to the build monitor, by for example,
# using a "catting" important build info into a unique build file and then
# the build monitor sources from that file
# Exit on any error
set -e
@ -192,10 +191,6 @@ fi
# interrupted or failed) can be viewed in the web browser.
if [ "$htmloutput" = "1" ] ; then
#echo $app > $parenttmp/$app.app
#echo $version > $parenttmp/$app.version
#echo $build > $parenttmp/$app.build
if [ -n "$autobuild" ] ; then
cat << EOF >> $parenttmp/BUILDMONITOR
<b>$commencedate | Building package # $currentpkgnumber / $totalpkgnumber: <i><a href="/smlinux/pkgresults?pkg=$app&amp;smver=1.0&amp;arch=all&amp;resultnum=25">$app $version</a></i></b>
@ -1187,11 +1182,6 @@ interruptsummary() {
# ctrl-C will only set the above sm variable repeatedly and won't return user to the shell because
# of the interrupt (SIGINT) trap set way below. Putting exit 0 is a decent way to get out of that prompt
# Clean up stale files like $app.app, $app.build and $app.version
#if [ -z "$autobuild" ] ; then
# rm -f $parenttmp/$app.{app,build,version}
# fi
exit 0
}

View file

@ -221,7 +221,6 @@ mkdir -p $pkgdest $logsdir/$section
unset currentpkgnumber
mv $logsdir/$section/$package-$section-$HOSTTYPE.log.txt \
$logsdir/$section/$package-$version-$build-$section-$HOSTTYPE.log.txt
rm -f $parenttmp/$package.{app,version,build}
fi
else
echo "*********************************************************************"

View file

@ -221,7 +221,6 @@ mkdir -p $pkgdest $logsdir/$section
unset currentpkgnumber
mv $logsdir/$section/$package-$section-$HOSTTYPE.log.txt \
$logsdir/$section/$package-$version-$build-$section-$HOSTTYPE.log.txt
rm -f $parenttmp/$package.{app,version,build}
fi
else
echo "*********************************************************************"

View file

@ -221,7 +221,6 @@ mkdir -p $pkgdest $logsdir/$section
unset currentpkgnumber
mv $logsdir/$section/$package-$section-$HOSTTYPE.log.txt \
$logsdir/$section/$package-$version-$build-$section-$HOSTTYPE.log.txt
rm -f $parenttmp/$package.{app,version,build}
fi
else
echo "*********************************************************************"

View file

@ -221,7 +221,6 @@ mkdir -p $pkgdest $logsdir/$section
unset currentpkgnumber
mv $logsdir/$section/$package-$section-$HOSTTYPE.log.txt \
$logsdir/$section/$package-$version-$build-$section-$HOSTTYPE.log.txt
#rm -f $parenttmp/$package.{app,version,build}
fi
else
echo "*********************************************************************"

View file

@ -221,7 +221,6 @@ mkdir -p $pkgdest $logsdir/$section
unset currentpkgnumber
mv $logsdir/$section/$package-$section-$HOSTTYPE.log.txt \
$logsdir/$section/$package-$version-$build-$section-$HOSTTYPE.log.txt
rm -f $parenttmp/$package.{app,version,build}
fi
else
echo "*********************************************************************"