From 005be5333753c5883672a5ce96cfcba6dde8fc1f Mon Sep 17 00:00:00 2001 From: Juan RP Date: Fri, 18 Nov 2011 11:58:21 +0100 Subject: [PATCH] xbps-src: remove getdeps-helper, unused; don't install chroot-helper in chroot. --- xbps-src/libexec/Makefile | 3 ++- xbps-src/libexec/getdeps-helper.sh.in | 24 ------------------------ 2 files changed, 2 insertions(+), 25 deletions(-) delete mode 100644 xbps-src/libexec/getdeps-helper.sh.in diff --git a/xbps-src/libexec/Makefile b/xbps-src/libexec/Makefile index 50ff84ada9..ace0a419a8 100644 --- a/xbps-src/libexec/Makefile +++ b/xbps-src/libexec/Makefile @@ -1,6 +1,6 @@ include ../vars.mk -SCRIPTS = chroot-helper doinst-helper getdeps-helper +SCRIPTS = chroot-helper doinst-helper MOUNT_BIN = capmount UMOUNT_BIN = capumount CHROOT_BIN = capchroot @@ -10,6 +10,7 @@ LDFLAGS = -lcap ifdef IN_CHROOT BINS = +SCRIPTS = doinst-helper endif .PHONY: all diff --git a/xbps-src/libexec/getdeps-helper.sh.in b/xbps-src/libexec/getdeps-helper.sh.in deleted file mode 100644 index e99c140b3a..0000000000 --- a/xbps-src/libexec/getdeps-helper.sh.in +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -set -e - -. @@XBPS_INSTALL_ETCDIR@@/xbps-src.conf -. @@XBPS_INSTALL_SHAREDIR@@/shutils/init_funcs.sh - -set_defvars - -. $XBPS_SHUTILSDIR/tmpl_funcs.sh -. $XBPS_SHUTILSDIR/common_funcs.sh - -[ $# -ne 2 ] && echo "usage: $(basename $0) " && exit 1 - -setup_subpkg_tmpl $2 -if [ "$1" = "run" ]; then - [ -n "$run_depends" ] && echo "$run_depends" -elif [ "$1" = "build" ]; then - [ -n "$build_depends" ] && echo "$build_depends" -else - usage -fi - -exit 0