xbps-src: read specified config file in doinst-helper, if set.
This commit is contained in:
parent
66c78b3ddc
commit
5dc6d62e3e
@ -26,7 +26,11 @@
|
||||
|
||||
PKG_TMPLNAME="$1"
|
||||
|
||||
. @@XBPS_INSTALL_ETCDIR@@/xbps-src.conf
|
||||
if [ -n "${CONFIG_FILE}" -a -r "${CONFIG_FILE}" ]; then
|
||||
. ${CONFIG_FILE}
|
||||
else
|
||||
. @@XBPS_INSTALL_ETCDIR@@/xbps-src.conf
|
||||
fi
|
||||
|
||||
if [ -n "${MASTERDIR}" ]; then
|
||||
export XBPS_MASTERDIR="${MASTERDIR}"
|
||||
|
@ -90,6 +90,7 @@ install_pkg()
|
||||
env xbps_machine=${xbps_machine} MASTERDIR=${_MASTERDIR} \
|
||||
wrksrc=${wrksrc} \
|
||||
BOOTSTRAP_PKG_REBUILD=$BOOTSTRAP_PKG_REBUILD \
|
||||
CONFIG_FILE=${XBPS_CONFIG_FILE} \
|
||||
${fakeroot_cmd} ${fakeroot_cmd_args} \
|
||||
@@XBPS_INSTALL_LIBEXECDIR@@/doinst-helper \
|
||||
${curpkgn} || return $?
|
||||
|
Loading…
Reference in New Issue
Block a user