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

xbps-src: make install/remove targets defaults now, but keep previous for compat.

Browse source
This commit is contained in:
Juan RP 2014-03-22 20:59:39 +01:00
parent 730afbb5d7
commit c343fbf42a
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common/xbps-src/shutils/chroot.sh
View file

@ -175,7 +175,7 @@ chroot_handler() {
[ -z "$action" -a -z "$pkg" ] && return 1 [ -z "$action" -a -z "$pkg" ] && return 1
case "$action" in case "$action" in
fetch|extract|build|configure|install-destdir|build-pkg|bootstrap-update|chroot) fetch|extract|build|configure|install|install-destdir|build-pkg|bootstrap-update|chroot)
chroot_prepare || return $? chroot_prepare || return $?
chroot_init || return $? chroot_init || return $?
chroot_sync_repos || return $? chroot_sync_repos || return $?

2
common/xbps-src/shutils/pkgtarget.sh
View file

@ -87,7 +87,7 @@ install_pkg() {
done done
if [ "$XBPS_TARGET_PKG" = "$sourcepkg" ]; then if [ "$XBPS_TARGET_PKG" = "$sourcepkg" ]; then
[ "$target" = "install-destdir" ] && return 0 [ "$target" = "install" -o "$target" = "install-destdir" ] && return 0
fi fi
# If install went ok generate the binpkgs. # If install went ok generate the binpkgs.

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

@ -45,11 +45,11 @@ Targets: (only one may be specified)
fetch <pkgname> fetch <pkgname>
Download package source distribution file(s). Download package source distribution file(s).
install-destdir <pkgname> install <pkgname>
Install target package into <destdir> but not building the binary package Install target package into <destdir> but not building the binary package
and not removing build directory for inspection purposes. and not removing build directory for inspection purposes.
remove-destdir <pkgname> remove <pkgname>
Remove target package from <destdir>. If <pkgname>-<version> is not matched Remove target package from <destdir>. If <pkgname>-<version> is not matched
from build template nothing is removed. from build template nothing is removed.
@ -516,7 +516,7 @@ remove-autodeps)
remove_pkg_autodeps remove_pkg_autodeps
fi fi
;; ;;
fetch|extract|build|configure|install-destdir|build-pkg) fetch|extract|build|configure|install|install-destdir|build-pkg)
BEGIN_INSTALL=1 BEGIN_INSTALL=1
setup_pkg $XBPS_TARGET_PKG $XBPS_CROSS_BUILD setup_pkg $XBPS_TARGET_PKG $XBPS_CROSS_BUILD
if [ -n "$CHROOT_READY" -a -z "$IN_CHROOT" ]; then if [ -n "$CHROOT_READY" -a -z "$IN_CHROOT" ]; then
@ -525,7 +525,7 @@ fetch|extract|build|configure|install-destdir|build-pkg)
install_pkg $XBPS_TARGET $XBPS_CROSS_BUILD install_pkg $XBPS_TARGET $XBPS_CROSS_BUILD
fi fi
;; ;;
remove-destdir) remove|remove-destdir)
setup_pkg $XBPS_TARGET_PKG $XBPS_CROSS_BUILD setup_pkg $XBPS_TARGET_PKG $XBPS_CROSS_BUILD
remove_pkg $XBPS_CROSS_BUILD remove_pkg $XBPS_CROSS_BUILD
;; ;;