From 93ff6b22d76dceb9255d2ecce4158638bc01ee22 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Thu, 23 Jun 2011 03:25:23 +0200 Subject: [PATCH] xbps-src: adapt for xbps-base-chroot -> base_chroot rename. --- xbps-src/README | 2 +- xbps-src/xbps-src.sh.in | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/xbps-src/README b/xbps-src/README index 2a1949843b5..d6d18803f3f 100644 --- a/xbps-src/README +++ b/xbps-src/README @@ -154,7 +154,7 @@ $ xbps-src chroot ---------------------- Press Control + D to exit from the chroot. The following targets will require -to be done in the chroot (_once xbps-base-chroot is installed_): +to be done in the chroot (_once base-chroot is installed_): *build, configure, install and install-destdir*. + + diff --git a/xbps-src/xbps-src.sh.in b/xbps-src/xbps-src.sh.in index 843d798e381..3b7c3cb3695 100644 --- a/xbps-src/xbps-src.sh.in +++ b/xbps-src/xbps-src.sh.in @@ -262,9 +262,9 @@ case "$target" in bootstrap) . $XBPS_SHUTILSDIR/tmpl_funcs.sh . $XBPS_SHUTILSDIR/pkgtarget_funcs.sh - [ ! -d $XBPS_SRCPKGDIR/xbps-base-chroot ] && \ - msg_error "Cannot find $XBPS_SRCPKGDIR/xbps-base-chroot directory!\n" - cd $XBPS_SRCPKGDIR/xbps-base-chroot && _ORIGINPKG="$(basename_cwd)" + [ ! -d $XBPS_SRCPKGDIR/base-chroot ] && \ + msg_error "Cannot find $XBPS_SRCPKGDIR/base-chroot directory!\n" + cd $XBPS_SRCPKGDIR/base-chroot && _ORIGINPKG="$(basename_cwd)" setup_tmpl ${_ORIGINPKG} && install_pkg $pkgname ;; build|configure)