From 3716f5e0c2f92acb78b3fecb97cce50ae82f53b3 Mon Sep 17 00:00:00 2001 From: Davide Madrisan Date: Thu, 1 Nov 2012 22:27:12 +0100 Subject: [PATCH] pck-update: try to avoid reporting package requirements set with 'Requires:' as build requirements. Unless not better identified requirements are in 'a(b)' form don't report them as build requirements to avoid breaking stage1 builds and causing unneeded circular dependencies Signed-off-by: Davide Madrisan --- ChangeLog | 6 ++++++ plugins/pck-update.in | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index eb0f17a..e5126dc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,6 +69,12 @@ Changes in version 1.12.6 function is not the expected one (that is a string made by the current date in the format YYYYMMDD followed by "git"). + * pck-update - Silvan Calarco: + Try to avoid reporting package requirements set with 'Requires:' as build + requirements. Unless not better identified requirements are in 'a(b)' form + don't report them as build requirements to avoid breaking stage1 builds and + causing unneeded circular dependencies. + ------------------------------------------------------------------------------- Changes in version 1.12.5 diff --git a/plugins/pck-update.in b/plugins/pck-update.in index 11b5ea7..548d79b 100644 --- a/plugins/pck-update.in +++ b/plugins/pck-update.in @@ -2244,11 +2244,15 @@ $(echo $solibpath | sed "s|-[0-9.]*\.so|.so|")" echo "\ #$req: library not reported by ldconfig; run \`ldconfig' and try again" fi - else - # unidentified requirement + elif [[ "$req" =~ .*\(.*\) ]]; then + # other a(b) requirements rpm -q --qf %{name} --whatprovides "$req" &>/dev/null && buildreq="$(rpm -q --qf %{name} --whatprovides "$req")" || echo "#$req: unidentified build requirement" + else + # other requirements probably coming from static 'Requires:' + # so don't treat them as build requirements + : fi if [ -n "$buildreq" \ -a "${buildreq/%-devel/}" = "$buildreq" ]; then