From: Michael Tremer Date: Wed, 5 Oct 2011 14:35:13 +0000 (+0200) Subject: Remove old implementation of dependency filtering. X-Git-Tag: 0.9.13~9^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e838428974190b1a3c84bfb888a598df3c2bfab2;p=pakfire.git Remove old implementation of dependency filtering. --- diff --git a/scripts/dependency-tracker b/scripts/dependency-tracker index b917f0671..2023d2b18 100755 --- a/scripts/dependency-tracker +++ b/scripts/dependency-tracker @@ -16,9 +16,6 @@ for require in $(find_requires ${args}); do listmatch ${require} ${provides} || requires="${requires} ${require}" done -if [ -n "${PKG_PREREQUIRES}" ]; then - echo "prerequires=\"/bin/sh ${PKG_PREREQUIRES}\"" -fi echo "requires=\"${requires}\"" echo "provides=\"${provides}\"" echo "conflicts=\"${PKG_CONFLICTS}\"" diff --git a/scripts/functions-packager-find b/scripts/functions-packager-find index 1b488d9f7..0e5098565 100644 --- a/scripts/functions-packager-find +++ b/scripts/functions-packager-find @@ -46,10 +46,6 @@ function find_requires() { for require in $(listsort ${PKG_DEPS} ${interpreters} ${neededs} ${links} ${others}); do [ "${require:0:3}" = "ld-" ] && continue - if [ -n "${PKG_REQUIRES_FILTER}" ]; then - grep -qE "${PKG_REQUIRES_FILTER}" <<< "${require}" && continue - fi - requires="${requires} ${require}" done @@ -75,10 +71,6 @@ function find_provides() { local provide local provides for provide in $(listsort ${PKG_PROVIDES} ${sonames} ${others}); do - if [ -n "${PKG_PROVIDES_FILTER}" ]; then - grep -qE "${PKG_PROVIDES_FILTER}" <<< "${provide}" && continue - fi - provides="${provides} ${provide}" done