Replaced buildvars.conf with bldpkg.conf
This commit is contained in:
parent
7cfbbc9603
commit
25b8e48825
5 changed files with 7 additions and 6 deletions
|
@ -15,7 +15,7 @@ if [ -z "$SM_AUTOBUILD" ] ; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
. ${BUILDVARS:-/etc/buildvars.conf}
|
||||
. ${BUILDVARS:-/etc/bldpkg.conf}
|
||||
|
||||
if [ -n "$SM_AUTOBUILDTEMP" ] ; then
|
||||
SM_AUTOBUILDTEMP="$(echo $SM_AUTOBUILDTEMP)"
|
||||
|
|
|
@ -15,7 +15,7 @@ if [ -z "$SM_AUTOBUILD" ] ; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
. ${BUILDVARS:-/etc/buildvars.conf}
|
||||
. ${BUILDVARS:-/etc/bldpkg.conf}
|
||||
|
||||
if [ -n "$SM_AUTOBUILDTEMP" ] ; then
|
||||
SM_AUTOBUILDTEMP="$(echo $SM_AUTOBUILDTEMP)"
|
||||
|
|
|
@ -15,7 +15,7 @@ if [ -z "$SM_AUTOBUILD" ] ; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
. ${BUILDVARS:-/etc/buildvars.conf}
|
||||
. ${BUILDVARS:-/etc/bldpkg.conf}
|
||||
|
||||
if [ -n "$SM_AUTOBUILDTEMP" ] ; then
|
||||
SM_AUTOBUILDTEMP="$(echo $SM_AUTOBUILDTEMP)"
|
||||
|
|
|
@ -7,7 +7,8 @@
|
|||
# Modified and trimmed extensively for use with SMLinux
|
||||
|
||||
# The default list of GSB sections, in the order they should be processed.
|
||||
SECTIONS="${SECTIONS:- base xorg gtk extra net xfce }"
|
||||
#SECTIONS="${SECTIONS:- base xorg gtk extra net xfce }"
|
||||
SECTIONS="${SECTIONS:- extra }"
|
||||
|
||||
# Generate HTML and TXT reports. Use 1 to enable and 0 to disable.
|
||||
SM_GENERATEREPORTS=0
|
||||
|
@ -61,7 +62,7 @@ cd $( cd ${BASH_SOURCE%/*} ; pwd )
|
|||
|
||||
# Setup the environment
|
||||
# Use custom build variables file
|
||||
BUILDVARS="/etc/buildvars.conf"
|
||||
BUILDVARS="/etc/bldpkg.conf"
|
||||
SM_PARENTTMP="/tmp"
|
||||
PKGDEST=${PKGDEST:-$SM_PARENTTMP/sml/packages}
|
||||
LOGSDIR=${LOGSDIR:-$SM_PARENTTMP/sml/sml-buildlogs}
|
||||
|
|
|
@ -15,7 +15,7 @@ if [ -z "$SM_AUTOBUILD" ] ; then
|
|||
exit 1
|
||||
fi
|
||||
|
||||
. ${BUILDVARS:-/etc/buildvars.conf}
|
||||
. ${BUILDVARS:-/etc/bldpkg.conf}
|
||||
|
||||
if [ -n "$SM_AUTOBUILDTEMP" ] ; then
|
||||
SM_AUTOBUILDTEMP="$(echo $SM_AUTOBUILDTEMP)"
|
||||
|
|
Loading…
Reference in a new issue