xbps-src: append /usr/local/bin to PATH for some chroot ops.
This commit is contained in:
parent
89dec60e64
commit
48cab426cc
|
@ -298,7 +298,7 @@ xbps_chroot_handler()
|
||||||
|
|
||||||
# Reinstall xbps-src in the chroot
|
# Reinstall xbps-src in the chroot
|
||||||
msg_normal "Installing xbps-src in the masterdir...\n"
|
msg_normal "Installing xbps-src in the masterdir...\n"
|
||||||
env IN_CHROOT=yes LANG=C \
|
env IN_CHROOT=yes LANG=C PATH=$PATH:/usr/local/bin \
|
||||||
${chroot_cmd} $XBPS_MASTERDIR sh -c \
|
${chroot_cmd} $XBPS_MASTERDIR sh -c \
|
||||||
"cd /xbps/xbps-src && make IN_CHROOT=1 install clean" \
|
"cd /xbps/xbps-src && make IN_CHROOT=1 install clean" \
|
||||||
2>&1 >/dev/null || return $?
|
2>&1 >/dev/null || return $?
|
||||||
|
@ -308,7 +308,7 @@ xbps_chroot_handler()
|
||||||
${chroot_cmd} $XBPS_MASTERDIR sh -c "ldconfig" || return $?
|
${chroot_cmd} $XBPS_MASTERDIR sh -c "ldconfig" || return $?
|
||||||
|
|
||||||
if [ "$action" = "chroot" ]; then
|
if [ "$action" = "chroot" ]; then
|
||||||
env IN_CHROOT=1 LANG=C \
|
env IN_CHROOT=1 LANG=C PATH=$PATH:/usr/local/bin \
|
||||||
${chroot_cmd} $XBPS_MASTERDIR /bin/sh || rv=$?
|
${chroot_cmd} $XBPS_MASTERDIR /bin/sh || rv=$?
|
||||||
else
|
else
|
||||||
[ -n "$KEEP_WRKSRC" ] && arg="$arg -C"
|
[ -n "$KEEP_WRKSRC" ] && arg="$arg -C"
|
||||||
|
|
Loading…
Reference in New Issue