diff options
| -rwxr-xr-x | fullpkg | 7 | ||||
| -rwxr-xr-x | librestage | 4 | ||||
| -rw-r--r-- | libretools.conf | 2 |
3 files changed, 8 insertions, 5 deletions
@@ -161,11 +161,12 @@ function find_deps { # if search pkgname in repo doesn't work # this should find pkgsplits - elif _dir=($(find "$ABSROOT/${_repo}" -type f -name PKGBUILD -print0 | \ - "xargs" -0 -e grep -HEw "pkgname=|pkgbase=|provides=" | grep $_dep 2>&1)); + elif _dir=($(find "$ABSROOT/${_repo}" -type f -name PKGBUILD -print0 2>/dev/null | \ + "xargs" -0 -e grep -HEw "pkgname=|pkgbase=|provides=" | grep -w "$_dep" 2>&1)); then + _dir=$(dirname $(echo $_dir | cut -d: -f1)) plain "guess for $_dep -> $_dir" - pushd $(dirname $(echo $_dir | cut -d: -f1)) > /dev/null + pushd $_dir > /dev/null $0 -c -d ${build_dir} -l ${next_level} # Circular deps must fail [ $? -eq 20 ] && return 20 @@ -77,7 +77,9 @@ staged='n' for _arch in ${ARCHES[@]}; do for pkg in ${pkgname[@]}; do - pkgpath=$(find ${PKGDEST}/ -type f -name "${pkg}-${pkgver}-${pkgrel}-${_arch}${PKGEXT}") + pkgpath=$(find ${PKGDEST}/ -type f \ + -name "${pkg}-${pkgver}-${pkgrel}-${_arch}${PKGEXT}" -or \ + -name "${pkg}-${epoch}:${pkgver}-${pkgrel}-${_arch}${PKGEXT}") [[ -z ${pkgpath} ]] && continue diff --git a/libretools.conf b/libretools.conf index 4badc5c..c4ac606 100644 --- a/libretools.conf +++ b/libretools.conf @@ -10,7 +10,7 @@ WORKDIR=/home/$USER/packages # Tip: As early repos take precedence on $REPOS loops, you can use this as # inverted order of precedence. Put testing repos first so fullpkg find new # PKGBUILDs first, for instance. -REPOS=('libre' 'libre-testing' 'core' 'community' 'extra' 'social' 'sugar') +REPOS=('core' 'extra' 'community' 'libre' 'libre-testing' 'social' 'sugar') # The architectures ARCHES=('i686' 'x86_64' 'mips64el' 'any') |