jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

xbps-src: always generate xbps-shell with a proper PATH. Bump version.

Browse source
This commit is contained in:
Juan RP 2011-11-15 17:15:53 +01:00
parent 5c0c5fd5b4
commit a7059483f5
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
xbps-src/shutils/chroot.sh.in
View file

@ -101,8 +101,6 @@ _EOF
fi fi
fi fi
[ -s $XBPS_MASTERDIR/bin/xbps-shell ] && return 0
# Create custom script to start the chroot bash shell. # Create custom script to start the chroot bash shell.
cat > $XBPS_MASTERDIR/bin/xbps-shell <<_EOF cat > $XBPS_MASTERDIR/bin/xbps-shell <<_EOF
#!/bin/sh #!/bin/sh
@ -111,6 +109,10 @@ _EOF
. /usr/local/share/xbps-src/shutils/init_funcs.sh . /usr/local/share/xbps-src/shutils/init_funcs.sh
set_defvars set_defvars
PATH=/tools/bin:/usr/local/sbin:/bin:/usr/bin:/sbin
PATH=\$PATH:/usr/local/bin:/usr/lib/perl5/core_perl/bin
export PATH
exec env PS1="[\u@masterdir-chroot \W]$ " /bin/bash exec env PS1="[\u@masterdir-chroot \W]$ " /bin/bash
_EOF _EOF
chmod 755 $XBPS_MASTERDIR/bin/xbps-shell chmod 755 $XBPS_MASTERDIR/bin/xbps-shell

8
xbps-src/xbps-src.sh.in
View file

@ -23,7 +23,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#- #-
readonly XBPS_SRC_BUILD_VERSION=20111115-1 readonly XBPS_SRC_BUILD_VERSION=20111115-2
XBPS_CONFIG_FILE=@@XBPS_INSTALL_ETCDIR@@/xbps-src.conf XBPS_CONFIG_FILE=@@XBPS_INSTALL_ETCDIR@@/xbps-src.conf
PROGNAME=$(basename $0) PROGNAME=$(basename $0)
@ -318,6 +318,7 @@ if [ -z "$IN_CHROOT" ]; then
MYPATH="$PATH:$XBPS_MASTERDIR/bin:$XBPS_MASTERDIR/usr/bin" MYPATH="$PATH:$XBPS_MASTERDIR/bin:$XBPS_MASTERDIR/usr/bin"
MYPATH="$MYPATH:$XBPS_MASTERDIR/usr/local/bin" MYPATH="$MYPATH:$XBPS_MASTERDIR/usr/local/bin"
MYPATH="$MYPATH:$XBPS_MASTERDIR/usr/local/sbin" MYPATH="$MYPATH:$XBPS_MASTERDIR/usr/local/sbin"
export PATH="$MYPATH"
else else
if [ -n "$XBPS_CCACHE" ]; then if [ -n "$XBPS_CCACHE" ]; then
CCACHEPATH="/usr/lib/ccache/bin" CCACHEPATH="/usr/lib/ccache/bin"
@ -330,12 +331,9 @@ else
mkdir -p $XBPS_MASTERDIR/host/ccache mkdir -p $XBPS_MASTERDIR/host/ccache
export CCACHE_DIR="$XBPS_MASTERDIR/host/ccache" export CCACHE_DIR="$XBPS_MASTERDIR/host/ccache"
fi fi
export PATH="$CCACHEPATH:$PATH"
fi fi
# In chroot always prefer tools from bootstrap.
MYPATH="$CCACHEPATH:/tools/bin:/usr/local/sbin:/bin:/usr/bin"
MYPATH="$MYPATH:/sbin:/usr/local/bin:/usr/sbin"
fi fi
export PATH="$MYPATH"
# #
# If masterdir is ready (base-chroot installed and chroot set up) and # If masterdir is ready (base-chroot installed and chroot set up) and